rpms/nexuiz/devel .cvsignore, 1.7, 1.8 nexuiz.spec, 1.15, 1.16 sources, 1.7, 1.8 nexuiz-1.0-basedir.patch, 1.2, NONE

[Adrian Reber (adrian)]

Author: adrian

Update of /cvs/extras/rpms/nexuiz/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32410

Modified Files:
	.cvsignore nexuiz.spec sources 
Removed Files:
	nexuiz-1.0-basedir.patch 
Log Message:
* Sun Sep 24 2006 Adrian Reber <adrian at lisas.de> - 2.1-1
- updated to 2.1
- removed basedir patch; now using a environment variable



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nexuiz/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	26 Jun 2006 07:47:49 -0000	1.7
+++ .cvsignore	24 Sep 2006 17:29:26 -0000	1.8
@@ -1 +1 @@
-enginesource20060614.zip
+enginesource20060905.zip


Index: nexuiz.spec
===================================================================
RCS file: /cvs/extras/rpms/nexuiz/devel/nexuiz.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- nexuiz.spec	18 Sep 2006 07:02:14 -0000	1.15
+++ nexuiz.spec	24 Sep 2006 17:29:26 -0000	1.16
@@ -1,16 +1,15 @@
 Summary: Multiplayer, deathmatch oriented first person shooter
 Name: nexuiz
-Version: 2.0
-Release: 3%{?dist}
+Version: 2.1
+Release: 1%{?dist}
 License: GPL
 Group: Amusements/Games
 URL: http://www.nexuiz.com/
 # Source is custom, obtained with :
-# wget http://dl.sf.net/sourceforge/nexuiz/nexuiz20.zip
-# unzip -j nexuiz20.zip Nexuiz/sources/enginesource20060614.zip
-Source: enginesource20060614.zip
-Patch0: nexuiz-1.0-basedir.patch
-Patch1: nexuiz-1.1-nostrip.patch
+# wget http://dl.sf.net/sourceforge/nexuiz/nexuiz-21.zip
+# unzip -j nexuiz-21.zip Nexuiz/sources/enginesource20060905.zip
+Source: enginesource20060905.zip
+Patch0: nexuiz-1.1-nostrip.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # For the .ico extraction
 BuildRequires: ImageMagick, file
@@ -47,14 +46,14 @@
 
 %prep
 %setup -q -n darkplaces
-%patch0 -p0 -b .basedir
-%patch1 -p0 -b .nostrip
+%patch0 -p0 -b .nostrip
 %{__sed} -i 's/\r//' darkplaces.txt
 %{__sed} -i 's,/usr/X11R6/,/usr/,g' makefile makefile.inc
 
 
 %build
-%{__make} cl-release sv-release sdl-release OPTIM_RELEASE="$RPM_OPT_FLAGS"
+export DP_FS_BASEDIR=%{_datadir}/nexuiz
+%{__make} cl-nexuiz sv-nexuiz sdl-nexuiz OPTIM_RELEASE="$RPM_OPT_FLAGS"
 convert darkplaces.ico nexuiz.png
 
 
@@ -63,11 +62,11 @@
 
 # Install the main programs
 %{__mkdir_p} %{buildroot}%{_bindir}
-%{__install} -m 0755 darkplaces-glx \
+%{__install} -m 0755 nexuiz-glx \
         %{buildroot}%{_bindir}/nexuiz-glx
-%{__install} -m 0755 darkplaces-sdl \
+%{__install} -m 0755 nexuiz-sdl \
         %{buildroot}%{_bindir}/nexuiz-sdl
-%{__install} -m 0755 darkplaces-dedicated \
+%{__install} -m 0755 nexuiz-dedicated \
         %{buildroot}%{_bindir}/nexuiz-dedicated
 
 # Create the desktop file
@@ -128,6 +127,10 @@
 
 
 %changelog
+* Sun Sep 24 2006 Adrian Reber <adrian at lisas.de> - 2.1-1
+- updated to 2.1
+- removed basedir patch; now using a environment variable
+
 * Mon Sep 18 2006 Adrian Reber <adrian at lisas.de> - 2.0-3
 - rebuilt
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nexuiz/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	26 Jun 2006 07:47:49 -0000	1.7
+++ sources	24 Sep 2006 17:29:26 -0000	1.8
@@ -1 +1 @@
-072f6da1a7c880e045269f3e02657b88  enginesource20060614.zip
+62c57a6ee251d25d7b4cacd0c6be9c8e  enginesource20060905.zip


--- nexuiz-1.0-basedir.patch DELETED ---