commit rocksndiamonds for openSUSE:Factory

2020-11-06 Thread root
Hello community,

here is the log from the commit of package rocksndiamonds for openSUSE:Factory 
checked in at 2020-11-06 23:44:58

Comparing /work/SRC/openSUSE:Factory/rocksndiamonds (Old)
 and  /work/SRC/openSUSE:Factory/.rocksndiamonds.new.11331 (New)


Package is "rocksndiamonds"

Fri Nov  6 23:44:58 2020 rev:32 rq:846394 version:4.2.0.3

Changes:

--- /work/SRC/openSUSE:Factory/rocksndiamonds/rocksndiamonds.changes
2020-03-30 23:07:48.524327093 +0200
+++ /work/SRC/openSUSE:Factory/.rocksndiamonds.new.11331/rocksndiamonds.changes 
2020-11-06 23:45:28.987219422 +0100
@@ -1,0 +2,35 @@
+Thu Nov  5 22:26:05 UTC 2020 - Markus Beth 
+
+- Update to 4.2.0.3
+  * fixed some problems with wrap-around levels in Emerald Mine engine
+  * added full compatibility for wrap-around levels in Emerald Mine engine
+  * fixed single-step mode for wrap-around levels in Emerald Mine engine
+  * fixed playing tapes recorded with old Emerald Mine game engine
+  * added command “autofix” to fix tapes recorded with old EM game engine
+  * fixed key shortcut to start/end game (which was broken since 4.2.0.0)
+  * fixed some other key shortcuts that require entering upper case letters
+  * added menu command “:undo-tape” to undo/restore last recorded tape
+  * fixed potential crash bug that may occur when loading custom artwork
+  * fixed single-step mode when using custom elements with mouse click events
+  * added creating undo/redo snapshots when using mouse click events
+  * fixed problems with virtual buttons and showing envelopes on Android
+  * improved startup speed by optimizing parsing of parameter values
+  * improved handling output of warnings, errors and debug messages
+  * fixed showing source date on version page of info screen menu
+  * added showing commit hash on version page of info screen menu
+  * fixed broken tapes (for various reasons) recorded with old EM engine
+  * fixed support for initially moving spring in EM game engine
+  * added support for initially moving spring to R’n’D game engine
+  * fixed potential crash bug when reading from artwork info cache
+  * fixed wrong eater content when loading native EM levels
+  * added support for variable number of eater arrays for EM engine
+  * fixed vsync mode when not using OpenGL renderer (like “Metal” on Mac)
+  * added option for setting hint for render driver to setup config file
+  * added displaying render driver on info screen page
+  * fixed loading dynamic libraries shipped with the Linux package
+  * fixed level editor key shortcuts (broken by regression)
+  * fixed support for wrap-around levels in EM engine for old tapes
+  Visit https://www.artsoft.org/rocksndiamonds/ for the complete
+  changelog.
+
+---

Old:

  rocksndiamonds-4.1.4.1.tar.gz

New:

  rocksndiamonds-4.2.0.3.tar.gz



Other differences:
--
++ rocksndiamonds.spec ++
--- /var/tmp/diff_new_pack.VZxMKZ/_old  2020-11-06 23:45:29.919217632 +0100
+++ /var/tmp/diff_new_pack.VZxMKZ/_new  2020-11-06 23:45:29.923217624 +0100
@@ -17,7 +17,7 @@
 
 
 Name:   rocksndiamonds
-Version:4.1.4.1
+Version:4.2.0.3
 Release:0
 Summary:Colorful Boulderdash'n'Emerald Mine'n'Sokoban'n'Stuff
 License:GPL-2.0-or-later
@@ -59,8 +59,6 @@
 find levels -name '*.orig' -delete
 rm -f %{name}
 
-sed -i 's|-lsmpeg||' src/Makefile
-
 %build
 %make_build \
 OPTIONS="%{optflags}" \

++ rocksndiamonds-3.3.1.2-src_libgame_setup.c-CVE-2011-4606.patch ++
--- /var/tmp/diff_new_pack.VZxMKZ/_old  2020-11-06 23:45:29.963217547 +0100
+++ /var/tmp/diff_new_pack.VZxMKZ/_new  2020-11-06 23:45:29.963217547 +0100
@@ -1,8 +1,8 @@
-Index: rocksndiamonds-4.1.0.0/src/libgame/setup.c
+Index: rocksndiamonds-4.2.0.3/src/libgame/setup.c
 ===
 rocksndiamonds-4.1.0.0.orig/src/libgame/setup.c
-+++ rocksndiamonds-4.1.0.0/src/libgame/setup.c
-@@ -1380,11 +1380,14 @@ void sortTreeInfo(TreeInfo **node_first)
+--- rocksndiamonds-4.2.0.3.orig/src/libgame/setup.c
 rocksndiamonds-4.2.0.3/src/libgame/setup.c
+@@ -1474,11 +1474,14 @@ void sortTreeInfo(TreeInfo **node_first)
  #define MODE_W_ALL(S_IWUSR | S_IWGRP | S_IWOTH)
  #define MODE_X_ALL(S_IXUSR | S_IXGRP | S_IXOTH)
  

++ rocksndiamonds-4.1.4.1.tar.gz -> rocksndiamonds-4.2.0.3.tar.gz ++
 58996 lines of diff (skipped)




commit rocksndiamonds for openSUSE:Factory

2020-03-30 Thread root
Hello community,

here is the log from the commit of package rocksndiamonds for openSUSE:Factory 
checked in at 2020-03-30 23:07:40

Comparing /work/SRC/openSUSE:Factory/rocksndiamonds (Old)
 and  /work/SRC/openSUSE:Factory/.rocksndiamonds.new.3160 (New)


Package is "rocksndiamonds"

Mon Mar 30 23:07:40 2020 rev:31 rq:789838 version:4.1.4.1

Changes:

--- /work/SRC/openSUSE:Factory/rocksndiamonds/rocksndiamonds.changes
2019-01-21 11:01:17.671202127 +0100
+++ /work/SRC/openSUSE:Factory/.rocksndiamonds.new.3160/rocksndiamonds.changes  
2020-03-30 23:07:48.524327093 +0200
@@ -1,0 +2,14 @@
+Mon Mar 30 09:44:51 UTC 2020 - Christophe Giboudeaux 
+
+- Update to 4.1.4.1
+  * fixed bug in editor with group elements using graphic of
+other element
+  * fixed crash bug when loading graphics sets with bad
+animation definitions
+  * fixed bug in editor with custom elements using graphic
+of other element
+  * removed support for SDL 1.2
+  Visit https://www.artsoft.org/rocksndiamonds/ for the complete
+  changelog.
+
+---

