[gnurobbo] fix legal content, finally

Mon Nov 3 20:41:04 UTC 2014

commit 8123b48fbaeffc698390140f386222b30d971f96
Author: Raphael Groner <projects.rg at smart.ms>
Date:   Mon Nov 3 21:40:54 2014 +0100

    fix legal content, finally

 .gitignore                 |    1 +
 gnurobbo-0.66svn412.tar.xz |  Bin 622240 -> 621900 bytes
 gnurobbo.spec              |   92 ++++++++++++++++++++++++++-----------------
 sources                    |    5 +-
 4 files changed, 60 insertions(+), 38 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index e31ede7..4df4ef9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
 /disabled
 /gnurobbo-svn-tarball.sh
 /gnurobbo-0.66svn412.tar.xz
+/gnurobbo-README.fedora
diff --git a/gnurobbo-0.66svn412.tar.xz b/gnurobbo-0.66svn412.tar.xz
index 8034dab..dac0d08 100644
Binary files a/gnurobbo-0.66svn412.tar.xz and b/gnurobbo-0.66svn412.tar.xz differ
diff --git a/gnurobbo.spec b/gnurobbo.spec
index e738f9a..58bc37e 100644
--- a/gnurobbo.spec
+++ b/gnurobbo.spec
@@ -1,10 +1,14 @@
 %global date    20141028
 %global rev     412
+
+%global readme  README.fedora
+
 %global source  %{name}-%{version}svn%{rev}
 
+
 Name:           gnurobbo
 Version:        0.66
-Release:        3.%{date}svn%{rev}%{?dist}
+Release:        4.%{date}svn%{rev}%{?dist}
 Summary:        Port of an once famous game named Robbo from 1989
 
 License:        GPLv2+
@@ -22,19 +26,26 @@ Source10:       https://svn.code.sf.net/p/%{name}/code/%{name}.16.png.bz2
 Source11:       https://svn.code.sf.net/p/%{name}/code/%{name}.32.png.bz2
 Source12:       https://svn.code.sf.net/p/%{name}/code/%{name}.48.png.bz2
 
-BuildRequires:  SDL-devel SDL_mixer-devel SDL_image-devel SDL_ttf-devel
+##information about legal issues
+Source20:       %{name}-%{readme}
+
+BuildRequires:  SDL-devel SDL_image-devel
+##FIXME fonts and sounds are disabled and so deps should be removed
+BuildRequires:  SDL_ttf-devel SDL_mixer-devel
+
 BuildRequires:  cmake
-#BuildRequires:  gettext
+BuildRequires:  gettext
 BuildRequires:  desktop-file-utils
 
 Requires:       hicolor-icon-theme
 
-Requires:       %{name}-extra = %{version}-%{release} 
+#Suggests:       %{name}-skin
+Obsoletes:      %{name}-data
 Obsoletes:      %{name}-fonts
 
 %description
 GNU Robbo is a free open source port of Janusz Pelc's Robbo
-which was distributed by LK Avalon (->) in 1989.
+which was distributed by LK Avalon in 1989.
 
 Features
    + Graphical skin support: Oily, Original and Tronic
@@ -58,27 +69,32 @@ The game-play of the original is faithfully reproduced with a few modifications
    + Bears don't endlessly spin around themselves
    + Capsules don't spawn from question marks
    + Solid laser fire is not left live after the gun has been destroyed
+   
+Take a look into %{readme} about legal issues cause of missing content.
 
 
-%package extra
-Summary:        Extra files for the game %{name}
+%package tronic
+Summary:        Tronic skin for the game %{name}
 BuildArch:      noarch
 Requires:       %{name} = %{version}-%{release}
-Obsoletes:      %{name}-data
+Provides:       %{name}-skin
 
-%description extra
-Extra files for the game %{name}:
-Levels, locales, skins, sounds.
+%description tronic
+Optional skin named tronic for the game %{name}:
+Newly created skin with some vintage science fiction influences.
 
 
 %prep
 %setup -qn %{source}
-chmod 0644 %{SOURCE1}
+chmod 0644 %SOURCE1
 %patch0
 rm Makefile
 %patch1
+cp -p %SOURCE10 %SOURCE11 %SOURCE12 .
+bunzip2 *.png.bz2
+cp -p %SOURCE20 %{readme}
 
-##FIXME do not distribute any illegal content
+##do not distribute any illegal content
 sed -i s,add_subdirectory.data.,, CMakeLists.txt
 
 
@@ -90,13 +106,16 @@ make %{?_smp_mflags}
 
 %install
 %make_install
