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 <christo...@krop.fr>
+
+- 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 <nmarq...@opensuse.org>
 # 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 <hackspac...@gmx.de>
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


Reply via email to