rpms/raidem/devel raidem.desktop,1.1,1.2 raidem.spec,1.9,1.10

[Hans de Goede (jwrdegoede)]

Author: jwrdegoede

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

Modified Files:
	raidem.desktop raidem.spec 
Log Message:
* Tue Aug  7 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.3.1-6
- No longer build and link against libid3tag, as that would make us GPLv2+
  licensed instead of zlib licensed. Not that that would really be a problem,
  but since the id3tag functionality isn't used as we ship ogg music, this is
  better (bz 251055)
- Update License tag for new Licensing Guidelines compliance



Index: raidem.desktop
===================================================================
RCS file: /cvs/extras/rpms/raidem/devel/raidem.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- raidem.desktop	15 Mar 2006 18:43:34 -0000	1.1
+++ raidem.desktop	7 Aug 2007 18:06:13 -0000	1.2
@@ -1,12 +1,10 @@
 [Desktop Entry]
 Encoding=UTF-8
 Name=Raidem
-GenericName=2d top-down shoot'em up
-Comment=Inspired by Raptor
+Comment=2d top-down shoot'em up
 Exec=raidem
 Icon=raidem.png
 Terminal=false
 StartupNotify=false
 Type=Application
-Categories=Application;Game;ArcadeGame;
-Version=0.3
+Categories=Game;ArcadeGame;


Index: raidem.spec
===================================================================
RCS file: /cvs/extras/rpms/raidem/devel/raidem.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- raidem.spec	28 Aug 2006 15:01:04 -0000	1.9
+++ raidem.spec	7 Aug 2007 18:06:13 -0000	1.10
@@ -1,9 +1,9 @@
 Name:           raidem
 Version:        0.3.1
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        2d top-down shoot'em up
 Group:          Amusements/Games
-License:        zlib License
+License:        zlib
 URL:            http://home.exetel.com.au/tjaden/raidem/
 # This is an exacy copy of the upstream src except that lib/almp3 which is
 # an included mp3 decoder has been removed.
@@ -13,7 +13,7 @@
 Patch0:         raidem-0.3.1-syslibs.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  gcc-objc glyph-keeper-devel freetype-devel adime-devel
-BuildRequires:  zziplib-devel libpng-devel libid3tag-devel AllegroOGG-devel
+BuildRequires:  zziplib-devel libpng-devel AllegroOGG-devel
 BuildRequires:  automake desktop-file-utils
 
 %description
@@ -38,14 +38,14 @@
 
 %build
 # override _datadir otherwise it expects its datafile directly under /use/share
-%configure --datadir=%{_datadir}/%{name}
+%configure --datadir=%{_datadir}/%{name} --disable-id3
 make %{?_smp_mflags}
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-# DIY, since the Makefile uses hardcoded ( := assigned) paths and install -s
-# and install -g games, etc. Fixable but this is easier
+# DIY, since the Makefile uses install -s and install -g games, etc.
+# Fixable but this is easier
 mkdir -p $RPM_BUILD_ROOT%{_bindir}
 install -m 755 %{name} $RPM_BUILD_ROOT%{_bindir}/%{name}
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}
@@ -55,7 +55,6 @@
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
 desktop-file-install --vendor fedora            \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category X-Fedora                       \
   %{SOURCE2}
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
 install -p -m 644 %{SOURCE1} \
@@ -89,6 +88,13 @@
 
 
 %changelog
+* Tue Aug  7 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.3.1-6
+- No longer build and link against libid3tag, as that would make us GPLv2+
+  licensed instead of zlib licensed. Not that that would really be a problem,
+  but since the id3tag functionality isn't used as we ship ogg music, this is
+  better (bz 251055)
+- Update License tag for new Licensing Guidelines compliance
+
 * Mon Aug 28 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.3.1-5
 - Fix build with new dynamic glyph-keeper lib
 - FE6 Rebuild