commit neverball for openSUSE:Factory

8 Oct 2014

Hello community,

here is the log from the commit of package neverball for openSUSE:Factory checked in at 2014-10-08 22:13:52
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/neverball (Old)
 and      /work/SRC/openSUSE:Factory/.neverball.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "neverball"

Changes:
--------

--- /work/SRC/openSUSE:Factory/neverball/neverball.changes	2013-02-17 17:08:08.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.neverball.new/neverball.changes	2014-10-08 22:14:03.000000000 +0200
@@ -1,0 +2,28 @@
+Mon Oct  6 16:04:15 UTC 2014 - nemysis@gmx.ch
+
+- Update to 1.6.0, announce message is here:
+
+  http://neverball.org/release.php
+
+- Change Source to use Web URL
+- Remove Desktop entry files, use supplied files
+- Add name3 for mapc
+- Add BuildRequires for dejavu-fonts, desktop-file-utils,
+  hicolor-icon-theme, libSDL2-devel, libSDL2_ttf-devel,
+  libpng16-compat-devel, libpng16-devel, libSDL2_net-devel (mapc)
+- Remove BuildRequires for libSDL-devel, libSDL_ttf-devel,
+  libpng-devel, xorg-x11-libX11-devel
+- Add Requires for opengl-games-utils, change executables
+  for OpenGL Wrapper and symlink
+- Remove obsolete patch neverball-libpng16.patch, changed
+  by upstream
+- Use sed instead of simple patch neverball-add-needed.patch
+- Change description
+- Split out neverball, neverputt, mapc and doc into subpackages
+- Add to make ENABLE_RADIANT_CONSOLE=1 for mapc
+- Simplify installation handling
+- Symlink executables, needed for mapc
+- Replace bundled font with a symlink to an identical system font
+- Add icons
+
+-------------------------------------------------------------------

Old:
----
  neverball-1.5.4.tar.bz2
  neverball-add-needed.patch
  neverball-libpng16.patch
  neverball.desktop
  neverputt.desktop

New:
----
  neverball-1.6.0.tar.gz

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ neverball.spec ++++++
--- /var/tmp/diff_new_pack.Csf2W8/_old	2014-10-08 22:14:05.000000000 +0200
+++ /var/tmp/diff_new_pack.Csf2W8/_new	2014-10-08 22:14:05.000000000 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package neverball
 #
-# 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,76 +17,187 @@
 
 
 Name:           neverball
-Version:        1.5.4
+Version:        1.6.0
 Release:        0
 Summary:        Deftly Guide a Rolling Ball through Many Slick 3D Levels
 License:        GPL-2.0+
 Group:          Amusements/Games/3D/Other
 Url:            http://neverball.org
-Source0:        neverball-%{version}.tar.bz2
-Source1:        %{name}.desktop
+Source0:        http://%{name}.org/%{name}-%{version}.tar.gz
 %define	        name2 neverputt
-Source2:        %{name2}.desktop
+%define	        name3 mapc
+BuildRequires:  dejavu-fonts
+BuildRequires:  desktop-file-utils
 BuildRequires:  fdupes
-BuildRequires:  libSDL-devel
-BuildRequires:  libSDL_ttf-devel
+BuildRequires:  hicolor-icon-theme
+BuildRequires:  libSDL2-devel
+BuildRequires:  libSDL2_ttf-devel
 BuildRequires:  libjpeg-devel
-BuildRequires:  libpng-devel
+BuildRequires:  libpng16-compat-devel
+BuildRequires:  libpng16-devel
 BuildRequires:  libvorbis-devel
 BuildRequires:  physfs-devel
 BuildRequires:  update-desktop-files
-BuildRequires:  xorg-x11-libX11-devel
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Patch:          neverball-add-needed.patch 
-# following patch sent upstream: http://forum.nevercorner.net/viewtopic.php?id=2662
-Patch1:         neverball-libpng16.patch
-%define binary	%{_prefix}/games/%{name}
-%define binary2	%{_prefix}/games/%{name2}
-%define datadir	%{_datadir}/games/%{name}
+Requires:       opengl-games-utils
 
 %description
