rpms/nexuiz/FC-4 .cvsignore, 1.4, 1.5 nexuiz.spec, 1.6, 1.7 sources, 1.4, 1.5

[Adrian Reber (adrian)]

Author: adrian

Update of /cvs/extras/rpms/nexuiz/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24496

Modified Files:
	.cvsignore nexuiz.spec sources 
Log Message:
updated to 2.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nexuiz/FC-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	19 Mar 2006 19:02:47 -0000	1.4
+++ .cvsignore	8 Jul 2006 23:00:05 -0000	1.5
@@ -1 +1 @@
-nexuizenginesource20060208.zip
+enginesource20060614.zip


Index: nexuiz.spec
===================================================================
RCS file: /cvs/extras/rpms/nexuiz/FC-4/nexuiz.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- nexuiz.spec	19 Mar 2006 19:25:00 -0000	1.6
+++ nexuiz.spec	8 Jul 2006 23:00:05 -0000	1.7
@@ -1,14 +1,14 @@
 Summary: Multiplayer, deathmatch oriented first person shooter
 Name: nexuiz
-Version: 1.5
-Release: 3%{?dist}
+Version: 2.0
+Release: 2%{?dist}
 License: GPL
 Group: Amusements/Games
 URL: http://www.nexuiz.com/
 # Source is custom, obtained with :
-# wget http://dl.sf.net/sourceforge/nexuiz/nexuiz15.zip
-# unzip nexuiz15.zip Nexuiz/nexuizenginesource20060208.zip
-Source: nexuizenginesource20060208.zip
+# 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
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -18,7 +18,7 @@
 BuildRequires: SDL-devel
 # This is necessary as these libraries are loaded during runtime
 # and therefore it isn't picked up by RPM during build
-Requires: zlib libvorbis libjpeg
+Requires: zlib libvorbis libjpeg curl
 Requires: desktop-file-utils >= 0.9
 Requires: nexuiz-data = %{version}
 Requires(post): desktop-file-utils
@@ -35,7 +35,7 @@
 Requires: nexuiz-data = %{version}
 # This is necessary as these libraries are loaded during runtime
 # and therefore it isn't picked up by RPM during build
-Requires: zlib
+Requires: zlib curl
 
 %description server
 Nexuiz is a fast-paced, chaotic, and intense multiplayer first person shooter, 
@@ -49,6 +49,7 @@
 %patch0 -p0 -b .basedir
 %patch1 -p0 -b .nostrip
 %{__sed} -i 's/\r//' darkplaces.txt
+%{__sed} -i 's,/usr/X11R6/,/usr/,g' makefile makefile.inc
 
 
 %build
@@ -61,11 +62,11 @@
 
 # Install the main programs
 %{__mkdir_p} %{buildroot}%{_bindir}
-%{__install} -m 0755 nexuiz-glx \
+%{__install} -m 0755 darkplaces-glx \
         %{buildroot}%{_bindir}/nexuiz-glx
-%{__install} -m 0755 nexuiz-sdl \
+%{__install} -m 0755 darkplaces-sdl \
         %{buildroot}%{_bindir}/nexuiz-sdl
-%{__install} -m 0755 nexuiz-dedicated \
+%{__install} -m 0755 darkplaces-dedicated \
         %{buildroot}%{_bindir}/nexuiz-dedicated
 
 # Create the desktop file
@@ -75,7 +76,7 @@
 Comment=Multiplayer, deathmatch oriented first person shooter
 Encoding=UTF-8
 Icon=nexuiz
-Exec=nexuiz-glx
+Exec=nexuiz-sdl
 Terminal=false
 Type=Application
 EOF
@@ -126,6 +127,16 @@
 
 
 %changelog
+* Mon Jun 26 2006 Adrian Reber <adrian at lisas.de> - 2.0-2
+- it looks like upstream changed the sources without increasing
+  the version but now it works like it is supposed to
+- added curl to the requires because the binaries are looking for it
+
+* Sat Jun 17 2006 Adrian Reber <adrian at lisas.de> - 2.0-1
+- updated to 2.0 (#195612)
+- the binary has once again be renamed from darkplaces* to nexuiz*
+- the desktop file now launches the sdl binary
+
 * Sun Mar 19 2006 Adrian Reber <adrian at lisas.de> - 1.5-3
 - works better on FC4 without modular X changes
 
@@ -136,6 +147,9 @@
 - updated to 1.5
 - enabled sdl binary
 
+* Wed Nov 30 2005 Adrian Reber <adrian at lisas.de> - 1.2.1-3
+- changes for modular X
+
 * Wed Nov 30 2005 Adrian Reber <adrian at lisas.de> - 1.2.1-2
 - changed requires to make it work on 64 bit platforms
   (thanks thl)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nexuiz/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	19 Mar 2006 19:02:47 -0000	1.4
+++ sources	8 Jul 2006 23:00:05 -0000	1.5
@@ -1 +1 @@
-9ad968b3706b00d4a0f196d1c3f2267d  nexuizenginesource20060208.zip
+072f6da1a7c880e045269f3e02657b88  enginesource20060614.zip