[nazghul] New release, license changes and cleanups

[Jason ティビツ]

commit 043d1e43ca1afe1d99d29d89317c3c2ac8ba3f5c
Author: Jason Tibbitts <tibbs at math.uh.edu>
Date:   Wed Aug 18 19:57:37 2010 -0500

    New release, license changes and cleanups
    
    - Update to post-0.7.0 release.
    - Remove %clean section; no longer required in Fedora.
    - The music is now freely licensed!  Install the license file properly and
      document the change.

 nazghul.spec |   37 +++++++++++++++++++++++--------------
 sources      |    3 ++-
 2 files changed, 25 insertions(+), 15 deletions(-)
---
diff --git a/nazghul.spec b/nazghul.spec
index 1411add..c7a509d 100644
--- a/nazghul.spec
+++ b/nazghul.spec
@@ -1,12 +1,12 @@
-%define         cvsdate 20090928
+%define         cvsdate 20100413
 Name:           nazghul
 Version:        0.7.0
-Release:        0.4.%{cvsdate}cvs%{?dist}
+Release:        1.%{cvsdate}cvs%{?dist}
 Summary:        A computer role-playing game (CRPG) engine
 
-Group:          Amusements/Games
 License:        GPLv2+
 URL:            http://myweb.cableone.net/gmcnutt/nazghul.html
+Group:          Amusements/Games
 
 # Occasionally upstream names things with an underscore.
 %define         version_us %(echo %{version} | sed -e 's/\\./_/g')
@@ -14,9 +14,9 @@ URL:            http://myweb.cableone.net/gmcnutt/nazghul.html
 #Source0:        http://dl.sourceforge.net/nazghul/nazghul-%{version}.tar.gz
 
 # Construct cvs checkout tarball with:
-#  cvs -z3 -d:pserver:anonymous at nazghul.cvs.sourceforge.net:/cvsroot/nazghul co -D%{cvsdate} nazghul
-#  tar cvvfJ nazghul-%{cvsdate}.txz nazghul
+#  ./nazghul-make-snapshot %{cvsdate}
 Source0:        nazghul-%{cvsdate}.txz
+Source1:        haxima-music-license
 Patch0:         nazghul-desktop.patch
 
 # For building from a CVS snapshot
@@ -31,6 +31,10 @@ after Ultima V.
 
 %package -n haxima
 Summary:        A full-featured role-playing game for the Nazghul engine
+# The music files installed in /usr/share/nazghul/haxima/music have been
+# relicensed as CC-BY-SA (specifically version 2).   See the
+# haxima-music-license file for details. The rest of the package is GPLv2+.
+License:        GPLv2+ and CC-BY-SA
 Group:          Amusements/Games
 Requires:       nazghul = %{version}
 Provides:       nazghul-haxima = %{version}-%{release}
@@ -55,6 +59,8 @@ sed -i -e 's/\r//' doc/engine_extension_and_design/my_TODO.2004.05.05.txt
 
 mv doc/* .
 
+cp %SOURCE1 .
+
 
 %build
 ./autogen.sh
@@ -67,23 +73,20 @@ make install DESTDIR=%{buildroot}
 
 mv %{buildroot}/%{_bindir}/haxima.sh %{buildroot}/%{_bindir}/haxima
 
-desktop-file-install --vendor fedora                            \
-        --dir %{buildroot}/%{_datadir}/applications         \
-        --add-category X-Fedora                                 \
-        haxima.desktop
+desktop-file-install --vendor fedora            \
+    --dir %{buildroot}/%{_datadir}/applications \
+    --add-category X-Fedora                     \
+    haxima.desktop
 
 install -D -m 644 icons/haxima.png %{buildroot}/%{_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 %{buildroot}/%{_datadir}/nazghul/haxima
 #popd
 
 
-%clean
-rm -rf %{buildroot}
-
-
 %files
 %defattr(-,root,root,-)
 %{_bindir}/nazghul
@@ -98,10 +101,16 @@ rm -rf %{buildroot}
 %{_datadir}/nazghul/haxima
 %{_datadir}/applications/fedora-haxima.desktop
 %{_datadir}/pixmaps/haxima.png
-%doc USERS_GUIDE
+%doc USERS_GUIDE haxima-music-license
 
 
 %changelog
+* Tue Aug 17 2010 Jason L Tibbitts III <tibbs at math.uh.edu> - 0.7.0-1.20100413cvs
+- Update to post-0.7.0 release.
+- Remove %%clean section; no longer required in Fedora.
+- The music is now freely licensed!  Install the license file properly and
+  document the change.
+
 * Tue Sep 29 2009 Jason L Tibbitts III <tibbs at math.uh.edu> - 0.7.0-0.4.20090928cvs
 - Pull latest fixes.
 
diff --git a/sources b/sources
index 4888662..0ee9c28 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
-96ce0446611ae42d3aa59c75eaada5c1  nazghul-20090928.txz
+74f5e16c8bb1a3c218b8483ad453ac00  nazghul-20100413.txz
+f0da1c3156425ee69cdfaffcb98fa0e8  haxima-music-license