Hello community, here is the log from the commit of package starfighter for openSUSE:Factory checked in at 2015-07-12 22:52:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/starfighter (Old) and /work/SRC/openSUSE:Factory/.starfighter.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "starfighter" Changes: -------- --- /work/SRC/openSUSE:Factory/starfighter/starfighter.changes 2015-02-24 13:07:18.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.starfighter.new/starfighter.changes 2015-07-12 22:52:23.000000000 +0200 @@ -1,0 +2,38 @@ +Tue Jul 7 08:16:47 UTC 2015 - cfarr...@suse.com + +- license update: GPL-3.0+ + + +------------------------------------------------------------------- +Sun Jun 28 15:39:22 UTC 2015 - nemy...@gmx.ch + +- Update to -, announce messages are here: + + Project: Starfighter 1.4 Released + https://savannah.nongnu.org/forum/forum.php?forum_id=8295 + + Project: Starfighter 1.3.3 Released + https://savannah.nongnu.org/forum/forum.php?forum_id=8275 + + Project: Starfighter 1.3.1 Released + https://savannah.nongnu.org/forum/forum.php?forum_id=8253 + + Project: Starfighter 1.3 Released + https://savannah.nongnu.org/forum/forum.php?forum_id=8249 + +- Change Url from SourceForge to non-GNU +- Change license GPL-2.0 to GPL-2.0+ and GPL-3.0+ and CC0-1.0 and CC-BY-3.0 and SUSE-Public-Domain +- Change Source0 Web URL +- Change starfighter-icons.tar to use _IxI.png instead of -I.png +- Remove BuildRequires for fdupes, not need for it, make bad Symlinks + and Game not works +- Add BuildRequires for dos2unix +- Remove BuildRequires for python, zlib-devel, pkgconfig(SDL_image), + pkgconfig(SDL_mixer) +- Add BuildRequires for pkgconfig(SDL2_image), pkgconfig(SDL2_mixer) +- Correct what fdupes find +- Add sed, Fix RPM_OPT_FLAGS +- Add sed, Correct bad linking +- Change Documentation + +------------------------------------------------------------------- Old: ---- starfighter-1.2.tar.gz New: ---- starfighter-1.4-src.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ starfighter.spec ++++++ --- /var/tmp/diff_new_pack.gUxk25/_old 2015-07-12 22:52:25.000000000 +0200 +++ /var/tmp/diff_new_pack.gUxk25/_new 2015-07-12 22:52:25.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package starfighter # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,25 +17,23 @@ Name: starfighter -Version: 1.2 +Version: 1.4 Release: 0 Summary: Liberate the universe from the evil company WEAPCO -License: GPL-2.0 +License: GPL-3.0+ Group: Amusements/Games/Action/Arcade -Url: http://sourceforge.net/projects/pr-starfighter/ -Source0: http://sourceforge.net/projects/pr-%{name}/files/%{name}-%{version}.tar.gz +Url: http://starfighter.nongnu.org/ +Source0: http://download.savannah.gnu.org/releases/%{name}/%{version}/%{name}-%{version}-src.tar.gz Source1: %{name}-icons.tar Source2: %{name}.desktop %if 0%{?suse_version} -BuildRequires: fdupes BuildRequires: hicolor-icon-theme BuildRequires: update-desktop-files %endif +BuildRequires: dos2unix BuildRequires: gcc-c++ -BuildRequires: python -BuildRequires: zlib-devel -BuildRequires: pkgconfig(SDL_image) -BuildRequires: pkgconfig(SDL_mixer) +BuildRequires: pkgconfig(SDL2_image) +BuildRequires: pkgconfig(SDL2_mixer) BuildRequires: pkgconfig(sdl) %description @@ -49,8 +47,21 @@ escape a Weapco patrol that has intercepted him. %prep -%setup -q -a 1 -mv makefile Makefile +%setup -q -a 1 -n %{name}-%{version}-src + +# Some docs have the DOS line ends +dos2unix README.txt + +# Correct what fdupes find +for f in brief20 brief21 ; do + rm -fv data/"$f".txt + ln -sf brief19.txt data/"$f".txt +done +rm -fv aliens26.dat +ln -sf aliens25.dat data/aliens26.dat + +# SED-FIX-OPENSUSE -- Fix RPM_OPT_FLAGS +sed -i -e 's|-O2 -Wall -g|%{optflags}|' Makefile %build make %{?_smp_mflags} BINDIR=%{_bindir}/ DATADIR=%{_datadir}/%{name}/ DOCDIR=%{_docdir}/%{name}/ @@ -60,7 +71,7 @@ # install icons for i in 16 32 48 64 72 96 128 ; do - install -Dm 0644 icons/%{name}-${i}.png %{buildroot}%{_datadir}/icons/hicolor/${i}x${i}/apps/%{name}.png + install -Dm 0644 icons/%{name}_${i}x${i}.png %{buildroot}%{_datadir}/icons/hicolor/${i}x${i}/apps/%{name}.png done # install Desktop file @@ -68,12 +79,16 @@ %if 0%{?suse_version} %suse_update_desktop_file %{name} - %fdupes -s %{buildroot}%{_prefix} %endif +# SED-FIX-UPSTREAM -- Correct bad linking, fdupes make bad Symlinks and Game not works +for f in arrowNorthEast dollar heart plasmaAmmo plasmaDamage plasmaRate rocket rocketAmmo sflogo superCharge ; do + ln -sf ../../../%{name}/gfx/"$f".png docs/"$f".png +done + %files %defattr(-,root,root,-) -%attr(0644,root,root) %doc docs/* ChangeLog +%doc docs/* COPYING LICENSES README.txt %{_bindir}/%{name} %{_datadir}/applications/%{name}.desktop %{_datadir}/icons/hicolor/ ++++++ starfighter-icons.tar ++++++ Files /var/tmp/diff_new_pack.gUxk25/_old and /var/tmp/diff_new_pack.gUxk25/_new differ ++++++ starfighter.desktop ++++++ --- /var/tmp/diff_new_pack.gUxk25/_old 2015-07-12 22:52:25.000000000 +0200 +++ /var/tmp/diff_new_pack.gUxk25/_new 2015-07-12 22:52:25.000000000 +0200 @@ -1,5 +1,6 @@ [Desktop Entry] Name=Project: Starfighter +GenericName=Starfighter Comment=Liberate the universe from the evil company WEAPCO Type=Application Exec=starfighter
