Hello community, here is the log from the commit of package pingus for openSUSE:Factory checked in at 2014-12-16 14:49:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pingus (Old) and /work/SRC/openSUSE:Factory/.pingus.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pingus" Changes: -------- --- /work/SRC/openSUSE:Factory/pingus/pingus.changes 2012-05-21 07:29:45.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.pingus.new/pingus.changes 2014-12-16 14:49:26.000000000 +0100 @@ -1,0 +2,19 @@ +Thu Dec 11 22:16:55 UTC 2014 - [email protected] + +- Change Desktop entry +- Remove icon pingus.png, use supplied icons +- Change Summary abd Group +- Download from Google Code and packed as tar.bz2 +- Remove obsolete patch pingus-gcc47.patch, changed by upstream +- Use sed instead of simple patches pingus-cwiid_with_bluez.patch, + dsolink.patch, remove-debug_fix-includes.patch and + makefile-fixes.patch +- Add patches pingus-0.7.6-Makefile.patch and + pingus-0.7.6-SConscript.patch +- Use check for openSUSE %if 0%{?suse_version} +- Add BuildRequires for hicolor-icon-theme, dos2unix and + pkgconfig(xi) +- Use BuildRequires pkgconfig() instead of devel packages +- Change Description + +------------------------------------------------------------------- Old: ---- dsolink.patch makefile-fixes.patch pingus-0.7.6.tar.bz2 pingus-cwiid_with_bluez.patch pingus-gcc47.patch pingus.png remove-debug_fix-includes.patch New: ---- pingus-0.7.6+git-6a1153a.tar.bz2 pingus-0.7.6-Makefile.patch pingus-0.7.6-SConscript.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pingus.spec ++++++ --- /var/tmp/diff_new_pack.yk4Gnr/_old 2014-12-16 14:49:28.000000000 +0100 +++ /var/tmp/diff_new_pack.yk4Gnr/_new 2014-12-16 14:49:28.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package pingus # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -25,67 +25,114 @@ Name: pingus Version: 0.7.6 Release: 0 -Summary: A Lemmings Clone +Summary: Free Lemmings-like puzzle game License: GPL-3.0+ -Group: Amusements/Games/Action/Arcade +Group: Amusements/Games/Logic Url: http://pingus.seul.org/ -Source: http://pingus.googlecode.com/files/pingus-%{version}.tar.bz2 -Source2: %{name}.desktop -Source3: %{name}.png -# PATCH-FEATURE-OPENSUSE pingus-cwiid_with_bluez.patch [email protected] -- adds wii support -Patch1: pingus-cwiid_with_bluez.patch -# PATCH-FIX-UPSTREAM dsolink.patch -- Fix linking against X11 -Patch2: dsolink.patch -# PATCH-FIX-UPSTREAM remove-debug_fix-includes.patch [email protected] -- allow wii support to compile -Patch3: remove-debug_fix-includes.patch -# PATCH-FIX-OPENSUSE makefile-fixes.patch [email protected] -- use /usr for prefix -Patch4: makefile-fixes.patch -# PATCH-FIX-UPSTREAM pingus-gcc47.patch [email protected] -- Fix build with gcc 4.7 -Patch5: pingus-gcc47.patch -BuildRequires: SDL_image-devel -BuildRequires: SDL_mixer-devel +# Downloaded from https://code.google.com/p/pingus/source/checkout +# Packed as tar.bz2 +Source0: %{name}-%{version}+git-6a1153a.tar.bz2 +# PATCH-FIX-UPSTREAM Issue 136, Add .desktop file to source package +Source1: %{name}.desktop +# PATCH-FIX-UPSTREAM pingus-0.7.6-Makefile.patch -- Issue 144, use /usr for prefix, fix man, permissions +Patch1: %{name}-%{version}-Makefile.patch +# PATCH-FIX-UPSTREAM pingus-0.7.6-SConscript.patch -- Issue 145, Fix linking against X11 and adds wii support +Patch2: %{name}-%{version}-SConscript.patch +%if 0%{?suse_version} +BuildRequires: fdupes +BuildRequires: hicolor-icon-theme +BuildRequires: update-desktop-files +%endif BuildRequires: bluez-devel BuildRequires: boost-devel -BuildRequires: fdupes +BuildRequires: dos2unix BuildRequires: gcc-c++ BuildRequires: libcwiid-devel BuildRequires: libpng-devel BuildRequires: scons -BuildRequires: update-desktop-files +BuildRequires: pkgconfig(SDL_image) +BuildRequires: pkgconfig(SDL_mixer) +BuildRequires: pkgconfig(xi) BuildRoot: %{_tmppath}/%{name}-%{version}-build %description -Pingus is a free Lemmings-like game covered under the GNU GPL. It features -currently 22 playable levels and runs under a wide variety of operating systems -(Linux, Windows, etc.) +Pingus is a free Lemmings-like puzzle game covered under the GNU GPL. +It features currently 77 playable levels. + +You can use to see which languages are supported + + pingus --list-languages + +And start with + + pingus --language de + + +If you wish to play the other levels + + pingus /usr/share/pingus/levels/playable/some-level + pingus /usr/share/pingus/levels/incoming/some-level + pingus /usr/share/pingus/levels/wip/some-level + +The other, probably more userfriendly, way is to simply load them into +the level editor and then click the play button. %prep -%setup -q +%setup -q -n %{name} %patch1 %patch2 -%patch3 -%patch4 -%patch5 -p1 + +# Convert to unix line end +dos2unix data/po/pl.po data/levels/incoming/*.pingus \ + data/images/pingus/README + +# SED-FIX-UPSTREAM -- Issue 144, Fix datadir +sed -i 's|set_path("data")|set_path("%{_datadir}/%{name}")|' \ + src/pingus/pingus_main.cpp + +# SED-FIX-UPSTREAM -- Issue 145, Fix linking against X11 +sed -i 's|'SDL_mixer', 'png'|'SDL_mixer', 'png', 'X11'|' \ + src/engine/input/SConstruct.main + +# SED-FIX-UPSTREAM -- Issue 146, Remove debug, add missing includes and allow wii support to compile +sed -i -e 's|"pingus/debug.hpp"|<iostream>|' \ + -i -e '/pout(PINGUS_DEBUG_INPUT)/d' \ + src/engine/input/xinput/xinput_driver.cpp +sed -i -e :a -e '\%/#include "engine/input/xinput/xinput_driver.hpp"%!b' \ + -e $'n;/namespace Input {/i\\\n#include <iostream>' -e ba src/engine/input/xinput/xinput_device.cpp +sed -i -e 's|"pingus/debug.hpp"|<iostream>|' \ + -i -e '/WiimoteDriver: (wiimote:button/,+2d' \ + -i -e '/WiimoteDriver: (wiimote:axis/,+3d' \ + src/engine/input/wiimote/wiimote_driver.cpp %build mkdir -p build -scons %{?_smp_mflags} CCFLAGS="%{optflags}" with_wiimote=%{with_wiimote} with_linuxusbmouse=True with_linuxevdev=True with_xinput=True +scons %{?_smp_mflags} CCFLAGS="%{optflags}" with_wiimote=%{with_wiimote} \ + with_linuxusbmouse=True with_linuxevdev=True with_xinput=True %install %make_install -mkdir -p %{buildroot}%{_datadir}/pixmaps/ -install -m 644 %{SOURCE3} %{buildroot}%{_datadir}/pixmaps -%suse_update_desktop_file -i %{name} Game ArcadeGame -%fdupes -s %{buildroot}%{_datadir} + +# install icons +install -Dm 0644 data/images/icons/pingus.png %{buildroot}/%{_datadir}/icons/hicolor/32x32/apps/%{name}.png +install -Dm 0644 data/images/icons/pingus-icon.png %{buildroot}/%{_datadir}/icons/hicolor/48x48/apps/%{name}.png +install -Dm 0644 data/images/icons/pingus.svg %{buildroot}/%{_datadir}/icons/hicolor/scalable/apps/%{name}.png + +# install Desktop file +install -Dm 0644 %{S:1} %{buildroot}%{_datadir}/applications/%{name}.desktop + +%if 0%{?suse_version} + %suse_update_desktop_file %{name} + %fdupes -s %{buildroot}%{_prefix} +%endif %files -%defattr(-,root,root) +%defattr(-,root,root,-) %doc AUTHORS COPYING NEWS README TODO -%doc %{_mandir}/man1/pingus.6.gz -%{_bindir}/pingus -%{_bindir}/pingus.bin -%{_datadir}/pingus +%{_bindir}/%{name} +%{_mandir}/man6/%{name}.6%{ext_man} %{_datadir}/applications/%{name}.desktop -%{_datadir}/pixmaps/%{name}.png +%{_datadir}/icons/hicolor/ +%{_datadir}/%{name} %changelog ++++++ pingus-0.7.6-Makefile.patch ++++++ --- Makefile.orig 2014-12-07 23:18:13.000000000 +0100 +++ Makefile 2014-12-11 13:46:51.612125910 +0100 @@ -15,7 +15,7 @@ ## along with this program. If not, see <http://www.gnu.org/licenses/>. DESTDIR = -PREFIX = /usr/local +PREFIX = /usr DATADIR = $(PREFIX)/share/pingus MANDIR = $(PREFIX)/share/man BINDIR = $(PREFIX)/bin @@ -38,10 +38,7 @@ install-exec: build/pingus install -d "$(DESTDIR)$(BINDIR)" - install -D build/pingus "$(DESTDIR)$(BINDIR)/pingus.bin" - echo "#!/bin/sh" > "$(DESTDIR)$(BINDIR)/pingus" - echo "exec \"$(BINDIR)/pingus.bin\" --datadir \"$(DATADIR)\" \"\$$@\"" >> "$(DESTDIR)$(BINDIR)/pingus" - chmod 755 "$(DESTDIR)$(BINDIR)/pingus" + install -Dm 0755 build/pingus "$(DESTDIR)$(BINDIR)/pingus" install-data: cd data/ && \ @@ -64,10 +61,10 @@ -name "*.pingus" -o \ -name "*.levelset" -o \ -name "*.sprite" \ - \) -exec install -D {} $(DESTDIR)$(DATADIR)/{} \; + \) -exec install -Dm 0644 {} $(DESTDIR)$(DATADIR)/{} \; install-man: - install -D doc/man/pingus.6 "$(DESTDIR)$(MANDIR)/man1/pingus.6" + install -Dm 0644 doc/man/pingus.6 "$(DESTDIR)$(MANDIR)/man6/pingus.6" .PHONY : clean install install-exec install-data install-man ++++++ pingus-0.7.6-SConscript.patch ++++++ --- SConscript.orig 2014-12-07 23:18:14.000000000 +0100 +++ SConscript 2014-12-11 17:05:40.770327085 +0100 @@ -165,14 +165,12 @@ def configure_wiimote(self): if not self.env['with_wiimote']: self.reports += " * Wiimote support: disabled\n" - elif self.conf.CheckLibWithHeader('cwiid', 'cwiid.h', 'c++'): + else: self.reports += " * Wiimote support: yes\n" self.conf.env.Append(CPPDEFINES = [('HAVE_CWIID', 1)]) - self.conf.env.Append(LIBS = ['cwiid']) + self.conf.env.Append(LIBS = ['cwiid', 'bluetooth', 'pthread', 'rt']) self.conf.env.Append(optional_sources = ['src/engine/input/wiimote/wiimote_driver.cpp', 'src/engine/input/wiimote/wiimote.cpp']) - else: - self.reports += " * Wiimote support: no (libcwiid or cwiid.h not found)\n" def configure_xinput(self): if not self.env['with_xinput']: @@ -183,6 +181,7 @@ self.reports += " * XInput support: yes\n" self.conf.env.Append(CPPDEFINES = [('HAVE_XINPUT', 1)]) self.conf.env.Append(LIBS = ['Xi']) + self.conf.env.Append(LIBS = ['Xi','X11']) self.conf.env.Append(optional_sources = ['src/engine/input/xinput/xinput_driver.cpp', 'src/engine/input/xinput/xinput_device.cpp']) ++++++ pingus.desktop ++++++ --- /var/tmp/diff_new_pack.yk4Gnr/_old 2014-12-16 14:49:28.000000000 +0100 +++ /var/tmp/diff_new_pack.yk4Gnr/_new 2014-12-16 14:49:28.000000000 +0100 @@ -1,8 +1,10 @@ [Desktop Entry] -Encoding=UTF-8 -Type=Application Name=Pingus -Exec=pingus -f +GenericName=Lemmings +Comment=Free Lemmings-like puzzle game Icon=pingus -X-KDE-StartupNotify=false +Exec=pingus -f +Type=Application +Categories=Game;LogicGame; +StartupNotify=false -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
