Hello community,
here is the log from the commit of package openttd for openSUSE:Factory checked
in at 2012-05-22 08:17:09
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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-04-17
07:47:34.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.openttd.new/openttd.changes 2012-05-22
08:17:31.000000000 +0200
@@ -1,0 +2,11 @@
+Wed May 9 10:47:47 UTC 2012 - s...@ammler.ch
+
+- remove BuildRequires hicolor-icon-them (build on SLE_10)
+
+-------------------------------------------------------------------
+Fri May 4 11:45:51 UTC 2012 - s...@ammler.ch
+
+- remove __DATE__ and __TIME__ reference for build-compare
+- disable strip so we get debug rpms
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ openttd.spec ++++++
--- /var/tmp/diff_new_pack.SlF83c/_old 2012-05-22 08:17:32.000000000 +0200
+++ /var/tmp/diff_new_pack.SlF83c/_new 2012-05-22 08:17:32.000000000 +0200
@@ -53,7 +53,6 @@
BuildRequires: desktop-file-utils
Requires: hicolor-icon-theme
%endif
-BuildRequires: hicolor-icon-theme
%if 0%{?suse_version} || 0%{?mdkversion}
Recommends: openttd-openmsx
Recommends: openttd-opensfx
@@ -93,7 +92,7 @@
%package data
Summary: OpenTTD data
Group: Amusements/Games/Strategy/Other
-%if 0%{?suse_version} >= 1110 || 0%{?fedora} || 0%{?mdkversion} ||
0%{?rhel_version} >= 600 || 0%{?centos_version} >= 600
+%if 0%{?suse_version} > 1110 || 0%{?fedora} || 0%{?mdkversion} ||
0%{?rhel_version} >= 600 || 0%{?centos_version} >= 600
BuildArch: noarch
%endif
%if 0%{?suse_version} || 0%{?mdkversion}
@@ -110,18 +109,24 @@
%prep
%setup -qn %{name}-%{srcver}
+# Remove build time references so build-compare can do its work
+sed -i "s/__DATE__/\"openSUSE\"/" src/rev.cpp.in
+sed -i "s/__TIME__/\"BuildService\"/" src/rev.cpp.in
+
%build
# first, we build the dedicated binary and copy it to dedicated/
./configure \
+ --disable-strip \
--prefix-dir="%{_prefix}" \
--binary-dir="bin" \
--data-dir="share/%{name}" \
--enable-dedicated
-make %{?_smp_mflags} bundle BUNDLE_DIR="dedicated"
+make %{?_smp_mflags} bundle BUNDLE_DIR="dedicated" VERBOSE=1
make distclean
# then, we build the common gui version which we install the usual way
./configure \
+ --disable-strip \
--prefix-dir="%{_prefix}" \
--binary-name="%{name}" \
--binary-dir="bin" \
@@ -130,13 +135,13 @@
--menu-name="OpenTTD" \
--menu-group="Game;StrategyGame;"
-make %{?_smp_mflags}
+make %{?_smp_mflags} VERBOSE=1
%install
# install the dedicated binary
install -D -m0755 dedicated/openttd %{buildroot}%{_bindir}/%{name}-dedicated
# install the gui binary
-make install INSTALL_DIR=%{buildroot}
+make install INSTALL_DIR=%{buildroot} VERBOSE=1
%if 0%{?suse_version}
%suse_update_desktop_file -r %{name} Game StrategyGame
@@ -173,12 +178,7 @@
%defattr(-, root, root)
%{_bindir}/%{name}
%{_datadir}/applications/%{name}.desktop
-%{_datadir}/icons/hicolor/16x16/apps/%{name}.png
-%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
-%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
-%{_datadir}/icons/hicolor/64x64/apps/%{name}.png
-%{_datadir}/icons/hicolor/128x128/apps/%{name}.png
-%{_datadir}/icons/hicolor/256x256/apps/%{name}.png
+%{_datadir}/icons/hicolor
%{_datadir}/pixmaps/%{name}.32.xpm
%files dedicated
@@ -187,17 +187,12 @@
%files data
%defattr(-, root, root)
-%dir %{_datadir}/doc/%{name}
+%{_datadir}/doc/%{name}
%dir %{_datadir}/%{name}
-%dir %{_datadir}/%{name}/lang
-%dir %{_datadir}/%{name}/baseset
-%dir %{_datadir}/%{name}/scripts
-%dir %{_datadir}/%{name}/ai
-%{_datadir}/doc/%{name}/*
-%{_datadir}/%{name}/lang/*
-%{_datadir}/%{name}/baseset/*
-%{_datadir}/%{name}/scripts/*
-%{_datadir}/%{name}/ai/*
+%{_datadir}/%{name}/lang
+%{_datadir}/%{name}/baseset
+%{_datadir}/%{name}/scripts
+%{_datadir}/%{name}/ai
%doc %{_mandir}/man6/%{name}.6.*
%changelog
++++++ openttd.rpmlintrc ++++++
--- /var/tmp/diff_new_pack.SlF83c/_old 2012-05-22 08:17:32.000000000 +0200
+++ /var/tmp/diff_new_pack.SlF83c/_new 2012-05-22 08:17:32.000000000 +0200
@@ -1,5 +1,2 @@
# the man page is in the subpackage data
addFilter("openttd.*: W: no-manual-page-for-binary openttd")
-# no other package depends on this package, so this should not matter
-addFilter("openttd.*: W: file-contains-date-and-time /usr/bin/openttd")
-addFilter("openttd.*: W: file-contains-current-date /usr/bin/openttd")
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
