Hello community,
here is the log from the commit of package unknown-horizons for
openSUSE:Factory checked in at 2020-06-04 17:55:37
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/unknown-horizons (Old)
and /work/SRC/openSUSE:Factory/.unknown-horizons.new.3606 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "unknown-horizons"
Thu Jun 4 17:55:37 2020 rev:4 rq:811310 version:2019.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/unknown-horizons/unknown-horizons.changes
2020-03-25 23:48:29.132049329 +0100
+++
/work/SRC/openSUSE:Factory/.unknown-horizons.new.3606/unknown-horizons.changes
2020-06-04 17:56:01.896926750 +0200
@@ -1,0 +2,7 @@
+Mon Jun 1 17:51:24 UTC 2020 - Ferdinand Thiessen <[email protected]>
+
+- Specfile cleanup
+- Fix python enet requirement
+- Added rpm-shbang.patch for RPM python detection
+
+-------------------------------------------------------------------
Old:
----
2019.1.tar.gz
New:
----
rpm-shbang.patch
unknown-horizons-2019.1.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ unknown-horizons.spec ++++++
--- /var/tmp/diff_new_pack.1Js1Ap/_old 2020-06-04 17:56:10.220952339 +0200
+++ /var/tmp/diff_new_pack.1Js1Ap/_new 2020-06-04 17:56:10.224952351 +0200
@@ -25,18 +25,20 @@
License: APL-1.0 AND CC-BY-SA-3.0 AND GPL-2.0-with-font-exception AND
MIT AND OFL-1.1
Group: Amusements/Games/Strategy/Other
URL: http://www.unknown-horizons.org
-Source0: https://github.com/%{name}/%{name}/archive/%{version}.tar.gz
+Source0:
https://github.com/%{name}/%{name}/archive/%{version}/%{name}-%{version}.tar.gz
# https://github.com/unknown-horizons/unknown-horizons/pull/2891
Patch0: unknown-horizons-encoding.patch
# PATCH-FIX-UPSTREAM
Patch1: 0001-replace-deprecated-to-distro-package-2910.patch
+# PATCH-FIX-OPENSUSE -- Use python3 without env for rpm detection
+Patch2: rpm-shbang.patch
BuildRequires: docbook-xsl-stylesheets
BuildRequires: fdupes
-BuildRequires: fife-devel >= 0.3.5
+BuildRequires: fife-devel >= 0.4.2
BuildRequires: hicolor-icon-theme
BuildRequires: intltool
BuildRequires: pkgconfig
-BuildRequires: python3 >= 3.6.5
+BuildRequires: python3
BuildRequires: python3-Cython
BuildRequires: python3-Pillow
BuildRequires: python3-distro
@@ -49,11 +51,11 @@
Requires: hicolor-icon-theme
Requires: python3-Pillow
Requires: python3-PyYAML
-Requires: python3-fife >= 0.3.5
+Requires: python3-fife >= 0.4.2
Recommends: %{name}-lang = %{version}
# python3-enet is only required for multiplayer and the game gracefully
handles it not
# being present.
-Recommends: python3-enet
+Recommends: python3-pyenet
BuildArch: noarch
%description
@@ -67,26 +69,18 @@
%prep
%autosetup -p1
-find . -type f -exec sed -i "s/#!\/usr\/bin\/env
python3/#!\/usr\/bin\/python3/" {} +
%build
python3 setup.py build
+# For some reason the Atlas generated by setup.py is corrupted. It has more
+# entries in the DB than there are image files. Regeneration fixes this.
+python3 horizons/engine/generate_atlases.py 2048
%install
python3 setup.py install --prefix=%{_prefix} --root=%{buildroot}
-# For some reason the Atlas generated by setup.py is corrupted. It has more
-# entries in the DB than there are image files. Regeneration fixes this.
-rm -f content/gfx/atlas/*
-rm -f content/atlas.sql
-rm -f content/actionsets.json
-rm -f content/tilesets.json
-cd development
-python3 ../horizons/engine/generate_atlases.py 2048
-cd -
+rm -v %{buildroot}%{_datadir}/locale/stats.json
-# -- we require use system pyenet
-find %{buildroot}%{python_sitelib} -name "*enet.so" -type f -print -delete
# -- remove *egg-info
find %{buildroot}%{python_sitelib} -type f -name "*.egg-info" -print -delete
@@ -95,12 +89,6 @@
%{buildroot}%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
rm -v %{buildroot}%{_datadir}/pixmaps/unknown-horizons.xpm
-# Install the Atlas
-install -D -m 0644 content/atlas.sql
%{buildroot}%{_datadir}/%{name}/content/atlas.sql
-install -D -m 0644 content/actionsets.json
%{buildroot}%{_datadir}/%{name}/content/actionsets.json
-install -D -m 0644 content/tilesets.json
%{buildroot}%{_datadir}/%{name}/content/tilesets.json
-install -m 0644 content/gfx/atlas/*
%{buildroot}%{_datadir}/%{name}/content/gfx/atlas
-
# Remove file only existing to ensure directoy is not dropped by Git
rm -v %{buildroot}%{_datadir}/%{name}/content/gfx/atlas/.keepme
@@ -109,38 +97,25 @@
# Remove duplicate languages and find correct ones
rm -rfv %{buildroot}%{_datadir}/%{name}/content/lang
-
%find_lang %{name}
%find_lang %{name}-server
+# Fix file permissions
+find %{buildroot}%{_datadir}/%{name} -type f -exec chmod 644 \{\} +
+
%suse_update_desktop_file -i -r -G "A RTS simulation game" %{name}
StrategyGame Game
%fdupes %{buildroot}%{python_sitelib}
%fdupes %{buildroot}%{_datadir}
-%post
-%desktop_database_post
-%icon_theme_cache_post
-
-%postun
-%desktop_database_postun
-%icon_theme_cache_post
-
%files
%doc README.md doc/CHANGELOG.md
-%if ( 0%{?suse_version} == 1315 && 0%{?sle_version} == 120100 ) || !
0%{?is_opensuse}
-# Leap 42.1 or SLE
-%license doc/LICENSE
-%doc doc/AUTHORS.md doc/licenses/
-%else
%license doc/LICENSE doc/AUTHORS.md doc/licenses/
-%endif
%{_bindir}/unknown-horizons
%{python3_sitelib}/horizons/
%{_datadir}/applications/%{name}.desktop
%{_datadir}/%{name}/
%{_datadir}/icons/*/*/*/%{name}.svg
%{_mandir}/man6/%{name}.6%{?ext_man}
-%{_datadir}/locale/stats.json
%files lang -f %{name}-server.lang -f %{name}.lang
++++++ rpm-shbang.patch ++++++
diff -Nur old/run_uh.py new/run_uh.py
--- old/run_uh.py 2020-06-01 12:00:03.468270151 +0200
+++ new/run_uh.py 2020-06-01 12:00:25.488432899 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/python3
# ###################################################
# Copyright (C) 2008-2017 The Unknown Horizons Team