Old:

  rocksndiamonds-4.1.1.0.tar.gz

New:

  rocksndiamonds-4.1.4.1.tar.gz



Other differences:
--
++ rocksndiamonds.spec ++
--- /var/tmp/diff_new_pack.fDwCa5/_old  2020-03-30 23:07:49.108327425 +0200
+++ /var/tmp/diff_new_pack.fDwCa5/_new  2020-03-30 23:07:49.116327430 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package rocksndiamonds
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -12,37 +12,36 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
 Name:   rocksndiamonds
-Version:4.1.1.0
+Version:4.1.4.1
 Release:0
 Summary:Colorful Boulderdash'n'Emerald Mine'n'Sokoban'n'Stuff
-License:GPL-2.0+
+License:GPL-2.0-or-later
 Group:  Amusements/Games/Action/Arcade
-Url:http://www.artsoft.org/rocksndiamonds/
-Source0:
http://www.artsoft.org/RELEASES/unix/%{name}/%{name}-%{version}.tar.gz
+URL:https://www.artsoft.org/rocksndiamonds/
+Source0:
https://www.artsoft.org/RELEASES/unix/%{name}/%{name}-%{version}.tar.gz
 Source1:%{name}-icons.tar
 Source2:%{name}.desktop
 # PATCH-FIX-UPSTREAM Permissions
 Patch0: %{name}-3.3.1.2-src_libgame_setup.c-CVE-2011-4606.patch
 BuildRequires:  fdupes
 BuildRequires:  hicolor-icon-theme
-BuildRequires:  pkgconfig(SDL_image)
-BuildRequires:  pkgconfig(SDL_mixer)
-BuildRequires:  pkgconfig(SDL_net)
+BuildRequires:  pkgconfig
 #BuildRequires:  libsmpeg-devel
 BuildRequires:  update-desktop-files
-BuildRequires:  update-desktop-files
+BuildRequires:  pkgconfig(SDL2_image)
+BuildRequires:  pkgconfig(SDL2_mixer)
+BuildRequires:  pkgconfig(SDL2_net)
+BuildRequires:  pkgconfig(zlib)
 Requires:   %{name}-data
-%if 0%{?suse_version} >= 1330
+Requires(pre):  %{_sbindir}/groupadd
+Requires(pre):  %{_sbindir}/useradd
 Requires(pre):  group(games)
 Requires(pre):  user(games)
-%else
-Requires(pre): /usr/sbin/groupadd /usr/sbin/useradd
-%endif
 
 %description
 This is a nice little game with color graphics and sound for your Unix system
@@ -63,7 +62,7 @@
 sed -i 's|-lsmpeg||' src/Makefile
 
 %build
-make %{?_smp_mflags} sdl \
+%make_build \
 OPTIONS="%{optflags}" \
 RO_GAME_DIR=%{_datadir}/%{name} \
 RW_GAME_DIR=%{_localstatedir}/games/%{name}
@@ -85,7 +84,7 @@
 done
 
 # install desktop file
-install -Dm 0644 %{S:2} %{buildroot}%{_datadir}/applications/%{name}.desktop
+install -Dm 0644 %{SOURCE2} 
%{buildroot}%{_datadir}/applications/%{name}.desktop
 
 install -Dm 755 -d %{buildroot}%{_localstatedir}/games/%{name}
 
@@ -93,15 +92,13 @@
 
 %fdupes -s %{buildroot}%{_prefix}
 
-%if 0%{?suse_version} < 1330
 %pre
 getent group games >/dev/null || groupadd -r games
-getent passwd games >/dev/null || useradd -r -g games -d /var/games -s 
/sbin/nologin
-%endif
+getent passwd games >/dev/null || useradd -r -g games -d 
%{_localstatedir}/games -s /sbin/nologin
 
 %files
-%defattr(-,root,root,-)
-%doc COPYING CREDITS ChangeLog
+%license COPYING
+%doc CREDITS ChangeLog
 %{_bindir}/%{name}
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/icons/hicolor/

++ rocksndiamonds-4.1.1.0.tar.gz -> rocksndiamonds-4.1.4.1.tar.gz ++
 60919 lines of diff (skipped)




commit rocksndiamonds for openSUSE:Factory

2019-01-21 Thread root
Hello community,

here is the log from the commit of package rocksndiamonds for openSUSE:Factory 
checked in at 2019-01-21 10:59:29

Comparing /work/SRC/openSUSE:Factory/rocksndiamonds (Old)
 and  /work/SRC/openSUSE:Factory/.rocksndiamonds.new.28833 (New)


Package is "rocksndiamonds"

Mon Jan 21 10:59:29 2019 rev:30 rq:666798 version:4.1.1.0

Changes:

--- /work/SRC/openSUSE:Factory/rocksndiamonds/rocksndiamonds.changes
2018-07-28 12:43:55.548828978 +0200
+++ /work/SRC/openSUSE:Factory/.rocksndiamonds.new.28833/rocksndiamonds.changes 
2019-01-21 11:01:17.671202127 +0100
@@ -1,0 +2,40 @@
+Sun Dec 23 16:37:16 UTC 2018 - Sebastien CHAVAUX 
+
+- Update to version 4.1.1.0
+  * improved support for network multi-player games
+  * network games can now be fully configured by using setup menu
+   settings
+  * when playing network games, the level to be played is now sent
+   to all clients
+  * added UDP broadcast to auto-detect network server in local
+   network
+  * multi-player levels now marked in main menu preview with
+   network or team mode
+  * fixed team mode games in R’n’D game engine
+  * added player option in level editor to let the first player
+   solve the level
+  * improved support for highly configurable virtual buttons on
+   touch devices
+  * options for transparency, grid size, highlighted and outlined
+   virtual buttons
+  * separately configurable virtual buttons for portrait and
+   landscape mode
+  * ultra-smooth scrolling using vertical sync (vsync) on
+   supported devices
+  * added setup option to directly play the next level after
+   solving a level
+  * added setup option to skip displaying the high scores after
+   solving a level
+  * added setup option to use extended list for game speed
+   selection
+  * added event actions (key events and screen buttons) to global
+   animations
+  * this allows for simulating key or button events when
+   animations are clicked
+  * added “passthrough” option to click several overlapping global
+   animations
+  * fixed bug with dragon fire destroying indestructible steel
+   letter walls
+  * fixed various other bugs (and probably added some new)
+
+---

Old:

  rocksndiamonds-4.1.0.0.tar.gz

New:

  rocksndiamonds-4.1.1.0.tar.gz



