rpms/nexuiz/FC-4 .cvsignore, 1.5, 1.6 nexuiz.spec, 1.8, 1.9 sources, 1.5, 1.6 nexuiz-1.0-basedir.patch, 1.2, NONE

[Adrian Reber (adrian) <fedora-extras-commits redhat com>]

Author: adrian

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

Modified Files:
	.cvsignore nexuiz.spec sources 
Removed Files:
	nexuiz-1.0-basedir.patch 
Log Message:
* Mon Dec 18 2006 Adrian Reber <adrian lisas de> - 2.2.1-1
- updated to 2.2.1 (#220034)
- fix for CVE-2006-6609, CVE-2006-6610



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nexuiz/FC-4/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	8 Jul 2006 23:00:05 -0000	1.5
+++ .cvsignore	19 Dec 2006 11:02:35 -0000	1.6
@@ -1 +1 @@
-enginesource20060614.zip
+enginesource20061212.zip


Index: nexuiz.spec
===================================================================
RCS file: /cvs/extras/rpms/nexuiz/FC-4/nexuiz.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- nexuiz.spec	9 Jul 2006 07:06:59 -0000	1.8
+++ nexuiz.spec	19 Dec 2006 11:02:35 -0000	1.9
@@ -1,21 +1,21 @@
 Summary: Multiplayer, deathmatch oriented first person shooter
 Name: nexuiz
-Version: 2.0
-Release: 2%{?dist}
+Version: 2.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-221.zip
+# unzip -j nexuiz-221.zip Nexuiz/sources/enginesource20061212.zip
+Source: enginesource20061212.zip
+Patch0: 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
+BuildRequires: libX11-devel, alsa-lib-devel, desktop-file-utils
+BuildRequires: mesa-libGL-devel libXext-devel libXxf86dga-devel
+BuildRequires: libXxf86vm-devel 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 curl
@@ -46,13 +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
 
 
@@ -61,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
@@ -126,6 +127,20 @@
 
 
 %changelog
+* Mon Dec 18 2006 Adrian Reber <adrian lisas de> - 2.2.1-1
+- updated to 2.2.1 (#220034)
+- fix for CVE-2006-6609, CVE-2006-6610
+
+* Thu Oct 05 2006 Christian Iseli <Christian Iseli licr org> 2.1-2
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
+* Sun Sep 24 2006 Adrian Reber <adrian lisas de> - 2.1-1
+- updated to 2.1
+- removed basedir patch; now using a environment variable
+
+* Mon Sep 18 2006 Adrian Reber <adrian lisas de> - 2.0-3
+- rebuilt
+
 * Mon Jun 26 2006 Adrian Reber <adrian 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
@@ -137,7 +152,7 @@
 - the desktop file now launches the sdl binary
 
 * Sun Mar 19 2006 Adrian Reber <adrian lisas de> - 1.5-3
-- works better on FC4 without modular X changes
+- rebuilt
 
 * Sun Mar 19 2006 Adrian Reber <adrian lisas de> - 1.5-2
 - rebuilt


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nexuiz/FC-4/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	8 Jul 2006 23:00:05 -0000	1.5
+++ sources	19 Dec 2006 11:02:35 -0000	1.6
@@ -1 +1 @@
-072f6da1a7c880e045269f3e02657b88  enginesource20060614.zip
+6a0d897814ab9f8005d02b5e158b9b65  enginesource20061212.zip


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