rpms/freedroid/devel freedroid.spec,1.14,1.15

[Ville Skyttä]

Author: scop

Update of /cvs/pkgs/rpms/freedroid/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12295

Modified Files:
	freedroid.spec 
Log Message:
* Fri Feb 27 2009 Ville Skyttä <ville.skytta at iki.fi> - 1.0.2-12
- Split data files into a subpackage, make it noarch for Fedora >= 10.



Index: freedroid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/freedroid/devel/freedroid.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- freedroid.spec	24 Feb 2009 18:17:04 -0000	1.14
+++ freedroid.spec	16 Mar 2009 22:41:12 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           freedroid
 Version:        1.0.2
-Release:        11%{?dist}
+Release:        12%{?dist}
 Summary:        Clone of the C64 game Paradroid
 
 Group:          Amusements/Games
@@ -21,6 +21,7 @@
 BuildRequires:  ImageMagick
 BuildRequires:  libvorbis-devel
 BuildRequires:  desktop-file-utils
+Requires:       %{name}-data = %{version}
 
 %description
 This is a clone of the classic game "Paradroid" on Commodore 64
@@ -33,6 +34,17 @@
 control over them by creating connections in a short subgame of
 electric circuits.
 
+%package        data
+Summary:        Game data files for Freedroid
+Group:          Amusements/Games
+Requires:       %{name} = %{version}
+%if 0%{?fedora} >= 10
+BuildArch:      noarch
+%endif
+
+%description    data
+This package contains game data files for Freedroid.
+
 
 %prep
 %setup -q
@@ -41,6 +53,9 @@
 %patch2 -p1
 %patch3 -p1
 
+chmod -c -x graphics/paraicon.ico
+convert graphics/paraicon.ico freedroid.png
+
 
 %build
 %configure --disable-dependency-tracking
@@ -54,8 +69,7 @@
 desktop-file-install --vendor fedora \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
   %{SOURCE1}
-install -dm 755 $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps
-convert graphics/paraicon.ico \
+install -Dpm 644 freedroid.png \
   $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/freedroid.png
 
 
@@ -77,16 +91,22 @@
 
 
 %files
-%defattr(0644,root,root,0755)
+%defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING NEWS README TODO
-%attr(0755,root,root) %{_bindir}/freedroid
+%{_bindir}/freedroid
 %{_datadir}/applications/*freedroid.desktop
 %{_datadir}/icons/hicolor/32x32/apps/freedroid.png
-%{_datadir}/freedroid/
 %{_mandir}/man6/freedroid.6*
 
+%files data
+%defattr(-,root,root,-)
+%{_datadir}/freedroid/
+
 
 %changelog
+* Fri Feb 27 2009 Ville Skyttä <ville.skytta at iki.fi> - 1.0.2-12
+- Split data files into a subpackage, make it noarch for Fedora >= 10.
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.2-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild