Hello community, here is the log from the commit of package rocksndiamonds for openSUSE:Factory checked in at 2013-01-25 09:38:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rocksndiamonds (Old) and /work/SRC/openSUSE:Factory/.rocksndiamonds.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rocksndiamonds", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/rocksndiamonds/rocksndiamonds.changes 2012-07-14 13:15:05.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.rocksndiamonds.new/rocksndiamonds.changes 2013-01-25 09:38:20.000000000 +0100 @@ -1,0 +2,12 @@ +Thu Jan 24 08:05:59 UTC 2013 - [email protected] + +- run_permissions was replaced by set_permissions + http://en.opensuse.org/openSUSE:Packaging_Conventions_RPM_Macros#.25set_permissions + +------------------------------------------------------------------- +Fri Jan 18 08:05:57 UTC 2013 - [email protected] + +- run_permissions is obsolete, not supported in openSUSE > 12.2 +- cleaned the spec file up + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rocksndiamonds.spec ++++++ --- /var/tmp/diff_new_pack.bOyRLI/_old 2013-01-25 09:38:22.000000000 +0100 +++ /var/tmp/diff_new_pack.bOyRLI/_new 2013-01-25 09:38:22.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package rocksndiamonds # -# 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 @@ -17,16 +17,8 @@ Name: rocksndiamonds -BuildRequires: SDL_image-devel -BuildRequires: SDL_mixer-devel -BuildRequires: SDL_net-devel -BuildRequires: fdupes -BuildRequires: update-desktop-files -Provides: rockdiam -Obsoletes: rockdiam Version: 3.3.0.1 Release: 0 -PreReq: permissions Summary: Arcade style game with stereo sounds License: GPL-2.0+ Group: Amusements/Games/Action/Arcade @@ -38,8 +30,22 @@ Source2: %{name}.png Source3: %{name}.desktop Source4: Contributions-1.2.0.tar.bz2 +# PATCH-FIX-UPSTREAM rocksndiamonds-3.3.0.1-smpeg.patch Patch0: %{name}-%{version}-smpeg.patch +# PATCH-FIX-UPSTREAM rocksndiamonds-CVE-2011-4606.patch Patch1: %{name}-CVE-2011-4606.patch +BuildRequires: SDL_image-devel +BuildRequires: SDL_mixer-devel +BuildRequires: SDL_net-devel +%if 0%{?suse_version} > 1030 +BuildRequires: fdupes +%endif +%if 0%{?suse_version} +BuildRequires: update-desktop-files +%endif +Requires(pre): permissions +Provides: rockdiam +Obsoletes: rockdiam BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -50,55 +56,41 @@ players. Some features: - - joystick support for Linux, FreeBSD and DOS/Windows - - local multiplayer support for all supported platforms - - network multiplayer support for Unix platform - - soft scrolling with 50 frames/s - - stereo sound effects and music - - music module support for SDL version (Unix/Win32) - - fullscreen support for SDL version (Unix/Win32) - - lots of additional levels available (over 10.000) - - -Authors: --------- - Holger Schemel <[email protected]> - %prep %setup -q -if [ ! -f /usr/%_lib/libsmpeg.a ] ; then +if [ ! -f /usr/%{_lib}/libsmpeg.a ] ; then %patch0 -p1 fi %patch1 -p1 -cp %{S:2} %{S:3} . +cp %{SOURCE2} %{SOURCE3} . pushd levels -tar -xjf %{S:4} +tar -xjf %{SOURCE4} popd %build make %{?_smp_mflags} sdl \ - OPTIONS="$RPM_OPT_FLAGS" \ + OPTIONS="%{optflags}" \ XLIB_PATH=/usr/X11R6/%{_lib} \ RO_GAME_DIR=%{_datadir}/%{name} \ - RW_GAME_DIR=%{_var}/games/%{name} + RW_GAME_DIR=%{_localstatedir}/games/%{name} %install -LIBDIR=$RPM_BUILD_ROOT%{_datadir}/%{name} -SCOREDIR=$RPM_BUILD_ROOT%{_var}/games/%{name} +LIBDIR=%{buildroot}%{_datadir}/%{name} +SCOREDIR=%{buildroot}%{_localstatedir}/games/%{name} install -m 755 -d $LIBDIR install -m 755 -d $SCOREDIR -install -m 755 -d $RPM_BUILD_ROOT%{_bindir}/ -install -m 755 -d $RPM_BUILD_ROOT%{_mandir}/man6 -install -m 755 -d $RPM_BUILD_ROOT%{_datadir}/pixmaps +install -m 755 -d %{buildroot}%{_bindir}/ +install -m 755 -d %{buildroot}%{_mandir}/man6 +install -m 755 -d %{buildroot}%{_datadir}/pixmaps cp -a graphics $LIBDIR cp -a sounds $LIBDIR cp -a music $LIBDIR @@ -106,14 +98,18 @@ find $LIBDIR/levels -name '*.orig' -delete find $LIBDIR -type f -exec chmod 644 "{}" "+" find $LIBDIR -type d -exec chmod 755 "{}" "+" -install -m 755 %{name} $RPM_BUILD_ROOT%{_bindir} -install -m 644 %{name}.1 $RPM_BUILD_ROOT%{_mandir}/man6/%{name}.6 -install -m 644 %{name}.png $RPM_BUILD_ROOT%{_datadir}/pixmaps +install -m 755 %{name} %{buildroot}%{_bindir} +install -m 644 %{name}.1 %{buildroot}%{_mandir}/man6/%{name}.6 +install -m 644 %{name}.png %{buildroot}%{_datadir}/pixmaps +%if 0%{?suse_version} %suse_update_desktop_file -i %{name} Game ArcadeGame -%fdupes $RPM_BUILD_ROOT +%endif +%if 0%{?suse_version} > 1030 +%fdupes %{buildroot} +%endif %post -%run_permissions +%set_permissions %verifyscript %verify_permissions -e %{_bindir}/rocksndiamonds @@ -125,6 +121,6 @@ %{_datadir}/%{name} %{_datadir}/applications/%{name}.desktop %{_datadir}/pixmaps/%{name}.png -%attr(775,games,games) %{_var}/games/%{name} +%attr(775,games,games) %{_localstatedir}/games/%{name} %changelog -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
