rpms/nexuiz/devel .cvsignore, 1.2, 1.3 nexuiz.spec, 1.3, 1.4 sources, 1.2, 1.3

[Adrian Reber (adrian)]

Author: adrian

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

Modified Files:
	.cvsignore nexuiz.spec sources 
Log Message:
* Fri Sep 02 2005 Adrian Reber <adrian at lisas.de> - 1.2-1
- updated to 1.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nexuiz/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	9 Jul 2005 11:59:33 -0000	1.2
+++ .cvsignore	3 Sep 2005 14:14:02 -0000	1.3
@@ -1 +1 @@
-nexuiz-1.1.tar.bz2
+nexuizenginesource20050814beta1.zip


Index: nexuiz.spec
===================================================================
RCS file: /cvs/extras/rpms/nexuiz/devel/nexuiz.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- nexuiz.spec	16 Aug 2005 08:15:54 -0000	1.3
+++ nexuiz.spec	3 Sep 2005 14:14:02 -0000	1.4
@@ -1,17 +1,14 @@
 Summary: Multiplayer, deathmatch oriented first person shooter
 Name: nexuiz
-Version: 1.1
-Release: 2%{?dist}
+Version: 1.2
+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/nexuiz11.zip
-# unzip nexuiz11.zip
-# mkdir nexuiz-1.1/
-# mv Nexuiz/sources/darkplaces/* Nexuiz/Readme.htm nexuiz-1.1/
-# tar cjvf nexuiz-1.1.tar.bz2 nexuiz-1.1/
-Source: nexuiz-%{version}.tar.bz2
+# wget http://dl.sf.net/sourceforge/nexuiz/nexuiz12.zip
+# unzip nexuiz12.zip  Nexuiz/nexuizenginesource20050814beta1.zip
+Source: nexuizenginesource20050814beta1.zip
 Patch0: nexuiz-1.0-basedir.patch
 Patch1: nexuiz-1.1-nostrip.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -22,7 +19,7 @@
 # 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: desktop-file-utils >= 0.9
-Requires: nexuiz-data 
+Requires: nexuiz-data = %{version}
 Requires(post): desktop-file-utils
 Requires(postun): desktop-file-utils
 
@@ -34,7 +31,7 @@
 %package server
 Group: Amusements/Games
 Summary: Dedicated server for the Nexuiz first person shooter
-Requires: nexuiz-data 
+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
@@ -47,10 +44,10 @@
 
 
 %prep
-%setup -q
+%setup -q -n darkplaces
 %patch0 -p0 -b .basedir
 %patch1 -p0 -b .nostrip
-%{__sed} -i 's/\r//' Readme.htm
+%{__sed} -i 's/\r//' darkplaces.txt
 
 
 %build
@@ -111,18 +108,21 @@
 
 %files
 %defattr(-,root,root,-)
-%doc Readme.htm COPYING
+%doc COPYING ChangeLog darkplaces.txt
 %{_bindir}/nexuiz-glx
 %{_datadir}/icons/hicolor/*/apps/nexuiz.png
 %{_datadir}/applications/*%{name}.desktop
 
 %files server
 %defattr(-,root,root,-)
-%doc Readme.htm COPYING
+%doc COPYING ChangeLog darkplaces.txt
 %{_bindir}/nexuiz-dedicated
 
 
 %changelog
+* Fri Sep 02 2005 Adrian Reber <adrian at lisas.de> - 1.2-1
+- updated to 1.2
+
 * Tue Aug 16 2005 Adrian Reber <adrian at lisas.de> - 1.1-2
 - support building on RHEL4 (#165522)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nexuiz/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	9 Jul 2005 11:59:33 -0000	1.2
+++ sources	3 Sep 2005 14:14:02 -0000	1.3
@@ -1 +1 @@
-a2177339360d4ad19816c66a7dfd0353  nexuiz-1.1.tar.bz2
+f46eab779e2d5d08bd21dad648a1e62f  nexuizenginesource20050814beta1.zip