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.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.rocksndiamonds.new/rocksndiamonds.changes 2014-10-14 08:59:28.000000000 +0200 @@ -1,0 +2,63 @@ +Fri Oct 10 20:27:04 UTC 2014 - [email protected] + +- Add because are added or deleted patches + +------------------------------------------------------------------- +Wed Oct 8 19:15:43 UTC 2014 - [email protected] + +- 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 - [email protected] + +- 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.000000000 +0200 +++ /var/tmp/diff_new_pack.64giD1/_new 2014-10-14 08:59:29.000000000 +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: %{name}-%{version}.tar.bz2 -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 +Source0: http://www.artsoft.org/RELEASES/unix/%{name}/%{name}-%{version}.tar.gz +Source1: %{name}-icons.tar +Source2: %{name}.desktop +# PATCH-FIX-UPSTREAM Permissions +Patch0: %{name}-%{version}-src_libgame_setup.c-CVE-2011-4606.patch BuildRequires: fdupes -%endif -%if 0%{?suse_version} +BuildRequires: hicolor-icon-theme +BuildRequires: pkgconfig(SDL_image) +BuildRequires: pkgconfig(SDL_mixer) +BuildRequires: pkgconfig(SDL_net) +#BuildRequires: libsmpeg-devel BuildRequires: update-desktop-files -%endif -Requires(pre): pwdutils -BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: update-desktop-files +Requires: %{name}-data %description -A game like "Boulderdash" (C 64) or "Emerald Mine" (Amiga). Included -are many levels known from the games "Boulderdash", "Emerald Mine", -"Sokoban", "Supaplex" and "DX-Boulderdash", level elements for "Diamond -Caves II" style games and a lot of new levels designed by other -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) +This is a nice little game with color graphics and sound for your Unix system +with color X11. You need an 8-Bit color display or better. It will not work +on black&white systems, and maybe not on gray scale systems. + +If you know the game Boulder Dash (Commodore C64) or Emerald Mine (Amiga), +you know what Rocks'n'Diamonds is about. %prep -%setup -q -if [ ! -f /usr/%{_lib}/libsmpeg.a ] ; then -%patch0 -p1 -fi -%patch1 -p1 -cp %{SOURCE2} %{SOURCE3} . -pushd levels -tar -xjf %{SOURCE4} -popd +%setup -q -b 1 +%patch0 + +# Remove not needed files +find levels -name '*.orig' -delete +rm -f %{name} + +sed -i 's|-lsmpeg||' src/Makefile %build make %{?_smp_mflags} sdl \ OPTIONS="%{optflags}" \ - XLIB_PATH=/usr/X11R6/%{_lib} \ RO_GAME_DIR=%{_datadir}/%{name} \ RW_GAME_DIR=%{_localstatedir}/games/%{name} %install -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 %{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 -%if 0%{?suse_version} -%suse_update_desktop_file -i %{name} Game ArcadeGame -%endif -%if 0%{?suse_version} > 1030 -%fdupes %{buildroot} -%endif +# 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} +for d in graphics levels music sounds ; do + cp -a $d %{buildroot}%{_datadir}/%{name} +done + +# install icons +for i in 32 48 64 72 96 ; do + install -Dm 0644 ../icons/%{name}_${i}x${i}.png \ + %{buildroot}/%{_datadir}/icons/hicolor/${i}x${i}/apps/%{name}.png +done + +# install desktop file +install -Dm 0644 %{S:2} %{buildroot}%{_datadir}/applications/%{name}.desktop + +install -Dm 755 -d %{buildroot}%{_localstatedir}/games/%{name} + +%suse_update_desktop_file %{name} + +%fdupes -s %{buildroot}%{_prefix} %pre getent group games >/dev/null || groupadd -r games @@ -110,12 +94,12 @@ %files %defattr(-,root,root,-) -%doc ChangeLog COPYING CREDITS README -%doc %{_mandir}/man6/* -%{_datadir}/%{name} -%{_datadir}/applications/%{name}.desktop -%{_datadir}/pixmaps/%{name}.png +%doc COPYING CREDITS ChangeLog README %{_bindir}/%{name} -%attr(775,games,games) %{_localstatedir}/games/%{name} +%{_mandir}/man6/%{name}.6%{ext_man} +%{_datadir}/applications/%{name}.desktop +%{_datadir}/icons/hicolor/ +%{_datadir}/%{name} +%attr(0775,games,games) %{_localstatedir}/games/%{name} %changelog ++++++ rocksndiamonds-3.3.1.2-src_libgame_setup.c-CVE-2011-4606.patch ++++++ --- src/libgame/setup.c.orig 2013-11-13 01:13:27.000000000 +0100 +++ src/libgame/setup.c 2014-10-02 23:47:07.762894564 +0200 @@ -1290,11 +1290,14 @@ #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) @@ -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.desktop ++++++ --- /var/tmp/diff_new_pack.64giD1/_old 2014-10-14 08:59:29.000000000 +0200 +++ /var/tmp/diff_new_pack.64giD1/_new 2014-10-14 08:59:29.000000000 +0200 @@ -1,8 +1,9 @@ [Desktop Entry] -Categories=Game;ArcadeGame -Encoding=UTF-8 -Name=Rocks n Diamonds +Name=Rocks'n'Diamonds +GenericName=Arcade Game +Comment=Colorful Boulderdash'n'Emerald Mine'n'Sokoban'n'Stuff Exec=rocksndiamonds -Terminal=false Icon=rocksndiamonds Type=Application +Categories=Game;ArcadeGame +StartupNotify=false -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