Other differences:
--
++ rocksndiamonds.spec ++
--- /var/tmp/diff_new_pack.BBZ3UE/_old  2019-01-21 11:01:18.879200566 +0100
+++ /var/tmp/diff_new_pack.BBZ3UE/_new  2019-01-21 11:01:18.879200566 +0100
@@ -17,7 +17,7 @@
 
 
 Name:   rocksndiamonds
-Version:4.1.0.0
+Version:4.1.1.0
 Release:0
 Summary:Colorful Boulderdash'n'Emerald Mine'n'Sokoban'n'Stuff
 License:GPL-2.0+

++ rocksndiamonds-4.1.0.0.tar.gz -> rocksndiamonds-4.1.1.0.tar.gz ++
 19615 lines of diff (skipped)




commit rocksndiamonds for openSUSE:Factory

2018-07-28 Thread root
Hello community,

here is the log from the commit of package rocksndiamonds for openSUSE:Factory 
checked in at 2018-07-28 12:43:46

Comparing /work/SRC/openSUSE:Factory/rocksndiamonds (Old)
 and  /work/SRC/openSUSE:Factory/.rocksndiamonds.new (New)


Package is "rocksndiamonds"

Sat Jul 28 12:43:46 2018 rev:29 rq:625695 version:4.1.0.0

Changes:

--- /work/SRC/openSUSE:Factory/rocksndiamonds/rocksndiamonds.changes
2017-04-11 09:45:10.916921997 +0200
+++ /work/SRC/openSUSE:Factory/.rocksndiamonds.new/rocksndiamonds.changes   
2018-07-28 12:43:55.548828978 +0200
@@ -1,0 +2,8 @@
+Mon Jul 23 07:37:55 UTC 2018 - bwiedem...@suse.com
+
+- Update to version 4.1.0.0
+  - Drop upstreamed reproducible.patch
+  - Rebase half-upstreamed 
rocksndiamonds-3.3.1.2-src_libgame_setup.c-CVE-2011-4606.patch
+  - many fixes and improvements
+
+---
@@ -372 +380 @@
-   - added Boulder Dash style "snap-pushing" (thanks to Achim H�rtel)
+   - added Boulder Dash style "snap-pushing" (thanks to Achim Haertel)
@@ -493 +501 @@
-  Anpassungen im Makefile, zus�tzliche defines angelegt
+  Anpassungen im Makefile, zusaetzliche defines angelegt

Old:

  reproducible.patch
  rocksndiamonds-3.3.1.2.tar.gz

New:

  rocksndiamonds-4.1.0.0.tar.gz



Other differences:
--
++ rocksndiamonds.spec ++
--- /var/tmp/diff_new_pack.0K6jLk/_old  2018-07-28 12:43:56.328830394 +0200
+++ /var/tmp/diff_new_pack.0K6jLk/_new  2018-07-28 12:43:56.328830394 +0200
@@ -17,7 +17,7 @@
 
 
 Name:   rocksndiamonds
-Version:3.3.1.2
+Version:4.1.0.0
 Release:0
 Summary:Colorful Boulderdash'n'Emerald Mine'n'Sokoban'n'Stuff
 License:GPL-2.0+
@@ -27,9 +27,7 @@
 Source1:%{name}-icons.tar
 Source2:%{name}.desktop
 # PATCH-FIX-UPSTREAM Permissions
-Patch0: %{name}-%{version}-src_libgame_setup.c-CVE-2011-4606.patch
-# PATCH-FIX-OPENSUSE bmwiedemann -- fix build-compare
-Patch1: reproducible.patch
+Patch0: %{name}-3.3.1.2-src_libgame_setup.c-CVE-2011-4606.patch
 BuildRequires:  fdupes
 BuildRequires:  hicolor-icon-theme
 BuildRequires:  pkgconfig(SDL_image)
@@ -56,8 +54,7 @@
 
 %prep
 %setup -q -b 1
-%patch0
-%patch1 -p1
+%patch0 -p1
 
 # Remove not needed files
 find levels -name '*.orig' -delete
@@ -74,7 +71,6 @@
 %install
 # install executable
 install -Dm 0755 %{name} %{buildroot}%{_bindir}/%{name}
-install -Dm 0644 %{name}.1 %{buildroot}%{_mandir}/man6/%{name}.6
 
 # install directories
 mkdir -p %{buildroot}%{_datadir}/%{name}/{graphics,levels,music,sounds}
@@ -105,9 +101,8 @@
 
 %files
 %defattr(-,root,root,-)
-%doc COPYING CREDITS ChangeLog README
+%doc COPYING CREDITS ChangeLog
 %{_bindir}/%{name}
-%{_mandir}/man6/%{name}.6%{ext_man}
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/icons/hicolor/
 %{_datadir}/%{name}

++ rocksndiamonds-3.3.1.2-src_libgame_setup.c-CVE-2011-4606.patch ++
--- /var/tmp/diff_new_pack.0K6jLk/_old  2018-07-28 12:43:56.344830423 +0200
+++ /var/tmp/diff_new_pack.0K6jLk/_new  2018-07-28 12:43:56.344830423 +0200
@@ -1,6 +1,8 @@
 src/libgame/setup.c.orig   2013-11-13 01:13:27.0 +0100
-+++ src/libgame/setup.c2014-10-02 23:47:07.762894564 +0200
-@@ -1290,11 +1290,14 @@
+Index: rocksndiamonds-4.1.0.0/src/libgame/setup.c
+===
+--- rocksndiamonds-4.1.0.0.orig/src/libgame/setup.c
 rocksndiamonds-4.1.0.0/src/libgame/setup.c
+@@ -1380,11 +1380,14 @@ void sortTreeInfo(TreeInfo **node_first)
  #define MODE_W_ALL(S_IWUSR | S_IWGRP | S_IWOTH)
  #define MODE_X_ALL(S_IXUSR | S_IXGRP | S_IXOTH)
  
@@ -8,21 +10,11 @@
  #define MODE_W_PRIVATE(S_IWUSR)
 +#define MODE_X_PRIVATE(S_IXUSR)
 +
- #define MODE_W_PUBLIC (S_IWUSR | S_IWGRP)
+ #define MODE_W_PUBLIC_FILE(S_IWUSR | S_IWGRP)
  #define MODE_W_PUBLIC_DIR (S_IWUSR | S_IWGRP | S_ISGID)
  
 -#define DIR_PERMS_PRIVATE (MODE_R_ALL | MODE_X_ALL | MODE_W_PRIVATE)
 +#define DIR_PERMS_PRIVATE (MODE_R_PRIVATE | MODE_X_PRIVATE | 
