Hello community, here is the log from the commit of package openttd for openSUSE:Factory checked in at 2012-04-17 07:47:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openttd (Old) and /work/SRC/openSUSE:Factory/.openttd.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "openttd", Maintainer is "kssin...@novell.com" Changes: -------- --- /work/SRC/openSUSE:Factory/openttd/openttd.changes 2012-03-22 12:37:41.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.openttd.new/openttd.changes 2012-04-17 07:47:34.000000000 +0200 @@ -2 +2 @@ -Tue Mar 6 13:08:00 UTC 2012 - s...@ammler.ch +Mon Apr 16 08:35:42 UTC 2012 - s...@ammler.ch @@ -4 +4 @@ -- upstream update to 1.2.0-RC2 +- update to 1.2.0 @@ -6,0 +7,16 @@ + +------------------------------------------------------------------- +Mon Apr 9 15:49:44 UTC 2012 - s...@ammler.ch + +- remove update-alternatives again (bnc#749128) +- symlink openttd to openttd-dedicated + +------------------------------------------------------------------- +Mon Apr 2 08:27:32 UTC 2012 - s...@ammler.ch + +- update to 1.2.0-RC4 + +------------------------------------------------------------------- +Tue Mar 6 13:08:00 UTC 2012 - s...@ammler.ch + +- upstream update to 1.2.0-RC2 Old: ---- openttd-1.2.0-RC2-source.tar.gz New: ---- openttd-1.2.0-source.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openttd.spec ++++++ --- /var/tmp/diff_new_pack.I4krlD/_old 2012-04-17 07:47:36.000000000 +0200 +++ /var/tmp/diff_new_pack.I4krlD/_new 2012-04-17 07:47:36.000000000 +0200 @@ -18,9 +18,9 @@ Name: openttd -Version: 1.2.rc2 +Version: 1.2.0 Release: 0 -%define srcver 1.2.0-RC2 +%define srcver %{version} Summary: An open source clone of Chris Sawyer's Transport Tycoon Deluxe License: GPL-2.0 Group: Amusements/Games/Strategy/Other @@ -88,7 +88,7 @@ with lots of new features and enhancements. To play the game you need either the original data from the game or the required package OpenGFX and OpenSFX. -This package provides the binary without dependency of SDL. +This package provides the binary %{name}-dedicated without dependency of SDL. %package data Summary: OpenTTD data @@ -96,15 +96,6 @@ %if 0%{?suse_version} >= 1110 || 0%{?fedora} || 0%{?mdkversion} || 0%{?rhel_version} >= 600 || 0%{?centos_version} >= 600 BuildArch: noarch %endif - -# dependencies for either package openttd or openttd-dedicated: -%if 0%{?suse_version} || 0%{?mdkversion} -BuildRequires: update-alternatives -Requires: update-alternatives -%else -BuildRequires: chkconfig -Requires: chkconfig -%endif %if 0%{?suse_version} || 0%{?mdkversion} Recommends: openttd-opengfx >= 0.4.3 %endif @@ -144,13 +135,8 @@ %install # install the dedicated binary install -D -m0755 dedicated/openttd %{buildroot}%{_bindir}/%{name}-dedicated -# install the gui binary and rename to openttd-gui +# install the gui binary make install INSTALL_DIR=%{buildroot} -mv %{buildroot}%{_bindir}/%{name} %{buildroot}%{_bindir}/%{name}-gui -# we need a dummy target for /etc/alternatives/openttd -mkdir -p %{buildroot}%{_sysconfdir}/alternatives -touch %{buildroot}%{_sysconfdir}/alternatives/%{name} -ln -s -f /etc/alternatives/%{name} %{buildroot}%{_bindir}/%{name} %if 0%{?suse_version} %suse_update_desktop_file -r %{name} Game StrategyGame @@ -163,20 +149,15 @@ %endif %post -/usr/sbin/update-alternatives --install %{_bindir}/%{name} %{name} %{_bindir}/%{name}-gui 10 touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : %post dedicated -/usr/sbin/update-alternatives --install %{_bindir}/%{name} %{name} %{_bindir}/%{name}-dedicated 0 - -%preun -if [ "$1" = 0 ] ; then - /usr/sbin/update-alternatives --remove %{name} %{_bindir}/%{name}-gui -fi +rm -f %{_bindir}/%{name} +ln -s %{name}-dedicated %{_bindir}/%{name} %preun dedicated -if [ "$1" = 0 ] ; then - /usr/sbin/update-alternatives --remove %{name} %{_bindir}/%{name}-dedicated +if [ "$1" -eq 0 ] ; then + rm -f %{_bindir}/%{name} fi %postun @@ -190,9 +171,7 @@ %files %defattr(-, root, root) -%ghost %{_sysconfdir}/alternatives/%{name} -%ghost %{_bindir}/%{name} -%{_bindir}/%{name}-gui +%{_bindir}/%{name} %{_datadir}/applications/%{name}.desktop %{_datadir}/icons/hicolor/16x16/apps/%{name}.png %{_datadir}/icons/hicolor/32x32/apps/%{name}.png @@ -204,8 +183,6 @@ %files dedicated %defattr(-, root, root) -%ghost %{_bindir}/%{name} -%ghost %{_sysconfdir}/alternatives/%{name} %{_bindir}/%{name}-dedicated %files data ++++++ openttd-1.2.0-RC2-source.tar.gz -> openttd-1.2.0-source.tar.gz ++++++ /work/SRC/openSUSE:Factory/openttd/openttd-1.2.0-RC2-source.tar.gz /work/SRC/openSUSE:Factory/.openttd.new/openttd-1.2.0-source.tar.gz differ: char 5, line 1 -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org