+
+##legal content parts
 install -d %{buildroot}%{_datadir}/%{name}
 cp -ap data/locales data/levels data/skins data/rob %{buildroot}%{_datadir}/%{name}
-cd %{buildroot}%{_datadir}
 
 ##desktop
-install -d applications
-cat > applications/%{name}.desktop << EOF
+cd %{buildroot}
+install -d .%{_datadir}/applications
+cd .%{_datadir}/applications
+cat > %{name}.desktop << EOF
 [Desktop Entry]
 Name=GNU Robbo
 Comment=Port of the once famous ATARI game Robbo
@@ -107,18 +126,20 @@ Type=Application
 StartupNotify=true
 Categories=Game;ArcadeGame;
 EOF
-desktop-file-validate applications/%{name}.desktop
+desktop-file-validate %{name}.desktop
 
 ##icons
-install -d icons/hicolor ; cd icons/hicolor
-install -d 16x16 ; bzcat %{SOURCE10} > 16x16/%{name}.png
-install -d 32x32 ; bzcat %{SOURCE11} > 32x32/%{name}.png
-install -d 48x48 ; bzcat %{SOURCE12} > 48x48/%{name}.png
-install -d %{buildroot}%{_datadir}/pixmaps
-install 48x48/%{name}.png %{buildroot}%{_datadir}/pixmaps
-
+cd %{buildroot}
+install -d .%{_datadir}/icons/hicolor
+cd .%{_datadir}/icons/hicolor
+for size in 16 32 48; do
+ install -d $size'x'$size/apps
+ install %{_builddir}/%{buildsubdir}/%{name}.$size.png $size'x'$size/apps/%{name}.png
+done
+cd %{buildroot}
+install -d .%{_datadir}/pixmaps
+ln -s ../icons/hicolor/48x48/apps/%{name}.png .%{_datadir}/pixmaps/%{name}.png
 
-##icons fiddling
 %post
 /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
 
@@ -134,6 +155,8 @@ fi
 
 %files
 %doc AUTHORS Bugs COPYING ChangeLog NEWS README TODO
+##distribution is only allowed for legal content
+%doc %{readme} LICENSE-ttf LICENSE-sound
 %{_bindir}/%{name}
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/levels/
@@ -141,22 +164,19 @@ fi
 %{_datadir}/%{name}/rob/
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/pixmaps/%{name}.png
-%{_datadir}/icons/hicolor/*/%{name}.png
-
-
-%files extra
-%doc LICENSE-ttf LICENSE-sound
-##FIXME clarify legal situation or replace skins with free content
+%{_datadir}/icons/hicolor/*/apps/%{name}.png
 %dir %{_datadir}/%{name}/skins
-##tronic: Newly created skin with some vintage science fiction influences.
-%dir %{_datadir}/%{name}/skins/tronic
-%{_datadir}/%{name}/skins/tronic/*.bmp
-%{_datadir}/%{name}/skins/tronic/*.png
-%{_datadir}/%{name}/skins/tronic/skinrc
 
+%files tronic
+%{_datadir}/%{name}/skins/tronic/
 
 
 %changelog
+* Sat Nov 01 2014 Raphael Groner <projects.rg [AT] smart.ms> - 0.66-4.20141028svn412
+- rebuilt for SCM
+- preserve timestamps of icons
+- cleanup package structure again
+
 * Tue Oct 28 2014 Raphael Groner <projects.rg [AT] smart.ms> - 0.66-3.20141028svn412
 - distribute legal content only (rhbz #1157664)
 - use biggest desktop icon that we have (partly rhbz #1157534)
diff --git a/sources b/sources
index 284a391..d579303 100644
--- a/sources
+++ b/sources
@@ -1,7 +1,8 @@
+52be5f8ad2c5ed7d87a9b834bf64c2db  gnurobbo-0.66svn412.tar.xz
+fe2bfbb8e9d2ec75e8c8b4b077f050f4  gnurobbo-svn-tarball.sh
 0392189ed5f7372531d13cdbc07caa87  gnurobbo.16.png.bz2
 bd65222d33680a16a25f94b488dd5b0c  gnurobbo.32.png.bz2
 e572aa6fdb06adba146a595fd05b8900  gnurobbo.48.png.bz2
 064b9678a8720bead85e74a436eee236  gnurobbo-cmake.patch
 fcb120ace771e42688a3c073ea7aef84  gnurobbo-hardening.patch
-1cf7c77710737ea8419e28677d123cd6  gnurobbo-0.66svn412.tar.xz
-fe2bfbb8e9d2ec75e8c8b4b077f050f4  gnurobbo-svn-tarball.sh
+0ba7771d2bb67add32002b453ffd408c  gnurobbo-README.fedora
