Hello community, here is the log from the commit of package frozen-bubble for openSUSE:Factory checked in at 2016-11-14 20:12:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/frozen-bubble (Old) and /work/SRC/openSUSE:Factory/.frozen-bubble.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "frozen-bubble" Changes: -------- --- /work/SRC/openSUSE:Factory/frozen-bubble/frozen-bubble.changes 2015-08-31 22:59:11.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.frozen-bubble.new/frozen-bubble.changes 2016-11-14 20:12:12.000000000 +0100 @@ -1,0 +2,15 @@ +Wed Aug 24 00:34:54 UTC 2016 - [email protected] + +- Use bundled icons and install all resolutions available. +- Removed code in spec for now unmaintained openSUSE versions. + +------------------------------------------------------------------- +Tue Aug 23 21:18:54 UTC 2016 - [email protected] + +- Add appdata.patch and desktop.patch for inclusion in + https://software.opensuse.org/packages/Games +- Avoid deprecated pixmap icon folder. +- Use https://en.opensuse.org/SourceUrls +- Add missing desktop/icon post macros. + +------------------------------------------------------------------- Old: ---- frozen-bubble-2.212_20121024.tar.bz2 frozen-bubble.desktop frozen-bubble.png suse_frozen2.png New: ---- appdata.patch desktop.patch frozen-bubble-2.2.1-beta1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ frozen-bubble.spec ++++++ --- /var/tmp/diff_new_pack.BkKqlH/_old 2016-11-14 20:12:14.000000000 +0100 +++ /var/tmp/diff_new_pack.BkKqlH/_new 2016-11-14 20:12:14.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package frozen-bubble # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 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 @@ -24,24 +24,27 @@ License: GPL-2.0+ Group: Amusements/Games/Action/Arcade Url: http://www.frozen-bubble.org/ -Source: %{name}-%{version}_20121024.tar.bz2 -Source1: %{name}.desktop -Source2: %{name}.png -Source3: suse_frozen2.png -Source4: fb-server -Source5: fb-server.service +Source0: http://www.frozen-bubble.org/data/frozen-bubble-2.2.1-beta1.tar.bz2 +Source1: fb-server +Source2: fb-server.service # PATCH-FIX-OPENSUSE frozen-bubble-2.212-configpath.patch Patch1: frozen-bubble-2.212-configpath.patch # PATCH-FIX-OPENSUSE msgfmt.diff Patch2: msgfmt.diff # PATCH-FIX-UPSTREAM frozen-bubble-2.212-unused-result.patch Patch3: frozen-bubble-2.212-unused-result.patch +# PATCH-FEATURE-UPSTREAM https://github.com/kthakore/frozen-bubble/pull/63 +Patch4: desktop.patch +# PATCH-FEATURE-UPSTREAM https://github.com/kthakore/frozen-bubble/pull/64 +Patch5: appdata.patch BuildRequires: Mesa-devel BuildRequires: SDL_Pango-devel BuildRequires: SDL_image-devel BuildRequires: SDL_mixer-devel BuildRequires: fdupes +BuildRequires: hicolor-icon-theme BuildRequires: perl-SDL >= 2.400 +BuildRequires: pkgconfig BuildRequires: update-desktop-files BuildRequires: perl(Alien::SDL) BuildRequires: perl(Compress::Bzip2) @@ -54,6 +57,7 @@ BuildRequires: perl(Module::Build) BuildRequires: perl(Tie::Simple) BuildRequires: pkgconfig(pango) +BuildRequires: pkgconfig(systemd) Requires: %{name}-server = %{version} Requires: perl = %{perl_version} Requires: perl-SDL >= 2.400 @@ -62,13 +66,10 @@ Requires: perl(Locale::Maketext::Lexicon) Requires: perl(Locale::Maketext::Simple) Requires: perl(Tie::Simple) -BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires(pre): %fillup_prereq -%if 0%{?suse_version} >=1230 -BuildRequires: pkgconfig(systemd) -%endif Requires(pre): net-tools Recommends: %{name}-lang +BuildRoot: %{_tmppath}/%{name}-%{version}-build %description Shoot up bubbles. Similar to the console game Puzzle-Bobble. @@ -81,11 +82,7 @@ %package server Summary: Puzzle with Bubbles - Server Group: Amusements/Games/Action/Arcade -%if 0%{?suse_version} >=1230 %{?systemd_requires} -%else -Requires(pre): %insserv_prereq -%endif %description server Server for frozen-bubble. @@ -98,11 +95,13 @@ %lang_package %prep -%setup -q +%setup -q -n frozen-bubble-2.2.1-beta1 cp server/init/README server/README.init %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 +%patch5 -p1 %build perl Build.PL destdir=%{buildroot} installdirs=vendor --prefix=%{_prefix} @@ -118,34 +117,30 @@ mv %{buildroot}%{perl_vendorarch}/auto/share/dist/Games-FrozenBubble/* %{buildroot}%{_datadir}/%{name}/ -mkdir -p %{buildroot}%{_datadir}/pixmaps/ -install -m 644 $RPM_SOURCE_DIR/%{name}.png %{buildroot}%{_datadir}/pixmaps +for res in 64x64 48x48 32x32 16x16; do + install -Dm644 share/icons/frozen-bubble-icon-$res.png %{buildroot}%{_datadir}/icons/hicolor/$res/apps/%{name}.png +done + +mkdir -p %{buildroot}%{_datadir}/applications/ +install -m 644 share/%{name}.desktop %{buildroot}%{_datadir}/applications/%{name}.desktop + +mkdir -p %{buildroot}%{_datadir}/appdata/ +install -m 644 share/%{name}.appdata.xml %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml -%if 0%{?suse_version} >=1230 mkdir -p %{buildroot}%{_unitdir} %{buildroot}/%{_sbindir} -install -m 644 %{SOURCE5} %{buildroot}%{_unitdir}/frozen-bubble-server.service +install -m 644 %{SOURCE2} %{buildroot}%{_unitdir}/frozen-bubble-server.service ln -s /sbin/service %{buildroot}%{_sbindir}/rcfb-server ln -s /sbin/service %{buildroot}%{_sbindir}/rcfrozen-bubble-server -%else -mkdir -p %{buildroot}/%{_sysconfdir}/init.d %{buildroot}/%{_sbindir} -install -m 755 %{SOURCE4} %{buildroot}/%{_sysconfdir}/init.d/frozen-bubble-server -ln -s /etc/init.d/frozen-bubble-server %{buildroot}%{_sbindir}/rcfb-server -ln -s /etc/init.d/frozen-bubble-server %{buildroot}%{_sbindir}/rcfrozen-bubble-server -%endif + install -d -m 755 %{buildroot}/%{_sysconfdir} touch %{buildroot}/%{_sysconfdir}/fb-server.conf -%suse_update_desktop_file -i %{name} Game ArcadeGame %fdupes %{buildroot}${_datadir} %perl_process_packlist %post server -%if 0%{?suse_version} >=1230 -%{fillup_only} +%fillup_only %service_add_post frozen-bubble-server.service -%else -%{fillup_and_insserv -f frozen-bubble-server} -%endif if [ ! -f "%{_sysconfdir}/fb-server.conf" ]; then if [ -f "%{_sysconfdir}/language" ]; then . %{_sysconfdir}/language @@ -171,20 +166,22 @@ EOF fi -%preun server -%if 0%{?suse_version} >=1230 -%service_del_preun frozen-bubble-server.service -%else -%stop_on_removal frozen-bubble-server -%endif +%post +%icon_theme_cache_post +%desktop_database_post + +%postun +%icon_theme_cache_postun +%desktop_database_postun %postun server -%if 0%{?suse_version} >=1230 %service_del_postun frozen-bubble-server.service -%else -%restart_on_update frozen-bubble-server -%insserv_cleanup -%endif + +%pre server +%service_add_pre frozen-bubble-server.service + +%preun server +%service_del_preun frozen-bubble-server.service %files %defattr(-, root, root) @@ -203,7 +200,9 @@ %attr (644,root,root) %{_mandir}/man*/frozen-bubble* %attr (644,root,root) %{_mandir}/man*/Games* %{_datadir}/applications/%{name}.desktop -%{_datadir}/pixmaps/%{name}.png +%{_datadir}/icons/hicolor/*/apps/%{name}.png +%dir %{_datadir}/appdata/ +%{_datadir}/appdata/%{name}.appdata.xml %files server %defattr(-, root, root) @@ -211,11 +210,7 @@ %ghost %config(noreplace) %{_sysconfdir}/fb-server.conf %defattr(755, root, root) %{_bindir}/fb-server -%if 0%{?suse_version} >=1230 %attr (644,root,root) %{_unitdir}/frozen-bubble-server.service -%else -%{_sysconfdir}/init.d/frozen-bubble-server -%endif %{_sbindir}/rcfb-server %{_sbindir}/rcfrozen-bubble-server ++++++ appdata.patch ++++++ >From c8d978f6e561e269e792c06a9201a5bbaa75da6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= <[email protected]> Date: Tue, 23 Aug 2016 23:03:36 +0200 Subject: [PATCH] Create frozen-bubble.appdata.xml --- share/frozen-bubble.appdata.xml | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 share/frozen-bubble.appdata.xml diff --git a/share/frozen-bubble.appdata.xml b/share/frozen-bubble.appdata.xml new file mode 100644 index 0000000..e471406 --- /dev/null +++ b/share/frozen-bubble.appdata.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="UTF-8"?> +<application> + <id type="desktop">frozen-bubble.desktop</id> + <metadata_license>CC0-1.0</metadata_license> + <license>GPL-2.0</license> + <summary>An addictive game about frozen bubbles</summary> + <description> + <p> + Frozen Bubble is a free and open source game in which you throw colorful + bubbles and build groups to destroy them. + </p> + <p> + You can play this game locally or over the Internet. + It also contains a level editor for you to create your own games. + </p> + </description> + <url type="homepage">http://www.frozen-bubble.org/</url> + <screenshots> + <screenshot type="default">http://www.frozen-bubble.org/data/fb2-5p.png</screenshot> + </screenshots> +</application> ++++++ desktop.patch ++++++ >From f0b8a0c9e0d67b8b77433379e2ca07874c4082bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= <[email protected]> Date: Tue, 23 Aug 2016 22:57:00 +0200 Subject: [PATCH] Create frozen-bubble.desktop --- share/frozen-bubble.desktop | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 share/frozen-bubble.desktop diff --git a/share/frozen-bubble.desktop b/share/frozen-bubble.desktop new file mode 100644 index 0000000..cad022f --- /dev/null +++ b/share/frozen-bubble.desktop @@ -0,0 +1,8 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=Frozen Bubble +GenericName=Shooting Bubble Game +Exec=frozen-bubble -fs +Icon=frozen-bubble +Type=Application +Categories=Game;ArcadeGame;