MODE_W_PRIVATE)
  #define DIR_PERMS_PUBLIC  (MODE_R_ALL | MODE_X_ALL | MODE_W_PUBLIC_DIR)
+ #define DIR_PERMS_PUBLIC_ALL  (MODE_R_ALL | MODE_X_ALL | MODE_W_ALL)
  
- #define FILE_PERMS_PRIVATE(MODE_R_ALL | MODE_W_PRIVATE)
-@@ -1453,7 +1456,8 @@
-   if (running_setgid)
- posix_umask(last_umask & group_umask);
-   else
--dir_mode |= MODE_W_ALL;
-+if (permission_class == PERMS_PUBLIC)
-+  dir_mode |= MODE_W_ALL;
- 
-   if (!fileExists(dir))
- if (posix_mkdir(dir, dir_mode) != 0)

++ rocksndiamonds-3.3.1.2.tar.gz -> rocksndiamonds-4.1.0.0.tar.gz ++
 112744 lines 

commit rocksndiamonds for openSUSE:Factory

2017-04-11 Thread root
Hello community,

here is the log from the commit of package rocksndiamonds for openSUSE:Factory 
checked in at 2017-04-11 09:45:09

Comparing /work/SRC/openSUSE:Factory/rocksndiamonds (Old)
 and  /work/SRC/openSUSE:Factory/.rocksndiamonds.new (New)


Package is "rocksndiamonds"

Tue Apr 11 09:45:09 2017 rev:28 rq:485712 version:3.3.1.2

Changes:

--- /work/SRC/openSUSE:Factory/rocksndiamonds/rocksndiamonds.changes
2016-04-12 19:37:14.0 +0200
+++ /work/SRC/openSUSE:Factory/.rocksndiamonds.new/rocksndiamonds.changes   
2017-04-11 09:45:10.916921997 +0200
@@ -1,0 +2,6 @@
+Thu Mar 30 12:03:56 UTC 2017 - meiss...@suse.com
+
+- require system user and group games on new distros,
+  useradd and groupadd on older ones.
+
+---



Other differences:
--
++ rocksndiamonds.spec ++
--- /var/tmp/diff_new_pack.4r80S1/_old  2017-04-11 09:45:12.808654765 +0200
+++ /var/tmp/diff_new_pack.4r80S1/_new  2017-04-11 09:45:12.808654765 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package rocksndiamonds
 #
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 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
@@ -39,6 +39,12 @@
 BuildRequires:  update-desktop-files
 BuildRequires:  update-desktop-files
 Requires:   %{name}-data
+%if 0%{?suse_version} >= 1330
+Requires(pre):  group(games)
+Requires(pre):  user(games)
+%else
+Requires(pre): /usr/sbin/groupadd /usr/sbin/useradd
+%endif
 
 %description
 This is a nice little game with color graphics and sound for your Unix system
@@ -91,9 +97,11 @@
 
 %fdupes -s %{buildroot}%{_prefix}
 
+%if 0%{?suse_version} < 1330
 %pre
 getent group games >/dev/null || groupadd -r games
 getent passwd games >/dev/null || useradd -r -g games -d /var/games -s 
/sbin/nologin
+%endif
 
 %files
 %defattr(-,root,root,-)





commit rocksndiamonds for openSUSE:Factory

2016-04-12 Thread h_root
Hello community,

here is the log from the commit of package rocksndiamonds for openSUSE:Factory 
checked in at 2016-04-12 19:37:13

Comparing /work/SRC/openSUSE:Factory/rocksndiamonds (Old)
 and  /work/SRC/openSUSE:Factory/.rocksndiamonds.new (New)


Package is "rocksndiamonds"

Changes:

--- /work/SRC/openSUSE:Factory/rocksndiamonds/rocksndiamonds.changes
2014-10-14 08:59:28.0 +0200
+++ /work/SRC/openSUSE:Factory/.rocksndiamonds.new/rocksndiamonds.changes   
2016-04-12 19:37:14.0 +0200
@@ -1,0 +2,5 @@
+Thu Apr  7 04:50:37 UTC 2016 - bwiedem...@suse.com
+
+- Add reproducible.patch to fix build-compare
+
+---

New:

  reproducible.patch



Other differences:
--
++ rocksndiamonds.spec ++
--- /var/tmp/diff_new_pack.0i06TM/_old  2016-04-12 19:37:15.0 +0200
+++ /var/tmp/diff_new_pack.0i06TM/_new  2016-04-12 19:37:15.0 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package rocksndiamonds
 #
-# Copyright (c) 2014 SUSE LINUX Products 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
@@ -28,6 +28,8 @@
 Source2:%{name}.desktop
 # PATCH-FIX-UPSTREAM Permissions
 Patch0: %{name}-%{version}-src_libgame_setup.c-CVE-2011-4606.patch
+# PATCH-FIX-OPENSUSE bmwiedemann -- fix build-compare
+Patch1: reproducible.patch
 BuildRequires:  fdupes
 BuildRequires:  hicolor-icon-theme
 BuildRequires:  pkgconfig(SDL_image)
@@ -49,6 +51,7 @@
 %prep
 %setup -q -b 1
 %patch0
+%patch1 -p1
 
 # Remove not needed files
 find levels -name '*.orig' -delete

++ reproducible.patch ++
Index: rocksndiamonds-3.3.1.2/src/Makefile
===
--- rocksndiamonds-3.3.1.2.orig/src/Makefile
+++ rocksndiamonds-3.3.1.2/src/Makefile
@@ -291,7 +291,7 @@ conf_mus.h: conf_mus.c
@$(MAKE) auto-conf
 
 $(TIMESTAMP_FILE): $(SRCS) $(LIBGAME) $(GAME_EM) $(GAME_SP)
-   @date '+"%Y-%m-%d %H:%M"' \
+   @date -r ../ChangeLog '+"%Y-%m-%d %H:%M"' \
| sed -e 's/^/#define COMPILE_DATE_STRING /' \
> $(TIMESTAMP_FILE)
 




commit rocksndiamonds for openSUSE:Factory

2014-10-14 Thread h_root
Hello community,

here is the log from the commit of package rocksndiamonds for openSUSE:Factory 
checked in at 2014-10-14 08:59:17

Comparing /work/SRC/openSUSE:Factory/rocksndiamonds (Old)
 and  /work/SRC/openSUSE:Factory/.rocksndiamonds.new (New)


Package is rocksndiamonds

Changes:

