Hello community, here is the log from the commit of package frozen-bubble for openSUSE:Factory checked in at 2012-02-21 12:18:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/frozen-bubble (Old) and /work/SRC/openSUSE:Factory/.frozen-bubble.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "frozen-bubble", Maintainer is "prus...@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/frozen-bubble/frozen-bubble.changes 2011-09-23 01:58:20.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.frozen-bubble.new/frozen-bubble.changes 2012-02-21 12:18:37.000000000 +0100 @@ -1,0 +2,16 @@ +Mon Feb 13 10:46:32 UTC 2012 - co...@suse.com + +- patch license to follow spdx.org standard + +------------------------------------------------------------------- +Sun Nov 20 17:29:12 UTC 2011 - dims...@opensuse.org + +- Create /var/run/fb-server so we can package it. Fixes build on + 12.1 / Factory. + +------------------------------------------------------------------- +Fri Aug 26 15:50:57 UTC 2011 - prus...@opensuse.org + +- package /var/run as %ghost [bnc#710295] + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ frozen-bubble.spec ++++++ --- /var/tmp/diff_new_pack.nCfflA/_old 2012-02-21 12:18:39.000000000 +0100 +++ /var/tmp/diff_new_pack.nCfflA/_new 2012-02-21 12:18:39.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package frozen-bubble (Version 2.2.0) +# spec file for package frozen-bubble # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -15,16 +15,14 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: frozen-bubble -Summary: Puzzle with Bubbles Version: 2.2.0 -Release: 9 -Url: http://www.frozen-bubble.org/ -License: GPLv2+ +Release: 0 +Summary: Puzzle with Bubbles +License: GPL-2.0+ Group: Amusements/Games/Action/Arcade +Url: http://www.frozen-bubble.org/ Source: %{name}-%{version}.tar.bz2 Source1: %{name}.desktop Source2: %{name}.png @@ -33,19 +31,28 @@ Patch1: frozen-bubble-2.2.0-keys.patch Patch2: frozen-bubble-2.2.0-german.patch Patch3: frozen-bubble-2.2.0-total_launched_bubbles.patch -BuildRequires: Mesa-devel pango-devel -BuildRequires: SDL_Pango-devel SDL_image-devel SDL_mixer-devel +BuildRequires: Mesa-devel +BuildRequires: SDL_Pango-devel +BuildRequires: SDL_image-devel +BuildRequires: SDL_mixer-devel +BuildRequires: pango-devel %if 0%{?suse_version} && 0%{?suse_version} > 1010 -PreReq: %insserv_prereq %fillup_prereq net-tools +BuildRequires: fdupes +BuildRequires: perl-SDL_Perl >= 2.1.3 +BuildRequires: update-desktop-files +Requires(pre): %fillup_prereq +Requires(pre): %insserv_prereq +Requires(pre): net-tools Requires: perl-SDL_Perl >= 2.1.3 -BuildRequires: fdupes perl-SDL_Perl >= 2.1.3 update-desktop-files %endif %if 0%{?fedora_version} +BuildRequires: gettext +BuildRequires: perl-SDL >= 2.1.3 +BuildRequires: glib2-devel Requires: perl-SDL >= 2.1.3 -BuildRequires: gettext glib2-devel perl-SDL >= 2.1.3 %endif -Requires: perl = %{perl_version} Requires: %{name}-server = %{version} +Requires: perl = %{perl_version} BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -56,12 +63,7 @@ a level-editor, 3 professional quality digital soundtracks, 15 stereo sound effects, 8 unique graphical transition effects, 8 unique logo eye-candies. -Authors: --------- - Guillaume Cottenceau <guillaume.cottenceau at free.fr> - %package server -License: GPLv2+ Summary: Puzzle with Bubbles - Server Group: Amusements/Games/Action/Arcade @@ -73,11 +75,6 @@ a level-editor, 3 professional quality digital soundtracks, 15 stereo sound effects, 8 unique graphical transition effects, 8 unique logo eye-candies. - -Authors: --------- - Guillaume Cottenceau <guillaume.cottenceau at free.fr> - %prep %setup -q cp server/init/README server/README.init @@ -91,7 +88,7 @@ %if 0%{?suse_version} <= 1010 pushd server %endif -make OPTIMIZE="$RPM_OPT_FLAGS" PREFIX=%{_prefix} INSTALLDIRS=vendor DATADIR=%{_datadir} LIBDIR=%{_libdir} +make OPTIMIZE="%{optflags}" PREFIX=%{_prefix} INSTALLDIRS=vendor DATADIR=%{_datadir} LIBDIR=%{_libdir} %if 0%{?suse_version} <= 1010 popd %endif @@ -100,18 +97,18 @@ %if 0%{?suse_version} <= 1010 pushd server %endif -make install DESTDIR=$RPM_BUILD_ROOT PREFIX=/usr DATADIR=/usr/share LIBDIR=%{_libdir} +make install DESTDIR=%{buildroot} PREFIX=/usr DATADIR=/usr/share LIBDIR=%{_libdir} %if 0%{?suse_version} <= 1010 popd %endif # install server part -mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/init.d $RPM_BUILD_ROOT/%{_sbindir} -sed "s+\(FB_SERVER_BIN=\).*+\1%{_libdir}/frozen-bubble/fb-server+" %{SOURCE4} >$RPM_BUILD_ROOT/%{_sysconfdir}/init.d/frozen-bubble-server +mkdir -p %{buildroot}/%{_sysconfdir}/init.d %{buildroot}/%{_sbindir} +sed "s+\(FB_SERVER_BIN=\).*+\1%{_libdir}/frozen-bubble/fb-server+" %{SOURCE4} >%{buildroot}/%{_sysconfdir}/init.d/frozen-bubble-server sed "s+\(FLPATH = '\).*'+\1%{_libdir}/frozen-bubble'+" c_stuff/lib/fb_stuff.pm >c_stuff/lib/fb_stuff.pm_ -ln -s /etc/init.d/frozen-bubble-server $RPM_BUILD_ROOT/usr/sbin/rcfb-server -ln -s /etc/init.d/frozen-bubble-server $RPM_BUILD_ROOT/usr/sbin/rcfrozen-bubble-server -touch $RPM_BUILD_ROOT/%{_sysconfdir}/fb-server.conf -mkdir -p $RPM_BUILD_ROOT/var/run/fb-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 +install -d -m 1755 %{buildroot}%{_localstatedir}/run/fb-server +touch %{buildroot}/%{_sysconfdir}/fb-server.conf %if 0%{?suse_version} <= 1010 exit 0 %endif @@ -119,18 +116,18 @@ %perl_process_packlist %endif %if 0%{?suse_version} < 1140 -rm $RPM_BUILD_ROOT%{perl_vendorarch}/auto/fb_c_stuff/.packlist -rm $RPM_BUILD_ROOT/var/adm/perl-modules/frozen-bubble +rm %{buildroot}%{perl_vendorarch}/auto/fb_c_stuff/.packlist +rm %{buildroot}%{_localstatedir}/adm/perl-modules/frozen-bubble %endif mv c_stuff/lib/fb_stuff.pm_ c_stuff/lib/fb_stuff.pm -mkdir -p $RPM_BUILD_ROOT/usr/share/pixmaps/ -install -m 644 $RPM_SOURCE_DIR/%name.png $RPM_BUILD_ROOT/usr/share/pixmaps +mkdir -p %{buildroot}%{_datadir}/pixmaps/ +install -m 644 $RPM_SOURCE_DIR/%{name}.png %{buildroot}%{_datadir}/pixmaps %if 0%{?suse_version} -%suse_update_desktop_file -i %name Game ArcadeGame -%fdupes -s $RPM_BUILD_ROOT +%suse_update_desktop_file -i %{name} Game ArcadeGame +%fdupes %{buildroot}${_datadir} %endif -chmod 644 $RPM_BUILD_ROOT/usr/share/man/man6/frozen-bubble.6 \ - $RPM_BUILD_ROOT/usr/share/man/man6/frozen-bubble-editor.6 +chmod 644 %{buildroot}%{_mandir}/man6/frozen-bubble.6 \ + %{buildroot}%{_mandir}/man6/frozen-bubble-editor.6 %find_lang %{name} %clean @@ -192,8 +189,8 @@ %{_datadir}/frozen-bubble/ %attr (644,root,root) %{_mandir}/man6/frozen-bubble.6.gz %attr (644,root,root) %{_mandir}/man6/frozen-bubble-editor.6.gz -%{_datadir}/applications/%name.desktop -%{_datadir}/pixmaps/%name.png +%{_datadir}/applications/%{name}.desktop +%{_datadir}/pixmaps/%{name}.png %exclude %{_datadir}/frozen-bubble/gfx/gen %endif @@ -206,6 +203,6 @@ %{_sysconfdir}/init.d/frozen-bubble-server %{_sbindir}/rcfb-server %{_sbindir}/rcfrozen-bubble-server -%dir /var/run/fb-server +%ghost %attr(755,root,root) %dir %{_localstatedir}/run/fb-server %changelog ++++++ fb-server ++++++ --- /var/tmp/diff_new_pack.nCfflA/_old 2012-02-21 12:18:39.000000000 +0100 +++ /var/tmp/diff_new_pack.nCfflA/_new 2012-02-21 12:18:39.000000000 +0100 @@ -59,6 +59,7 @@ CONFFILES=/etc/fb-server*.conf PIDDIR="/var/run/fb-server/" +mkdir -p $PIDDIR case "$1" in start) -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
