commit unknown-horizons for openSUSE:Factory
Hello community,
here is the log from the commit of package unknown-horizons for
openSUSE:Factory checked in at 2020-07-27 17:46:58
Comparing /work/SRC/openSUSE:Factory/unknown-horizons (Old)
and /work/SRC/openSUSE:Factory/.unknown-horizons.new.3592 (New)
Package is "unknown-horizons"
Mon Jul 27 17:46:58 2020 rev:6 rq:822932 version:2019.1
Changes:
--- /work/SRC/openSUSE:Factory/unknown-horizons/unknown-horizons.changes
2020-07-14 08:00:45.946076417 +0200
+++
/work/SRC/openSUSE:Factory/.unknown-horizons.new.3592/unknown-horizons.changes
2020-07-27 17:48:38.347472115 +0200
@@ -1,0 +2,5 @@
+Sun Jul 19 11:33:17 UTC 2020 - Matthias Mailänder
+
+- add appdata.patch https://en.opensuse.org/openSUSE:AppStore metadata
+
+---
New:
appdata.patch
Other differences:
--
++ unknown-horizons.spec ++
--- /var/tmp/diff_new_pack.30MdIb/_old 2020-07-27 17:48:41.951476086 +0200
+++ /var/tmp/diff_new_pack.30MdIb/_new 2020-07-27 17:48:41.951476086 +0200
@@ -34,6 +34,8 @@
Patch2: rpm-shbang.patch
# PATCH-FIX-UPSTREAM
https://github.com/unknown-horizons/unknown-horizons/pull/2943
Patch3: reproducible.patch
+# PATCH-FIX-UPSTREAM
https://github.com/unknown-horizons/unknown-horizons/pull/2946
+Patch4: appdata.patch
BuildRequires: docbook-xsl-stylesheets
BuildRequires: fdupes
BuildRequires: fife-devel >= 0.4.2
@@ -106,6 +108,9 @@
find %{buildroot}%{_datadir}/%{name} -type f -exec chmod 644 \{\} +
%suse_update_desktop_file -i -r -G "A RTS simulation game" %{name}
StrategyGame Game
+
+install -D -m 0644 content/packages/%{name}.appdata.xml
%{buildroot}%{_datadir}/appdata/%{name}.appdata.xml
+
%fdupes %{buildroot}%{python_sitelib}
%fdupes %{buildroot}%{_datadir}
@@ -115,6 +120,7 @@
%{_bindir}/unknown-horizons
%{python3_sitelib}/horizons/
%{_datadir}/applications/%{name}.desktop
+%{_datadir}/appdata/%{name}.appdata.xml
%{_datadir}/%{name}/
%{_datadir}/icons/*/*/*/%{name}.svg
%{_mandir}/man6/%{name}.6%{?ext_man}
++ appdata.patch ++
>From dcd53c78eea5fd3242ec765b41fcf289307ec2a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?=
Date: Sun, 19 Jul 2020 13:20:59 +0200
Subject: [PATCH] Create unknown-horizons.appdata.xml
---
content/packages/unknown-horizons.appdata.xml | 42 +++
1 file changed, 42 insertions(+)
create mode 100644 content/packages/unknown-horizons.appdata.xml
diff --git a/content/packages/unknown-horizons.appdata.xml
b/content/packages/unknown-horizons.appdata.xml
new file mode 100644
index 00..6354696060
--- /dev/null
+++ b/content/packages/unknown-horizons.appdata.xml
@@ -0,0 +1,42 @@
+
+
+ unknown-horizons.desktop
+ CC0-1.0
+ APL-1.0 AND CC-BY-SA-3.0 AND GPL-2.0-with-font-exception
AND MIT AND OFL-1.1
+ Unknown Horizons
+ Open Source Real-Time Economy Simulation Game
+
+
+ Unknown Horizons is a 2D real-time strategy simulation with an emphasis
on economy and city building. Expand your small settlement to a strong and
wealthy colony, collect taxes and supply your inhabitants with valuable goods.
Increase your power with a well balanced economy and with strategic trade and
diplomacy.
+
+
+
+
+
http://unknown-horizons.org/static/screenshots/2019-01-11.23-36-47.502394.png
+
+
+ http://unknown-horizons.org/
+ http://unknown-horizons.org/support/
+
+none
+none
+none
+none
+none
+none
+none
+none
+none
+none
+none
+none
+none
+none
+none
+none
+none
+none
+none
+none
+
+
commit unknown-horizons for openSUSE:Factory
Hello community,
here is the log from the commit of package unknown-horizons for
openSUSE:Factory checked in at 2020-07-14 07:59:44
Comparing /work/SRC/openSUSE:Factory/unknown-horizons (Old)
and /work/SRC/openSUSE:Factory/.unknown-horizons.new.3060 (New)
Package is "unknown-horizons"
Tue Jul 14 07:59:44 2020 rev:5 rq:820625 version:2019.1
Changes:
--- /work/SRC/openSUSE:Factory/unknown-horizons/unknown-horizons.changes
2020-06-04 17:56:01.896926750 +0200
+++
/work/SRC/openSUSE:Factory/.unknown-horizons.new.3060/unknown-horizons.changes
2020-07-14 08:00:45.946076417 +0200
@@ -1,0 +2,5 @@
+Mon Jul 6 03:55:20 UTC 2020 - Bernhard Wiedemann
+
+- Add reproducible.patch to sort file lists (boo#1041090)
+
+---
New:
reproducible.patch
Other differences:
--
++ unknown-horizons.spec ++
--- /var/tmp/diff_new_pack.R14Yn8/_old 2020-07-14 08:00:48.230083813 +0200
+++ /var/tmp/diff_new_pack.R14Yn8/_new 2020-07-14 08:00:48.234083826 +0200
@@ -32,6 +32,8 @@
Patch1: 0001-replace-deprecated-to-distro-package-2910.patch
# PATCH-FIX-OPENSUSE -- Use python3 without env for rpm detection
Patch2: rpm-shbang.patch
+# PATCH-FIX-UPSTREAM
https://github.com/unknown-horizons/unknown-horizons/pull/2943
+Patch3: reproducible.patch
BuildRequires: docbook-xsl-stylesheets
BuildRequires: fdupes
BuildRequires: fife-devel >= 0.4.2
++ reproducible.patch ++
https://github.com/unknown-horizons/unknown-horizons/pull/2943 filesys
https://github.com/unknown-horizons/unknown-horizons/pull/2944 buildfix
Index: unknown-horizons-2019.1/horizons/util/loaders/loader.py
===
--- unknown-horizons-2019.1.orig/horizons/util/loaders/loader.py
+++ unknown-horizons-2019.1/horizons/util/loaders/loader.py
@@ -141,5 +141,5 @@ class GeneralLoader:
Discards everything else that we found living there in the past.
"""
junk = set(('.DS_Store', ))
- return [d for d in os.listdir(directory)
+ return [d for d in sorted(os.listdir(directory))
if d not in junk]
Index: unknown-horizons-2019.1/horizons/util/loaders/actionsetloader.py
===
--- unknown-horizons-2019.1.orig/horizons/util/loaders/actionsetloader.py
+++ unknown-horizons-2019.1/horizons/util/loaders/actionsetloader.py
@@ -47,7 +47,7 @@ class ActionSetLoader:
def _find_action_sets(cls, Dir):
"""Traverses recursively starting from dir to find action sets.
It is similar to os.walk, but more optimized for this use
case."""
- for entry in os.listdir(Dir):
+ for entry in sorted(os.listdir(Dir)):
full_path = os.path.join(Dir, entry)
if entry.startswith("as_"):
cls.action_sets[entry] =
GeneralLoader._load_action(full_path)
Index: unknown-horizons-2019.1/horizons/util/loaders/tilesetloader.py
===
--- unknown-horizons-2019.1.orig/horizons/util/loaders/tilesetloader.py
+++ unknown-horizons-2019.1/horizons/util/loaders/tilesetloader.py
@@ -47,7 +47,7 @@ class TileSetLoader:
def _find_tile_sets(cls, dir):
"""Traverses recursively starting from dir to find action sets.
It is similar to os.walk, but more optimized for this use
case."""
- for entry in os.listdir(dir):
+ for entry in sorted(os.listdir(dir)):
full_path = os.path.join(dir, entry)
if entry.startswith("ts_"):
cls.tile_sets[entry] =
GeneralLoader._load_action(full_path)
Index: unknown-horizons-2019.1/horizons/engine/generate_atlases.py
===
--- unknown-horizons-2019.1.orig/horizons/engine/generate_atlases.py
+++ unknown-horizons-2019.1/horizons/engine/generate_atlases.py
@@ -404,7 +404,10 @@ class AtlasGenerator:
if not os.path.exists(path):
continue
cls.log.info('Deleting %s', path)
- os.unlink(path)
+ try:
+ os.unlink(path)
+ except FileNotFoundError:
+ pass
if __name__ == '__main__':
commit unknown-horizons for openSUSE:Factory
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
+
+- 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" %{na
commit unknown-horizons for openSUSE:Factory
Hello community,
here is the log from the commit of package unknown-horizons for
openSUSE:Factory checked in at 2020-03-25 23:47:00
Comparing /work/SRC/openSUSE:Factory/unknown-horizons (Old)
and /work/SRC/openSUSE:Factory/.unknown-horizons.new.3160 (New)
Package is "unknown-horizons"
Wed Mar 25 23:47:00 2020 rev:3 rq:788171 version:2019.1
Changes:
--- /work/SRC/openSUSE:Factory/unknown-horizons/unknown-horizons.changes
2019-02-28 21:43:34.293520792 +0100
+++
/work/SRC/openSUSE:Factory/.unknown-horizons.new.3160/unknown-horizons.changes
2020-03-25 23:48:29.132049329 +0100
@@ -1,0 +2,6 @@
+Tue Mar 24 19:23:45 UTC 2020 - Christophe Giboudeaux
+
+- Add upstream patch to fix build with python 3.8:
+ * 0001-replace-deprecated-to-distro-package-2910.patch
+
+---
New:
0001-replace-deprecated-to-distro-package-2910.patch
Other differences:
--
++ unknown-horizons.spec ++
--- /var/tmp/diff_new_pack.rpWbXl/_old 2020-03-25 23:48:33.640048136 +0100
+++ /var/tmp/diff_new_pack.rpWbXl/_new 2020-03-25 23:48:33.668048128 +0100
@@ -1,7 +1,7 @@
#
# spec file for package unknown-horizons
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
# Copyright (c) 2011 Nelson Marques
# Copyright (c) Unknown Horizons, http://www.unknown-horizons.org
#
@@ -14,7 +14,7 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
@@ -28,6 +28,8 @@
Source0:https://github.com/%{name}/%{name}/archive/%{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
BuildRequires: docbook-xsl-stylesheets
BuildRequires: fdupes
BuildRequires: fife-devel >= 0.3.5
@@ -37,6 +39,7 @@
BuildRequires: python3 >= 3.6.5
BuildRequires: python3-Cython
BuildRequires: python3-Pillow
+BuildRequires: python3-distro
BuildRequires: python3-distutils-extra
BuildRequires: python3-pathlib
BuildRequires: python3-typing
@@ -63,8 +66,7 @@
%lang_package
%prep
-%setup -q
-%patch0 -p1
+%autosetup -p1
find . -type f -exec sed -i "s/#!\/usr\/bin\/env
python3/#!\/usr\/bin\/python3/" {} +
%build
@@ -74,7 +76,7 @@
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. Regenaration fixes this.
+# 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
++ 0001-replace-deprecated-to-distro-package-2910.patch ++
>From 18674ef8b6473aba5b5b2dee92edcf09a3bf715f Mon Sep 17 00:00:00 2001
From: Markus Hackspacher
Date: Tue, 27 Aug 2019 01:04:23 +0200
Subject: [PATCH] replace deprecated to distro package (#2910)
---
requirements.txt | 1 +
setup.py | 4 +++-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/requirements.txt b/requirements.txt
index d870567..5a94a3c 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,6 +1,7 @@
coverage==4.4.1
coveralls==1.1
crayons==0.1.2
+distro
future==0.16.0
greenlet==0.4.12
isort==4.3.4
diff --git a/setup.py b/setup.py
index cccb7b9..64e69b9 100755
--- a/setup.py
+++ b/setup.py
@@ -32,6 +32,8 @@ from distutils.core import setup
from distutils.spawn import find_executable
from shutil import copytree, rmtree
+import distro
+
import horizons
from horizons.constants import VERSION
from horizons.ext import polib
@@ -39,7 +41,7 @@ from horizons.ext import polib
# Ensure we are in the correct directory
os.chdir(os.path.realpath(os.path.dirname(__file__)))
-if platform.dist()[0].lower() in ('debian', 'ubuntu'):
+if distro.linux_distribution(full_distribution_name=False)[0] in ('debian',
'mint', 'ubuntu'):
executable_path = 'games'
else:
executable_path = 'bin'
--
2.25.1
commit unknown-horizons for openSUSE:Factory
Hello community,
here is the log from the commit of package unknown-horizons for
openSUSE:Factory checked in at 2019-02-28 21:43:33
Comparing /work/SRC/openSUSE:Factory/unknown-horizons (Old)
and /work/SRC/openSUSE:Factory/.unknown-horizons.new.28833 (New)
Package is "unknown-horizons"
Thu Feb 28 21:43:33 2019 rev:2 rq:679559 version:2019.1
Changes:
--- /work/SRC/openSUSE:Factory/unknown-horizons/unknown-horizons.changes
2019-02-15 09:54:40.259773838 +0100
+++
/work/SRC/openSUSE:Factory/.unknown-horizons.new.28833/unknown-horizons.changes
2019-02-28 21:43:34.293520792 +0100
@@ -1,0 +2,17 @@
+Tue Feb 5 18:55:20 UTC 2019 - ma...@marix.org
+
+- Recommend, instead of requiring, python3-enet as it is only
+ required for multiplayer and currently not available in openSUSE.
+- Fix broken requirement declaration towards python3-PyYAML.
+
+---
+Sun Feb 3 21:36:15 UTC 2019 - ma...@marix.org
+
+- Add missing Atlas data files to fix the game crashing on startup.
+
+---
+Wed Jan 23 00:34:22 UTC 2019 - Jan Engelhardt
+
+- Generalize description.
+
+---
Other differences:
--
++ unknown-horizons.spec ++
--- /var/tmp/diff_new_pack.btRDJH/_old 2019-02-28 21:43:38.517518988 +0100
+++ /var/tmp/diff_new_pack.btRDJH/_new 2019-02-28 21:43:38.521518986 +0100
@@ -36,6 +36,7 @@
BuildRequires: pkgconfig
BuildRequires: python3 >= 3.6.5
BuildRequires: python3-Cython
+BuildRequires: python3-Pillow
BuildRequires: python3-distutils-extra
BuildRequires: python3-pathlib
BuildRequires: python3-typing
@@ -44,17 +45,19 @@
BuildRequires: pkgconfig(libxslt)
Requires: hicolor-icon-theme
Requires: python3-Pillow
-Requires: python3-enet
+Requires: python3-PyYAML
Requires: python3-fife >= 0.3.5
-Requires: python3-yaml
Recommends: %{name}-lang = %{version}
+# python3-enet is only required for multiplayer and the game gracefully
handles it not
+# being present.
+Recommends: python3-enet
BuildArch: noarch
%description
Unknown Horizons is a 2D realtime strategy simulation with an emphasis on
-economy and city building. Expand your small settlement to a strong and
-wealthy colony, collect taxes and supply your inhabitants with valuabl
-goods. Increase your power with a well balanced economy and with strategic
+economy and city building. The player has to expand a small settlement to a
strong and
+wealthy colony, collect taxes and supply inhabitants with valuable
+goods, and increase the power with a well balanced economy and with strategic
trade and diplomacy.
%lang_package
@@ -69,6 +72,17 @@
%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. Regenaration 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 -
+
# -- we require use system pyenet
find %{buildroot}%{python_sitelib} -name "*enet.so" -type f -print -delete
# -- remove *egg-info
@@ -79,6 +93,15 @@
%{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
+
# Remove duplicate license files
rm -v %{buildroot}%{_datadir}/%{name}/content/fonts/{GPL_fontexception,OFL}
