Hello community, here is the log from the commit of package frozen-bubble for openSUSE:Factory checked in at 2013-12-10 17:42:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2012-12-21 09:28:39.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.frozen-bubble.new/frozen-bubble.changes 2013-12-10 17:42:38.000000000 +0100 @@ -1,0 +2,6 @@ +Sun Oct 27 19:27:16 UTC 2013 - [email protected] + +- Add systemd support for openSUSE >= 12.3 +- Add a language subpackage + +------------------------------------------------------------------- New: ---- fb-server.service ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ frozen-bubble.spec ++++++ --- /var/tmp/diff_new_pack.LXuj02/_old 2013-12-10 17:42:39.000000000 +0100 +++ /var/tmp/diff_new_pack.LXuj02/_new 2013-12-10 17:42:39.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package frozen-bubble # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 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 @@ -29,6 +29,7 @@ Source2: %{name}.png Source3: suse_frozen2.png Source4: fb-server +Source5: fb-server.service # PATCH-FIX-OPENSUSE frozen-bubble-2.212-configpath.patch Patch1: frozen-bubble-2.212-configpath.patch # PATCH-FIX-OPENSUSE msgfmt.diff @@ -62,8 +63,11 @@ Requires: perl(Tie::Simple) BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires(pre): %fillup_prereq -Requires(pre): %insserv_prereq +%if 0%{?suse_version} >=1230 +BuildRequires: pkgconfig(systemd) +%endif Requires(pre): net-tools +Recommends: %{name}-lang %description Shoot up bubbles. Similar to the console game Puzzle-Bobble. @@ -76,6 +80,11 @@ %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. @@ -85,6 +94,8 @@ a level-editor, 3 professional quality digital soundtracks, 15 stereo sound effects, 8 unique graphical transition effects, 8 unique logo eye-candies. +%lang_package + %prep %setup -q cp server/init/README server/README.init @@ -109,10 +120,17 @@ mkdir -p %{buildroot}%{_datadir}/pixmaps/ install -m 644 $RPM_SOURCE_DIR/%{name}.png %{buildroot}%{_datadir}/pixmaps +%if 0%{?suse_version} >=1230 +mkdir -p %{buildroot}%{_unitdir} %{buildroot}/%{_sbindir} +install -m 755 %{SOURCE5} %{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 @@ -123,7 +141,12 @@ %perl_process_packlist %post server +%if 0%{?suse_version} >=1230 +%{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 @@ -150,11 +173,19 @@ fi %preun server +%if 0%{?suse_version} >=1230 +%service_del_preun frozen-bubble-server.service +%else %stop_on_removal frozen-bubble-server +%endif %postun server +%if 0%{?suse_version} >=1230 +%service_del_postun frozen-bubble-server.service +%else %restart_on_update frozen-bubble-server %insserv_cleanup +%endif %files %defattr(-, root, root) @@ -181,9 +212,18 @@ %ghost %config(noreplace) %{_sysconfdir}/fb-server.conf %defattr(755, root, root) %{_bindir}/fb-server +%if 0%{?suse_version} >=1230 +%{_unitdir}/frozen-bubble-server.service +%else %{_sysconfdir}/init.d/frozen-bubble-server +%endif %{_sbindir}/rcfb-server %{_sbindir}/rcfrozen-bubble-server %ghost %attr(755,root,root) %dir %{_localstatedir}/run/fb-server +%files lang +%defattr(-,root,root,-) +# Don't find a solution to install locales on standard directory +%{_datadir}/%{name}/locale/*.po + %changelog ++++++ fb-server.service ++++++ [Unit] Description=Frozen-Bubble Server Daemon After=network.target [Service] User=nobody Group=nogroup Type=forking ExecStart=/usr/bin/fb-server -c /etc/fb-server.conf [Install] WantedBy=multi-user.target -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
