rpms/nexuiz/FC-4 .cvsignore, 1.3, 1.4 nexuiz-1.0-basedir.patch, 1.1, 1.2 nexuiz.spec, 1.4, 1.5 sources, 1.3, 1.4

[Adrian Reber (adrian)]

Author: adrian

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

Modified Files:
	.cvsignore nexuiz-1.0-basedir.patch nexuiz.spec sources 
Log Message:
* Sun Mar 19 2006 Adrian Reber <adrian at lisas.de> - 1.5-2
- rebuilt



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nexuiz/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	19 Sep 2005 18:58:07 -0000	1.3
+++ .cvsignore	19 Mar 2006 19:02:47 -0000	1.4
@@ -1 +1 @@
-nexuizenginesource20050911.zip
+nexuizenginesource20060208.zip

nexuiz-1.0-basedir.patch:

Index: nexuiz-1.0-basedir.patch
===================================================================
RCS file: /cvs/extras/rpms/nexuiz/FC-4/nexuiz-1.0-basedir.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nexuiz-1.0-basedir.patch	9 Jul 2005 11:59:33 -0000	1.1
+++ nexuiz-1.0-basedir.patch	19 Mar 2006 19:02:47 -0000	1.2
@@ -4,7 +4,7 @@
  
  	fs_mempool = Mem_AllocPool("file management", 0, NULL);
  
--	strcpy(fs_basedir, ".");
+-	strcpy(fs_basedir, "");
 +	strcpy(fs_basedir, "/usr/share/nexuiz");
  	strcpy(fs_gamedir, "");
  


Index: nexuiz.spec
===================================================================
RCS file: /cvs/extras/rpms/nexuiz/FC-4/nexuiz.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- nexuiz.spec	19 Sep 2005 18:58:07 -0000	1.4
+++ nexuiz.spec	19 Mar 2006 19:02:47 -0000	1.5
@@ -1,23 +1,24 @@
 Summary: Multiplayer, deathmatch oriented first person shooter
 Name: nexuiz
-Version: 1.2.1
-Release: 1%{?dist}
+Version: 1.5
+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/nexuiz121.zip
-# unzip nexuiz121.zip Nexuiz/nexuizenginesource20050911.zip
-Source: nexuizenginesource20050911.zip
+# wget http://dl.sf.net/sourceforge/nexuiz/nexuiz15.zip
+# unzip nexuiz15.zip Nexuiz/nexuizenginesource20060208.zip
+Source: nexuizenginesource20060208.zip
 Patch0: nexuiz-1.0-basedir.patch
 Patch1: nexuiz-1.1-nostrip.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # For the .ico extraction
 BuildRequires: ImageMagick, file
 BuildRequires: xorg-x11-devel, alsa-lib-devel, desktop-file-utils
+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: libz.so.1 libvorbis.so.0 libvorbisfile.so.3 libjpeg.so.62
+Requires: zlib libvorbis libjpeg
 Requires: desktop-file-utils >= 0.9
 Requires: nexuiz-data = %{version}
 Requires(post): desktop-file-utils
@@ -34,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: libz.so.1
+Requires: zlib
 
 %description server
 Nexuiz is a fast-paced, chaotic, and intense multiplayer first person shooter, 
@@ -48,10 +49,11 @@
 %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
-%{__make} cl-release sv-release OPTIM_RELEASE="$RPM_OPT_FLAGS"
+%{__make} cl-release sv-release sdl-release OPTIM_RELEASE="$RPM_OPT_FLAGS"
 convert darkplaces.ico nexuiz.png
 
 
@@ -60,9 +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-dedicated \
+%{__install} -m 0755 nexuiz-sdl \
+        %{buildroot}%{_bindir}/nexuiz-sdl
+%{__install} -m 0755 nexuiz-dedicated \
         %{buildroot}%{_bindir}/nexuiz-dedicated
 
 # Create the desktop file
@@ -112,6 +116,7 @@
 %defattr(-,root,root,-)
 %doc COPYING darkplaces.txt
 %{_bindir}/nexuiz-glx
+%{_bindir}/nexuiz-sdl
 %{_datadir}/icons/hicolor/*/apps/nexuiz.png
 %{_datadir}/applications/*%{name}.desktop
 
@@ -122,6 +127,17 @@
 
 
 %changelog
+* Sun Mar 19 2006 Adrian Reber <adrian at lisas.de> - 1.5-2
+- rebuilt
+
+* Wed Mar 16 2006 Adrian Reber <adrian at lisas.de> - 1.5-1
+- updated to 1.5
+- enabled sdl binary
+
+* 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)
+
 * Mon Sep 19 2005 Adrian Reber <adrian at lisas.de> - 1.2.1-1
 - updated to 1.2.1
 - icons and binaries are now being renamed from darkplaces* to nexuiz*


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nexuiz/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	19 Sep 2005 18:58:07 -0000	1.3
+++ sources	19 Mar 2006 19:02:47 -0000	1.4
@@ -1 +1 @@
-ea845ee2842ad6a2304da1f0b2c95bdd  nexuizenginesource20050911.zip
+9ad968b3706b00d4a0f196d1c3f2267d  nexuizenginesource20060208.zip