11:52 a.m.
Author: kalev
Update of /cvs/nonfree/rpms/warsow/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv30229/devel
Modified Files:
.cvsignore sources
Added Files:
warsow-build.patch warsow-paths.patch warsow.desktop
warsow.spec warsow.svg warsow48x48.png
Log Message:
Initial import (#2762)
warsow-build.patch:
Makefile | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
--- NEW FILE warsow-build.patch ---
--- warsow_1.02_sdk/source/Makefile.orig 2013-04-15 00:50:05.337871495 +0200
+++ warsow_1.02_sdk/source/Makefile 2013-04-15 00:51:13.270701812 +0200
@@ -210,7 +210,7 @@
CFLAGS_TV_SERVER=-DDEDICATED_ONLY -DTV_SERVER_ONLY -DC_ONLY -DTV_MODULE_HARD_LINKED
LDFLAGS_COMMON=$(LDFLAGS)
-LXXFLAGS_COMMON=$(LDFLAGS) -lstdc++ -lsupc++
+LXXFLAGS_COMMON=$(LDFLAGS) -lstdc++
ifeq ($(OS),FreeBSD)
LDFLAGS_COMMON+= -L/usr/local/lib -lm -pthread
@@ -218,11 +218,6 @@
LDFLAGS_COMMON+= -L/usr/local/lib -ldl -lm -O1 -Wl,--as-needed
endif
-ifneq ($(DEBUG_BUILD),YES)
-LDFLAGS_COMMON+= -s
-LXXFLAGS_COMMON+= -s
-endif
-
ifeq ($(ARCH),x86_64)
LIB=lib64
else
@@ -286,7 +281,7 @@
LDFLAGS_CLIENT=-lz -lcurl -framework libjpeg -framework SDL -framework OpenGL
-I/Library/Frameworks/SDL.framework/Headers
LDFLAGS_MODULE=-bundle
LDFLAGS_COMMON=-arch ppc -arch i386 -framework AppKit -mmacosx-version-min=10.4 -isysroot
/Developer/SDKs/MacOSX10.4u.sdk
-LXXFLAGS_COMMON=$(LDFLAGS_COMMON) -lstdc++ -lsupc++
+LXXFLAGS_COMMON=$(LDFLAGS_COMMON) -lstdc++
LDFLAGS_DED=-lz -lcurl
LDFLAGS_QF=-framework SDL -framework Ogg -framework Vorbis
LDFLAGS_OPENAL=-framework OpenAL -framework Ogg -framework Vorbis
warsow-paths.patch:
files.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- NEW FILE warsow-paths.patch ---
--- warsow_1.02_sdk/source/qcommon/files.c.orig 2013-04-14 23:28:50.105800188 +0200
+++ warsow_1.02_sdk/source/qcommon/files.c 2013-04-14 23:29:12.492415222 +0200
@@ -3917,8 +3917,8 @@
//
// set basepaths
//
- fs_cdpath = Cvar_Get( "fs_cdpath", "", CVAR_NOSET );
- fs_basepath = Cvar_Get( "fs_basepath", ".", CVAR_NOSET );
+ fs_cdpath = Cvar_Get( "fs_cdpath", "/usr/share/warsow", CVAR_NOSET
);
+ fs_basepath = Cvar_Get( "fs_basepath", "/usr/lib/warsow", CVAR_NOSET
);
if( Sys_FS_GetHomeDirectory() != NULL )
#ifdef PUBLIC_BUILD
fs_usehomedir = Cvar_Get( "fs_usehomedir", "1", CVAR_NOSET );
--- NEW FILE warsow.desktop ---
[Desktop Entry]
Name=Warsow
Comment=Fast paced 3D first person shooter
Icon=warsow
Exec=warsow
Terminal=false
Type=Application
Categories=Game;ArcadeGame;
--- NEW FILE warsow.spec ---
%global warsow_libdir %{_prefix}/lib/warsow
%global warsow_datadir %{_datadir}/warsow
Name: warsow
Version: 1.02
Release: 2%{?dist}
Summary: Fast paced 3D first person shooter
License: GPLv2+
URL: http://www.warsow.net/
Source0:
http://www.warsow.net:1337/~warsow/%{version}/warsow_%{version}_sdk.tar.gz
Source1: warsow.desktop
Source2: warsow48x48.png
Source3: warsow.svg
# Downstream patch to set the locations of the data files and libs
Patch0: warsow-paths.patch
# Downstream patch to stop stripping the binaries and to avoid linking with
# the static c++ runtime
Patch1: warsow-build.patch
BuildRequires: curl-devel
BuildRequires: desktop-file-utils
BuildRequires: freetype-devel
BuildRequires: libjpeg-devel
BuildRequires: libpng-devel
BuildRequires: libtheora-devel
BuildRequires: libvorbis-devel
BuildRequires: libX11-devel
BuildRequires: libXinerama-devel
BuildRequires: libXrandr-devel
BuildRequires: libXxf86dga-devel
BuildRequires: libXxf86vm-devel
BuildRequires: openal-devel
BuildRequires: openssl-devel
BuildRequires: SDL-devel
Requires: hicolor-icon-theme
Requires: warsow-data = %{version}
%description
Warsow is a fast paced first person shooter consisting of cel-shaded
cartoon-like graphics with dark, flashy and dirty textures. Warsow is based on
the E-novel "Chasseur de bots" ("Bots hunter" in English) by Fabrice
Demurger.
Warsow's codebase is built upon Qfusion, an advanced modification of the Quake
II engine.
This package installs the client to play Warsow.
%package server
Summary: Dedicated server for Warsow
Requires: %{name}%{?_isa} = %{version}-%{release}
Requires: %{name}-data = %{version}
%description server
Warsow is a fast paced first person shooter consisting of cel-shaded
cartoon-like graphics with dark, flashy and dirty textures. Warsow is based on
the E-novel "Chasseur de bots" ("Bots hunter" in English) by Fabrice
Demurger.
Warsow's codebase is built upon Qfusion, an advanced modification of the Quake
II engine.
This package installs the standalone server and TV server for Warsow.
%prep
%setup -q -n warsow_%{version}_sdk
%patch0 -p1 -b .paths
%patch1 -p1 -b .build
# Remove bundled libs
pushd libsrcs
rm -rf libcurl libfreetype libjpeg libogg libpng libtheora libvorbis zlib
popd
# Convert to utf-8 and Unix line breaks
for file in docs/license.txt; do
iconv -f WINDOWS-1252 -t UTF-8 -o $file.new $file &&
sed -i 's/\r//' $file.new &&
touch -r $file $file.new &&
mv $file.new $file
done
%build
pushd source
export CFLAGS="%optflags"
export LDFLAGS="%__global_ldflags"
make \
BUILD_CLIENT=YES \
BUILD_SERVER=YES \
BUILD_TV_SERVER=YES \
BUILD_IRC=YES \
BUILD_SND_OPENAL=YES \
BUILD_SND_QF=YES \
DEBUG_BUILD=NO
popd
%install
pushd source/release
# Install the executables directly to bindir. We are setting the data paths
# correctly with patch0, so we have no need for the shell script wrappers.
install -Dm 755 warsow.* $RPM_BUILD_ROOT%{_bindir}/warsow
install -Dm 755 wsw_server.* $RPM_BUILD_ROOT%{_bindir}/warsow-server
install -Dm 755 wswtv_server.* $RPM_BUILD_ROOT%{_bindir}/warsow-tv-server
# Install the private libraries to a private directory
install -d $RPM_BUILD_ROOT%{warsow_libdir}/libs
install -m 755 libs/*.so $RPM_BUILD_ROOT%{warsow_libdir}/libs/
popd
# Install icons and the desktop file
install -D -m 0644 %{SOURCE2}
$RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/warsow.png
install -D -m 0644 %{SOURCE3}
$RPM_BUILD_ROOT%{_datadir}/icons/hicolor/scalable/apps/warsow.svg
desktop-file-install %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/applications/warsow.desktop
%post
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
%postun
if [ $1 -eq 0 ] ; then
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi
%posttrans
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%files
%doc docs/license.txt
%{_bindir}/warsow
%{_datadir}/icons/hicolor/*/apps/warsow.png
%{_datadir}/icons/hicolor/scalable/apps/warsow.svg
%{_datadir}/applications/warsow.desktop
%{warsow_libdir}/
%files server
%{_bindir}/warsow-server
%{_bindir}/warsow-tv-server
%changelog
* Mon May 06 2013 Kalev Lember <kalevlember(a)gmail.com> - 1.02-2
- Review fixes (https://bugzilla.rpmfusion.org/show_bug.cgi?id=2762):
- Require hicolor-icon-theme
- Convert license.txt to Unix line breaks
- Don't distribute docs that describe source code
- server: Depend on the main package
* Mon Apr 15 2013 Kalev Lember <kalevlember(a)gmail.com> - 1.02-1
- Initial Fedora package
--- NEW FILE warsow.svg ---
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
]>
<svg version="1.1"
xmlns="http://www.w3.org/2000/svg"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
x="0px" y="0px" width="149px" height="149px"
viewBox="410.3 55.5 149 149" enable-background="new 410.3 55.5 149
149"
xml:space="preserve">
<defs>
</defs>
<g>
<defs>
<rect id="SVGID_1_" x="410.4" y="58.6"
width="149" height="142.3"/>
</defs>
<clipPath id="SVGID_2_">
<use xlink:href="#SVGID_1_" overflow="visible"/>
</clipPath>
<g clip-path="url(#SVGID_2_)">
<circle fill="#231F20" stroke="#231F20"
stroke-width="12" stroke-miterlimit="3.8637" cx="484.5"
cy="129.8" r="64.4"/>
<path fill="#231F20" stroke="#231F20" stroke-width="12"
stroke-miterlimit="3.8637" d="M484.5,129.8"/>
</g>
<g clip-path="url(#SVGID_2_)">
<defs>
<circle id="_x3C_Clipping_Path_x3E__1_" cx="484.5"
cy="129.8" r="64.4"/>
</defs>
<defs>
<circle id="poop_1_" cx="484.5" cy="129.8"
r="64.4"/>
</defs>
<use xlink:href="#_x3C_Clipping_Path_x3E__1_" display="none"
overflow="visible" fill="#8A6AAD"/>
<use xlink:href="#poop_1_" overflow="visible"
fill="#8A6AAD"/>
<clipPath id="_x3C_Clipping_Path_x3E__2_">
<use xlink:href="#_x3C_Clipping_Path_x3E__1_" display="none"
overflow="visible"/>
</clipPath>
<clipPath id="poop_2_"
clip-path="url(#_x3C_Clipping_Path_x3E__2_)">
<use xlink:href="#poop_1_" overflow="visible"/>
</clipPath>
<g clip-path="url(#poop_2_)">
<polygon fill-rule="evenodd" clip-rule="evenodd"
fill="#F37721" points="845.6,3 841.5,90 460,89.6 451.9,102.3 468.2,116
460,135.3 497.6,136.1 513.2,149.5 508.2,164 0,161 3.1,0 "/>
</g>
</g>
<g clip-path="url(#SVGID_2_)">
<polygon fill="#231F20" stroke="#231F20"
stroke-width="12.1187" stroke-miterlimit="3.8637"
points="550.4,86.6 544.2,102.6
468,102.6 475,108.6 522.5,108.6 510.6,139.1 525.1,151.6 516.5,173.6 419.3,173.6
425.6,157.6 501.3,157.6 494.4,151.6
449,151.6 460.4,122.2 444.7,108.6 453.2,86.6 "/>
<path fill="#FFFFFF" d="M497.5,122.6h-18.5l-5.5,14H492L497.5,122.6z
M550.4,86.6l-6.2,16H468l7,6h47.4l-11.9,30.5l14.5,12.5
l-8.6,22h-97.2l6.2-16h75.8l-6.9-6H449l11.4-29.4l-15.7-13.6l8.6-22H550.4z"/>
</g>
</g>
</svg>
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/warsow/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 19 May 2013 10:51:14 -0000 1.1
+++ .cvsignore 21 May 2013 11:52:49 -0000 1.2
@@ -0,0 +1 @@
+warsow_1.02_sdk.tar.gz
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/warsow/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 19 May 2013 10:51:14 -0000 1.1
+++ sources 21 May 2013 11:52:49 -0000 1.2
@@ -0,0 +1 @@
+df3dee05dd6f84b44ba131a2445a1706 warsow_1.02_sdk.tar.gz