-Guide a rolling ball through dangerous territory that you control by
-tilting the floor. Balance on narrow bridges, navigate mazes, ride
-moving platforms, and dodge pushers and shovers to get to the goal.
-Race against the clock to collect coins to earn extra balls. With nice
-physics and very clean and appealing 3D graphics, this is definitely a
-must play.
+Tilt the floor to roll a ball through an obstacle course within the
+given time. If the ball falls or time expires, a ball is lost.
+
+Collect 100 coins to save your progress and earn an extra ball.
+Red coins are worth 5. Blue coins are worth 10.
+
+In the grand tradition of Marble Madness and Super Monkey Ball,
+Neverball has you guide a rolling ball through dangerous territory.
+Balance on narrow bridges, navigate mazes, ride moving platforms,
+and dodge pushers and shovers to get to the goal.
+Race against the clock to collect coins to earn extra balls.
+
+%package %{name2}
+Summary:        3D mini golf game
+Group:          Amusements/Games/3D/Other
+Requires:       %{name}
+
+%description %{name2}
+A hot-seat multiplayer miniature golf game, built on the physics
+and graphics engine of Neverball.
+
+Based on the physics and graphics of Neverball, Neverputt is a hot-seat
+multi-player miniature golf game for 1 to 4 players. The available
+courses take advantage of all the elements that challenge Neverball
+players, including moving platforms and barriers, teleporters, ramps,
+and drop-offs. A simple putting interface and golf scoring system
+have been added.
+
+%package %{name3}
+Summary:        Mapc is a program designed to compile the levels
+Group:          Development/Tools/Other
+BuildRequires:  libSDL2_net-devel
+Requires:       %{name}
+
+%description %{name3}
+Mapc is a program designed to compile the levels made with Radiant
+to make them usable in Neverball and Neverputt.
+All instructions are based upon using command lines.
+
+The output will be saved to Imap.sol.
+
+http://wiki.nevercorner.net/doku.php/mapc
+
+https://icculus.org/neverball/mapping/
+
+%package -n %{name}-doc
+Summary:        Documentation for the %{name}
+Group:          Documentation
+BuildArch:      noarch
+
+%description -n %{name}-doc
+Tilt the floor to roll a ball through an obstacle course within the
+given time. If the ball falls or time expires, a ball is lost.
+
+Collect 100 coins to save your progress and earn an extra ball.
+Red coins are worth 5. Blue coins are worth 10.
+
+In the grand tradition of Marble Madness and Super Monkey Ball,
+Neverball has you guide a rolling ball through dangerous territory.
+Balance on narrow bridges, navigate mazes, ride moving platforms,
+and dodge pushers and shovers to get to the goal.
+Race against the clock to collect coins to earn extra balls.
+
+Documentation for the %{name}.
 
 %prep
 %setup -q
-%patch
-%patch1 -p1
+
+# Add missing libraries
+sed -i -e 's|-lphysfs|-lphysfs -lm|' \
+       -e 's|$(OGL_LIBS)|$(OGL_LIBS) -lX11|' Makefile
+
+# Change executebles for OpenGL Wrapper
+sed -i 's|Exec=%{name}|Exec=%{name}-wrapper|' dist/%{name}.desktop.in
+sed -i 's|Exec=%{name2}|Exec=%{name2}-wrapper|' dist/%{name2}.desktop.in
 
 %build
-make %{?_smp_mflags} CC="gcc %{optflags} -fomit-frame-pointer" DATADIR=%{datadir} LOCALEDIR=%{_datadir}/locale
+make %{?_smp_mflags} CC="gcc %{optflags} -fomit-frame-pointer"  \
+        DATADIR=%{_datadir}/%{name} LOCALEDIR=%{_datadir}/locale \
+        ENABLE_NLS=1 ENABLE_RADIANT_CONSOLE=1
 
 %install