--- /work/SRC/openSUSE:Factory/rocksndiamonds/rocksndiamonds.changes
2013-09-25 15:20:00.0 +0200
+++ /work/SRC/openSUSE:Factory/.rocksndiamonds.new/rocksndiamonds.changes   
2014-10-14 08:59:28.0 +0200
@@ -1,0 +2,63 @@
+Fri Oct 10 20:27:04 UTC 2014 - nemy...@gmx.ch
+
+- Add because are added or deleted patches
+
+---
+Wed Oct  8 19:15:43 UTC 2014 - nemy...@gmx.ch
+
+- Remove BuildRequires for libsmpeg-devel and add sed,
+  because is unresolvable
+- Use BuildRequires pkgconfig(SDL_image), pkgconfig(SDL_mixer),
+  pkgconfig(SDL_net) instead of SDL_image-devel, SDL_mixer-devel,
+  SDL_net-devel
+- Remove PreReq for shadow and pwdutils
+
+---
+Tue Oct  7 20:05:29 UTC 2014 - nemy...@gmx.ch
+
+- Changed .changes and used old entries from somebody else
+- Update to 3.3.1.2, announce message:
+
+ - fixed bug that prevents running the game on Mac OS X Mavericks
+ - improved behaviour on restart after failing on a broken level set
+
+ - Message for 3.3.1.1 update
+  * added scripts directory to distribution package to enable building
+element definitions after editing artwork config source code files
+  * added volume controls for sounds, loops and music to sound setup
+
+
+ Most important changes since last release version 3.3.0.1:
+  - added native package for Macs with intel CPUs
+  - added support for compiling on 64-bit systems
+  - added alternative game mode for playing with half size playfield tiles
+  - added level selection screen (when clicking on main menu level number)
+  - added displaying if level was played or solved on level selection screen
+  - improved graphics performance for scrolling in Mac OS X version
+  - improved graphics performance for native Supaplex game engine
+  - improved single step mode in R'n'D, EM and SP engines
+  - fixed two game engine bugs in Supaplex game engine
+  - fixed displaying wrong Supaplex time (was running too fast before)
+  - fixed invisible text in envelope config in level editor
+
+- Use check for openSUSE  12.2 for and use shadow else pwdutils
+- Add PreReq for shadow (was removed pwdutils)
+- Change %fdupes
+- Change Desktop entry file
+- Change Summary
+- Removed Contributions-1.2.0.tar.bz2 and move to new package
+  rocksndiamonds-data
+- Use simple sed instead of rocksndiamonds-3.3.0.1-smpeg.patch
+- Use rocksndiamonds-3.3.1.2-src_libgame_setup.c-CVE-2011-4606.patch
+  instead of rocksndiamonds-CVE-2011-4606.patch, upstream still has
+  not patched the security problem themselves
+- Add BuildRequires for libsmpeg-devel
+- Use %{name}-icons.tar instead of %{name}.png
+- Add BuildRequires for hicolor-icon-theme
+- Remove BuildRequires for deprecated pwdutils
+- Add Requires for %{name}-data
+- Change description
+- Simplify installation handling
+- Remove not needed files
+
+---

Old:

  Contributions-1.2.0.tar.bz2
  rocksndiamonds-3.3.0.1-smpeg.patch
  rocksndiamonds-3.3.0.1.tar.bz2
  rocksndiamonds-CVE-2011-4606.patch
  rocksndiamonds.png

New:

  rocksndiamonds-3.3.1.2-src_libgame_setup.c-CVE-2011-4606.patch
  rocksndiamonds-3.3.1.2.tar.gz
  rocksndiamonds-icons.tar



Other differences:
--
++ rocksndiamonds.spec ++
--- /var/tmp/diff_new_pack.64giD1/_old  2014-10-14 08:59:29.0 +0200
+++ /var/tmp/diff_new_pack.64giD1/_new  2014-10-14 08:59:29.0 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package rocksndiamonds
 #
-# Copyright (c) 2013 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
@@ -17,92 +17,76 @@
 
 
 Name:   rocksndiamonds
-Version:3.3.0.1
+Version:3.3.1.2
 Release:0
-Summary:Arcade style game with stereo sounds
+Summary:Colorful Boulderdash'n'Emerald Mine'n'Sokoban'n'Stuff
 License:GPL-2.0+
 Group:  Amusements/Games/Action/Arcade
 Url:http://www.artsoft.org/rocksndiamonds/
-# Downloaded from 
http://www.artsoft.org/RELEASES/unix/rocksndiamonds/rocksndiamonds-3.3.0.1.tar.gz
-# Deleted already compiled binary: rm rocksndiamonds
-# Repacked as tar.bz2
-Source: 

commit rocksndiamonds for openSUSE:Factory

2013-09-25 Thread h_root
Hello community,

here is the log from the commit of package rocksndiamonds for openSUSE:Factory 
checked in at 2013-09-25 15:19:58

Comparing /work/SRC/openSUSE:Factory/rocksndiamonds (Old)
 and  /work/SRC/openSUSE:Factory/.rocksndiamonds.new (New)


Package is rocksndiamonds

Changes:

--- /work/SRC/openSUSE:Factory/rocksndiamonds/rocksndiamonds.changes
2013-01-31 15:10:30.0 +0100
+++ /work/SRC/openSUSE:Factory/.rocksndiamonds.new/rocksndiamonds.changes   
2013-09-25 15:20:00.0 +0200
@@ -1,0 +2,5 @@
+Mon Sep 23 11:18:16 UTC 2013 - idon...@suse.com
+
+- Add games user/group on demand (fate#314560)
+
+---



Other differences:
--
++ rocksndiamonds.spec ++
--- /var/tmp/diff_new_pack.u4cRN2/_old  2013-09-25 15:20:00.0 +0200
+++ /var/tmp/diff_new_pack.u4cRN2/_new  2013-09-25 15:20:00.0 +0200
@@ -43,6 +43,7 @@
 %if 0%{?suse_version}
 BuildRequires:  update-desktop-files
 %endif
+Requires(pre):  pwdutils
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -103,6 +104,10 @@
 %fdupes %{buildroot}
 %endif
 
+%pre
+getent group games /dev/null || groupadd -r games
+getent passwd games /dev/null || useradd -r -g games -d /var/games -s 
/sbin/nologin
+
 %files
 %defattr(-,root,root,-)
 %doc ChangeLog COPYING CREDITS README


-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit rocksndiamonds for openSUSE:Factory

2013-01-31 Thread h_root
Hello community,

here is the log from the commit of package rocksndiamonds for openSUSE:Factory 
checked in at 2013-01-31 15:10:28

Comparing /work/SRC/openSUSE:Factory/rocksndiamonds (Old)
 and  /work/SRC/openSUSE:Factory/.rocksndiamonds.new (New)


Package is rocksndiamonds, Maintainer is nadvor...@suse.com

Changes:

--- /work/SRC/openSUSE:Factory/rocksndiamonds/rocksndiamonds.changes
2013-01-25 09:38:20.0 +0100
+++ /work/SRC/openSUSE:Factory/.rocksndiamonds.new/rocksndiamonds.changes   
2013-01-31 15:10:30.0 +0100
@@ -1,0 +2,5 @@
+Sat Jan 26 13:13:59 UTC 2013 - joop.boo...@opensuse.org
+
+- Dropped all permission scripts
+
+---



Other differences:
--
++ rocksndiamonds.spec ++
--- /var/tmp/diff_new_pack.JjSpsL/_old  2013-01-31 15:10:32.0 +0100
+++ /var/tmp/diff_new_pack.JjSpsL/_new  2013-01-31 15:10:32.0 +0100
@@ -43,9 +43,6 @@
 %if 0%{?suse_version}
 BuildRequires:  update-desktop-files
 %endif
-Requires(pre):  permissions
-Provides:   rockdiam
-Obsoletes:  rockdiam
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -84,20 +81,18 @@
 RW_GAME_DIR=%{_localstatedir}/games/%{name}
 
 %install
-LIBDIR=%{buildroot}%{_datadir}/%{name}
-SCOREDIR=%{buildroot}%{_localstatedir}/games/%{name}
-install -m 755 -d $LIBDIR
-install -m 755 -d $SCOREDIR
+install -m 755 -d %{buildroot}%{_datadir}/%{name}
+install -m 755 -d %{buildroot}%{_localstatedir}/games/%{name}
 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
-cp -a levels $LIBDIR
-find $LIBDIR/levels -name '*.orig' -delete
-find $LIBDIR -type f -exec chmod 644 {} +
-find $LIBDIR -type d -exec chmod 755 {} +
+cp -a graphics %{buildroot}%{_datadir}/%{name}
+cp -a sounds %{buildroot}%{_datadir}/%{name}
+cp -a music %{buildroot}%{_datadir}/%{name}
+cp -a levels %{buildroot}%{_datadir}/%{name}
+find %{buildroot}%{_datadir}/%{name}/levels -name '*.orig' -delete
+find %{buildroot}%{_datadir}/%{name} -type f -exec chmod 644 {} +
+find %{buildroot}%{_datadir}/%{name} -type d -exec chmod 755 {} +
 install -m 755 %{name} %{buildroot}%{_bindir}
 install -m 644 %{name}.1 %{buildroot}%{_mandir}/man6/%{name}.6
 install -m 644 %{name}.png %{buildroot}%{_datadir}/pixmaps
@@ -108,19 +103,14 @@
 %fdupes %{buildroot}
 %endif
 
-%post
-%set_permissions
-%verifyscript
-%verify_permissions -e %{_bindir}/rocksndiamonds
-
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc ChangeLog COPYING CREDITS README
 %doc %{_mandir}/man6/*
-%verify(not mode) %attr(0755,games,games) %{_bindir}/%{name}
 %{_datadir}/%{name}
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/pixmaps/%{name}.png
+%{_bindir}/%{name}
 %attr(775,games,games) %{_localstatedir}/games/%{name}
 
 %changelog


-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit rocksndiamonds for openSUSE:Factory

2013-01-25 Thread h_root
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 nadvor...@suse.com

Changes:

--- /work/SRC/openSUSE:Factory/rocksndiamonds/rocksndiamonds.changes
2012-07-14 13:15:05.0 +0200
+++ /work/SRC/openSUSE:Factory/.rocksndiamonds.new/rocksndiamonds.changes   
2013-01-25 09:38:20.0 +0100
@@ -1,0 +2,12 @@
+Thu Jan 24 08:05:59 UTC 2013 - joop.boo...@opensuse.org
+
+- 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 - joop.boo...@opensuse.org
+
+- 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.0 +0100
+++ /var/tmp/diff_new_pack.bOyRLI/_new  2013-01-25 09:38:22.0 +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 i...@artsoft.org
-
 %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

commit rocksndiamonds for openSUSE:Factory

2012-07-14 Thread h_root
Hello community,

here is the log from the commit of package rocksndiamonds for openSUSE:Factory 
checked in at 2012-07-14 13:15:04

Comparing /work/SRC/openSUSE:Factory/rocksndiamonds (Old)
 and  /work/SRC/openSUSE:Factory/.rocksndiamonds.new (New)


Package is rocksndiamonds, Maintainer is nadvor...@suse.com

Changes:

--- /work/SRC/openSUSE:Factory/rocksndiamonds/rocksndiamonds.changes
2012-04-17 07:49:26.0 +0200
+++ /work/SRC/openSUSE:Factory/.rocksndiamonds.new/rocksndiamonds.changes   
2012-07-14 13:15:05.0 +0200
@@ -1,0 +2,6 @@
+Fri Jul 13 06:53:24 UTC 2012 - meiss...@suse.com
+
+- do not create ~/.rocksndiamonds/ world writeable. 
+  bnc#736261 / CVE-2011-4606
+
+---

New:

  rocksndiamonds-CVE-2011-4606.patch



Other differences:
--
++ rocksndiamonds.spec ++
--- /var/tmp/diff_new_pack.i7DPM9/_old  2012-07-14 13:15:07.0 +0200
+++ /var/tmp/diff_new_pack.i7DPM9/_new  2012-07-14 13:15:07.0 +0200
@@ -38,7 +38,8 @@
 Source2:%{name}.png
 Source3:%{name}.desktop
 Source4:Contributions-1.2.0.tar.bz2
-Patch:  %{name}-%{version}-smpeg.patch
+Patch0: %{name}-%{version}-smpeg.patch
+Patch1: %{name}-CVE-2011-4606.patch
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -75,8 +76,9 @@
 %prep
 %setup -q
 if [ ! -f /usr/%_lib/libsmpeg.a ] ; then
-%patch -p1
+%patch0 -p1
 fi
+%patch1 -p1
 cp %{S:2} %{S:3} .
 pushd levels
 tar -xjf %{S:4}

++ rocksndiamonds-CVE-2011-4606.patch ++
diff -up rocksndiamonds-3.3.0.1/src/libgame/setup.c.CVE-2011-4606 
rocksndiamonds-3.3.0.1/src/libgame/setup.c
--- rocksndiamonds-3.3.0.1/src/libgame/setup.c.CVE-2011-46062011-12-12 
14:28:30.083078680 -0500
+++ rocksndiamonds-3.3.0.1/src/libgame/setup.c  2011-12-12 14:34:36.758744753 
-0500
@@ -1293,11 +1293,14 @@ void sortTreeInfo(TreeInfo **node_first)
 #define MODE_W_ALL (S_IWUSR | S_IWGRP | S_IWOTH)
 #define MODE_X_ALL (S_IXUSR | S_IXGRP | S_IXOTH)
 
+#define MODE_R_PRIVATE (S_IRUSR)
 #define MODE_W_PRIVATE (S_IWUSR)
+#define MODE_X_PRIVATE (S_IXUSR)
+
 #define MODE_W_PUBLIC  (S_IWUSR | S_IWGRP)
 #define MODE_W_PUBLIC_DIR  (S_IWUSR | S_IWGRP | S_ISGID)
 
-#define DIR_PERMS_PRIVATE  (MODE_R_ALL | MODE_X_ALL | MODE_W_PRIVATE)
+#define DIR_PERMS_PRIVATE  (MODE_R_PRIVATE | MODE_X_PRIVATE | 
MODE_W_PRIVATE)
 #define DIR_PERMS_PUBLIC   (MODE_R_ALL | MODE_X_ALL | MODE_W_PUBLIC_DIR)
 
 #define FILE_PERMS_PRIVATE (MODE_R_ALL | MODE_W_PRIVATE)
@@ -1456,7 +1459,8 @@ void createDirectory(char *dir, char *te
   if (running_setgid)
 posix_umask(last_umask  group_umask);
   else
-dir_mode |= MODE_W_ALL;
+if (permission_class == PERMS_PUBLIC)
+  dir_mode |= MODE_W_ALL;
 
   if (!fileExists(dir))
 if (posix_mkdir(dir, dir_mode) != 0)

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit rocksndiamonds for openSUSE:Factory

2012-04-16 Thread h_root
Hello community,

here is the log from the commit of package rocksndiamonds for openSUSE:Factory 
checked in at 2012-04-17 07:49:15

Comparing /work/SRC/openSUSE:Factory/rocksndiamonds (Old)
 and  /work/SRC/openSUSE:Factory/.rocksndiamonds.new (New)


Package is rocksndiamonds, Maintainer is nadvor...@suse.com

Changes:

--- /work/SRC/openSUSE:Factory/rocksndiamonds/rocksndiamonds.changes
2011-09-23 12:44:25.0 +0200
+++ /work/SRC/openSUSE:Factory/.rocksndiamonds.new/rocksndiamonds.changes   
2012-04-17 07:49:26.0 +0200
@@ -1,0 +2,5 @@
+Fri Mar 23 02:50:18 UTC 2012 - jeng...@medozas.de
+
+- Parallel build with %_smp_mflags; strip redundant sections/tags
+
+---



Other differences:
--
++ rocksndiamonds.spec ++
--- /var/tmp/diff_new_pack.n93qD3/_old  2012-04-17 07:49:28.0 +0200
+++ /var/tmp/diff_new_pack.n93qD3/_new  2012-04-17 07:49:28.0 +0200
@@ -1,7 +1,7 @@
 #
-# spec file for package rocksndiamonds (Version 3.2.4)
+# spec file for package rocksndiamonds
 #
-# Copyright (c) 2009 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,20 +15,21 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-# norootforbuild
-
 
 Name:   rocksndiamonds
-BuildRequires:  SDL_image-devel SDL_mixer-devel SDL_net-devel fdupes 
update-desktop-files
-License:GPL-2.0+
-Group:  Amusements/Games/Action/Arcade
+BuildRequires:  SDL_image-devel
+BuildRequires:  SDL_mixer-devel
+BuildRequires:  SDL_net-devel
+BuildRequires:  fdupes
+BuildRequires:  update-desktop-files
 Provides:   rockdiam
 Obsoletes:  rockdiam
-AutoReqProv:on
 Version:3.3.0.1
-Release:83
+Release:0
 PreReq: permissions
 Summary:Arcade style game with stereo sounds
+License:GPL-2.0+
+Group:  Amusements/Games/Action/Arcade
 Url:http://www.artsoft.org/rocksndiamonds/
 # Downloaded from 
http://www.artsoft.org/RELEASES/unix/rocksndiamonds/rocksndiamonds-3.3.0.1.tar.gz
 # Deleted already compiled binary: rm rocksndiamonds
@@ -78,18 +79,17 @@
 fi
 cp %{S:2} %{S:3} .
 pushd levels
-tar xjf %{S:4}
+tar -xjf %{S:4}
 popd
 
 %build
-make sdl \
+make %{?_smp_mflags} sdl \
 OPTIONS=$RPM_OPT_FLAGS \
 XLIB_PATH=/usr/X11R6/%{_lib} \
 RO_GAME_DIR=%{_datadir}/%{name} \
 RW_GAME_DIR=%{_var}/games/%{name}
 
 %install
-rm -rf $RPM_BUILD_ROOT
 LIBDIR=$RPM_BUILD_ROOT%{_datadir}/%{name}
 SCOREDIR=$RPM_BUILD_ROOT%{_var}/games/%{name}
 install -m 755 -d $LIBDIR
@@ -101,9 +101,9 @@
 cp -a sounds $LIBDIR
 cp -a music $LIBDIR
 cp -a levels $LIBDIR
-find $LIBDIR/levels -name '*.orig' | xargs rm
-find $LIBDIR -type f -exec chmod 644 \{\} \;
-find $LIBDIR -type d -exec chmod 755 \{\} \;
+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
@@ -115,9 +115,6 @@
 %verifyscript
 %verify_permissions -e %{_bindir}/rocksndiamonds
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %files
 %defattr(-,root,root)
 %doc ChangeLog COPYING CREDITS README


-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit rocksndiamonds for openSUSE:Factory

2011-12-06 Thread h_root
Hello community,

here is the log from the commit of package rocksndiamonds for openSUSE:Factory 
checked in at 2011-12-06 19:00:21

Comparing /work/SRC/openSUSE:Factory/rocksndiamonds (Old)
 and  /work/SRC/openSUSE:Factory/.rocksndiamonds.new (New)


Package is rocksndiamonds, Maintainer is nadvor...@suse.com

Changes:




Other differences:
--
++ rocksndiamonds.spec ++
--- /var/tmp/diff_new_pack.puYgGD/_old  2011-12-06 19:33:03.0 +0100
+++ /var/tmp/diff_new_pack.puYgGD/_new  2011-12-06 19:33:03.0 +0100
@@ -20,7 +20,7 @@
 
 Name:   rocksndiamonds
 BuildRequires:  SDL_image-devel SDL_mixer-devel SDL_net-devel fdupes 
update-desktop-files
-License:GPLv2+
+License:GPL-2.0+
 Group:  Amusements/Games/Action/Arcade
 Provides:   rockdiam
 Obsoletes:  rockdiam


-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit rocksndiamonds for openSUSE:Factory

2011-09-20 Thread h_root

Hello community,

here is the log from the commit of package rocksndiamonds for openSUSE:Factory
checked in at Tue Sep 20 09:36:14 CEST 2011.




--- rocksndiamonds/rocksndiamonds.changes   2009-11-03 20:22:23.0 
+0100
+++ /mounts/work_src_done/STABLE/rocksndiamonds/rocksndiamonds.changes  
2011-04-24 18:50:32.0 +0200
@@ -1,0 +2,7 @@
+Sun Apr 24 16:08:38 UTC 2011 - pvinc...@opensuse.org
+
+- updated to version 3.3.0.1
+- moved game data to /usr/share instead of /usr/share/games
+according to packaging conventions
+
+---

calling whatdependson for head-i586


Old:

  rocksndiamonds-3.2.4-gcc4.patch
  rocksndiamonds-3.2.4-smpeg.patch
  rocksndiamonds-3.2.4.tar.bz2

New:

  rocksndiamonds-3.3.0.1-smpeg.patch
  rocksndiamonds-3.3.0.1.tar.bz2



Other differences:
--
++ rocksndiamonds.spec ++
--- /var/tmp/diff_new_pack.IY3etS/_old  2011-09-20 09:35:59.0 +0200
+++ /var/tmp/diff_new_pack.IY3etS/_new  2011-09-20 09:35:59.0 +0200
@@ -25,17 +25,19 @@
 Provides:   rockdiam
 Obsoletes:  rockdiam
 AutoReqProv:on
-Version:3.2.4
+Version:3.3.0.1
 Release:83
 PreReq: permissions
 Summary:Arcade style game with stereo sounds
 Url:http://www.artsoft.org/rocksndiamonds/
+# Downloaded from 
http://www.artsoft.org/RELEASES/unix/rocksndiamonds/rocksndiamonds-3.3.0.1.tar.gz
+# Deleted already compiled binary: rm rocksndiamonds
+# Repacked as tar.bz2
 Source: %{name}-%{version}.tar.bz2
 Source2:%{name}.png
 Source3:%{name}.desktop
 Source4:Contributions-1.2.0.tar.bz2
 Patch:  %{name}-%{version}-smpeg.patch
-Patch1: %{name}-%{version}-gcc4.patch
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -72,9 +74,8 @@
 %prep
 %setup -q
 if [ ! -f /usr/%_lib/libsmpeg.a ] ; then
-%patch
+%patch -p1
 fi
-%patch1
 cp %{S:2} %{S:3} .
 pushd levels
 tar xjf %{S:4}
@@ -84,18 +85,18 @@
 make sdl \
 OPTIONS=$RPM_OPT_FLAGS \
 XLIB_PATH=/usr/X11R6/%{_lib} \
-RO_GAME_DIR=/usr/share/games/rocksndiamonds \
-RW_GAME_DIR=/var/games/rocksndiamonds
+RO_GAME_DIR=%{_datadir}/%{name} \
+RW_GAME_DIR=%{_var}/games/%{name}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-LIBDIR=$RPM_BUILD_ROOT/usr/share/games/rocksndiamonds
-SCOREDIR=$RPM_BUILD_ROOT/var/games/rocksndiamonds
+LIBDIR=$RPM_BUILD_ROOT%{_datadir}/%{name}
+SCOREDIR=$RPM_BUILD_ROOT%{_var}/games/%{name}
 install -m 755 -d $LIBDIR
 install -m 755 -d $SCOREDIR
-install -m 755 -d $RPM_BUILD_ROOT/usr/games
+install -m 755 -d $RPM_BUILD_ROOT%{_bindir}/
 install -m 755 -d $RPM_BUILD_ROOT%{_mandir}/man6
-install -m 755 -d $RPM_BUILD_ROOT/usr/share/pixmaps
+install -m 755 -d $RPM_BUILD_ROOT%{_datadir}/pixmaps
 cp -a graphics $LIBDIR
 cp -a sounds $LIBDIR
 cp -a music $LIBDIR
@@ -103,28 +104,28 @@
 find $LIBDIR/levels -name '*.orig' | xargs rm
 find $LIBDIR -type f -exec chmod 644 \{\} \;
 find $LIBDIR -type d -exec chmod 755 \{\} \;
-install -m 755 rocksndiamonds $RPM_BUILD_ROOT/usr/games
-install -m 644 rocksndiamonds.1 $RPM_BUILD_ROOT%{_mandir}/man6/rocksndiamonds.6
-install -m 644 rocksndiamonds.png $RPM_BUILD_ROOT/usr/share/pixmaps
-%suse_update_desktop_file -i rocksndiamonds Game ArcadeGame
+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
+%suse_update_desktop_file -i %{name} Game ArcadeGame
 %fdupes $RPM_BUILD_ROOT
 
 %post
 %run_permissions
 %verifyscript
-%verify_permissions -e /usr/games/rocksndiamonds
+%verify_permissions -e %{_bindir}/rocksndiamonds
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
-%doc CHANGES COPYING CREDITS HARDWARE README TODO rocksndiamonds-*.lsm 
+%doc ChangeLog COPYING CREDITS README
 %doc %{_mandir}/man6/*
-%verify(not mode) %attr(0755,games,games) /usr/games/rocksndiamonds
-/usr/share/games/rocksndiamonds
-/usr/share/applications/rocksndiamonds.desktop
-/usr/share/pixmaps/rocksndiamonds.png
-%attr(775,games,games) /var/games/rocksndiamonds
+%verify(not mode) %attr(0755,games,games) %{_bindir}/%{name}
+%{_datadir}/%{name}
+%{_datadir}/applications/%{name}.desktop
+%{_datadir}/pixmaps/%{name}.png
+%attr(775,games,games) %{_var}/games/%{name}
 
 %changelog

++ rocksndiamonds-3.2.4-smpeg.patch - rocksndiamonds-3.3.0.1-smpeg.patch 
++
--- rocksndiamonds/rocksndiamonds-3.2.4-smpeg.patch 2008-03-06 
02:04:49.0 +0100
+++ 
/mounts/work_src_done/STABLE/rocksndiamonds/rocksndiamonds-3.3.0.1-smpeg.patch  
2011-04-24 18:38:57.0 +0200
@@ -1,8 +1,9 @@
 src/Makefile
-+++ src/Makefile
-@@ -91,7 +91,7 @@
+diff -Naur rocksndiamonds-3.3.0.1/src/Makefile 
rocksndiamonds-3.3.0.1-new//src/Makefile
+--- rocksndiamonds-3.3.0.1/src/Makefile2010-06-08