rpms/nazghul/devel .cvsignore, 1.7, 1.8 nazghul.spec, 1.17, 1.18 sources, 1.8, 1.9

[Jason ティビツ (tibbs)]

Author: tibbs

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

Modified Files:
	.cvsignore nazghul.spec sources 
Log Message:
* Thu Mar 13 2008 Jason L Tibbitts III <tibbs at math.uh.edu> - 0.6.0-3.20080312cvs
- Bump to current CVS version at upstream request.
- Add CVS snapshot generation instructions.
- Install the music which "make install" misses.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nazghul/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	6 Nov 2007 17:42:32 -0000	1.7
+++ .cvsignore	13 Mar 2008 23:20:59 -0000	1.8
@@ -1 +1 @@
-nazghul_0_6_0.tar.gz
+nazghul-20080312.tgz


Index: nazghul.spec
===================================================================
RCS file: /cvs/extras/rpms/nazghul/devel/nazghul.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- nazghul.spec	11 Feb 2008 00:37:46 -0000	1.17
+++ nazghul.spec	13 Mar 2008 23:20:59 -0000	1.18
@@ -1,21 +1,29 @@
+%define         cvsdate 20080312
 Name:           nazghul
 Version:        0.6.0
-Release:        2%{?dist}
+Release:        3.%{cvsdate}cvs%{?dist}
 Summary:        A computer role-playing game (CRPG) engine
 
 Group:          Amusements/Games
 License:        GPLv2+
 URL:            http://myweb.cableone.net/gmcnutt/nazghul.html
 
+# Occasionally upstream names things with an underscore.
 %define         version_us %(echo %{version} | sed -e 's/\\./_/g')
 
-# Upstream has gone mildly insane
 #Source0:        http://dl.sourceforge.net/nazghul/nazghul-%{version}.tar.gz
-Source0:        http://easynews.dl.sourceforge.net/%{name}/%{name}_%{version_us}.tar.gz
+
+# Construct cvs checkout tarball with:
+#  cvs -z3 -d:pserver:anonymous at nazghul.cvs.sourceforge.net:/cvsroot/nazghul co -D%{cvsdate} nazghul
+#  tar cvvfz nazghul-%{cvsdate}.tgz nazghul
+Source0:        nazghul-%{cvsdate}.tgz
 Patch0:         nazghul-desktop.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  SDL_image-devel, desktop-file-utils, libpng-devel
+BuildRequires:  SDL_image-devel, SDL_mixer-devel, desktop-file-utils, libpng-devel
+
+# For building from a CVS snapshot
+BuildRequires:  automake, autoconf
 
 %description
 Nazghul is an old-school RPG engine modeled after those made in the
@@ -36,8 +44,7 @@
 
 
 %prep
-# More upstream insanity
-%setup -q -n %{name}_%{version_us}
+%setup -q -n %{name}
 %patch0
 
 # clean up CVS directories left in the source tarball
@@ -50,6 +57,7 @@
 
 
 %build
+./autogen.sh
 %configure
 make %{?_smp_mflags}
 
@@ -67,6 +75,11 @@
 
 install -D -m 644 icons/haxima.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/haxima.png
 
+# It seems that the music gets left out by "make install"
+pushd %{_builddir}/%{name}/worlds/haxima-1.002
+cp -rp music $RPM_BUILD_ROOT%{_datadir}/nazghul/haxima
+popd
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -90,6 +103,11 @@
 
 
 %changelog
+* Thu Mar 13 2008 Jason L Tibbitts III <tibbs at math.uh.edu> - 0.6.0-3.20080312cvs
+- Bump to current CVS version at upstream request.
+- Add CVS snapshot generation instructions.
+- Install the music which "make install" misses.
+
 * Sun Feb 10 2008 Jason L Tibbitts III <tibbs at math.uh.edu> - 0.6.0-2
 - Rebuild for gcc 4.3.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nazghul/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	6 Nov 2007 17:42:32 -0000	1.8
+++ sources	13 Mar 2008 23:20:59 -0000	1.9
@@ -1 +1 @@
-9535f569ac61893f7d5e8cfa93f99df0  nazghul_0_6_0.tar.gz
+c62ba1de2bd5c218a14bdc544ce950ee  nazghul-20080312.tgz