-install -D -m 755 %name	 %{buildroot}%{binary}
-install -D -m 755 %name2 %{buildroot}%{binary2}
-install -d -m 755 	 %{buildroot}%{datadir}
-rm data/*/*.map
+# install executables and mans
+for f in %{name} %{name2} %{name3} ; do
+    install -Dm 0755 $f %{buildroot}%{_bindir}/$f
+done
+for f in %{name} %{name2} ; do
+    install -Dm 0644 dist/$f.6 %{buildroot}%{_mandir}/man6/$f.6
+done
+install -Dm 0644 dist/%{name3}.1 %{buildroot}%{_mandir}/man1/%{name3}.1
+
+# Adjust permissions
 find data -name '*.sol' -exec chmod 644 '{}' \;
-cp -rp data/. %{buildroot}%{datadir}
-cp -r locale %{buildroot}%{_datadir}/
-chmod -x %{buildroot}%{datadir}/back/*.png
-chmod -x %{buildroot}%{datadir}/shot-putt/*.jpg
-chmod -x %{buildroot}%{datadir}/*.txt
+
+mkdir -p %{buildroot}%{_datadir}/%{name}
+cp -r data/* %{buildroot}%{_datadir}/%{name}/
+
+# Symlink executables
+for f in %{name} %{name2} %{name3} ; do
+    ln -s %{_bindir}/$f %{buildroot}%{_datadir}/%{name}/$f
+done
+
+# Use system fonts instead of bundling our own
+rm -f %{buildroot}%{_datadir}/%{name}/ttf/DejaVuSans-Bold.ttf
+ln -s %{_datadir}/fonts/truetype/DejaVuSans-Bold.ttf %{buildroot}%{_datadir}/%{name}/ttf/DejaVuSans-Bold.ttf
+
+# install icons
+for i in 24 32 48 64 128 256 512 ; do
+    install -Dm 0644 dist/%{name}_${i}.png %{buildroot}%{_datadir}/icons/hicolor/${i}x${i}/apps/%{name}.png
+    install -Dm 0644 dist/%{name2}_${i}.png %{buildroot}%{_datadir}/icons/hicolor/${i}x${i}/apps/%{name2}.png
+done
 mkdir -p %{buildroot}%{_datadir}/pixmaps
-cp dist/neverball_64.png %{buildroot}%{_datadir}/pixmaps/neverball.png
-cp dist/neverputt_64.png %{buildroot}%{_datadir}/pixmaps/neverputt.png
-%suse_update_desktop_file -i -G %{name} %name Game X-SuSE-ActionGame
-%suse_update_desktop_file -i -G %{name2} %name2 Game X-SuSE-ActionGame
-%find_lang %{name}
-%fdupes %{buildroot}%{datadir}
-
-%files -f %{name}.lang
-%defattr(-,root,root)
-%doc CHANGES COPYING README
-%{binary}
-%{binary2}
-%{datadir}
-%{_datadir}/applications/%name.desktop
-%{_datadir}/applications/%name2.desktop
-%{_datadir}/pixmaps/*.png
+for f in %{name} %{name2} ; do
+    ln -s %{_datadir}/%{name}/icon/$f.png %{buildroot}%{_datadir}/pixmaps/$f.png
+done
+
+# install desktop file
+install -Dm 0644 dist/%{name}.desktop %{buildroot}%{_datadir}/applications/%{name}.desktop
+install -Dm 0644 dist/%{name2}.desktop %{buildroot}%{_datadir}/applications/%{name2}.desktop
+
+cp -r locale %{buildroot}%{_datadir}/
+
+# symlink OpenGL Wrapper
+ln -s opengl-game-wrapper.sh %{buildroot}%{_bindir}/%{name}-wrapper
+ln -s opengl-game-wrapper.sh %{buildroot}%{_bindir}/%{name2}-wrapper
+
+%find_lang %name
+
+%suse_update_desktop_file %{name}
+%suse_update_desktop_file %{name2}
+
+%fdupes -s %{buildroot}%{_prefix}
+
+%files -f %name.lang
+%defattr(-,root,root,-)
+%{_bindir}/%{name}
+%{_bindir}/%{name}-wrapper
+%{_mandir}/man6/%{name}.6%{ext_man}
+%{_datadir}/applications/%{name}.desktop
+%{_datadir}/icons/hicolor/
+%{_datadir}/pixmaps/*
+%{_datadir}/%{name}
+
+%files %{name2}
+%defattr(-,root,root,-)
+%{_bindir}/%{name2}
+%{_bindir}/%{name2}-wrapper
+%{_mandir}/man6/%{name2}.6%{ext_man}
+%{_datadir}/applications/%{name2}.desktop
+
+%files %{name3}
+%defattr(-,root,root,-)
+%{_bindir}/%{name3}
+%{_mandir}/man1/%{name3}.1%{ext_man}
+
+%files -n %{name}-doc
+%defattr(-,root,root,-)
+%doc LICENSE.md README.md doc/*.{txt,md}
 
 %changelog

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

    

commit neverball for openSUSE:Factory

root＠hilbert.suse.de