Hello community,
here is the log from the commit of package obs-service-set_version for
openSUSE:Factory checked in at 2019-05-24 11:32:46
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/obs-service-set_version (Old)
and /work/SRC/openSUSE:Factory/.obs-service-set_version.new.5148 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "obs-service-set_version"
Fri May 24 11:32:46 2019 rev:37 rq:705000 version:0.5.11
Changes:
--------
---
/work/SRC/openSUSE:Factory/obs-service-set_version/obs-service-set_version.changes
2019-05-13 14:51:51.730988565 +0200
+++
/work/SRC/openSUSE:Factory/.obs-service-set_version.new.5148/obs-service-set_version.changes
2019-05-24 11:32:46.937380615 +0200
@@ -1,0 +2,18 @@
+Thu May 16 15:13:14 UTC 2019 - John Whately <[email protected]>
+
+- Modified .spec file to better suit Fedora OS (let's just assume all Fedora
versions has python 3)
+
+-------------------------------------------------------------------
+Thu May 16 13:11:28 UTC 2019 - [email protected]
+
+- Update to version 0.5.11:
+ * try to fix set_version:157:13: E117 over-indented (comment)
+
+-------------------------------------------------------------------
+Tue May 14 13:33:02 UTC 2019 - Adrian Schröter <[email protected]>
+
+- enable test suite by default
+ * if it does not build, it can also not be executed on the distro
+- fix requires for SLE 12 distro
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ obs-service-set_version.spec ++++++
--- /var/tmp/diff_new_pack.Zz0XkS/_old 2019-05-24 11:32:47.581380368 +0200
+++ /var/tmp/diff_new_pack.Zz0XkS/_new 2019-05-24 11:32:47.585380367 +0200
@@ -1,7 +1,7 @@
#
# spec file for package obs-service-set_version
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,12 +16,14 @@
#
-%if 0%{?suse_version} > 1315
%bcond_without obs_scm_testsuite
+%define service set_version
+
+%if 0%{?suse_version} > 1315 || 0%{?fedora_version}
+%define use_python python3
%else
-%bcond_with obs_scm_testsuite
+%define use_python python
%endif
-%define service set_version
Name: obs-service-%{service}
Version: 0.5.11
@@ -31,21 +33,24 @@
Group: Development/Tools/Building
Url: https://github.com/openSUSE/obs-service-%{service}
Source: %{name}-%{version}.tar.gz
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
+BuildArch: noarch
+
%if %{with obs_scm_testsuite}
-BuildRequires: python3-ddt
-BuildRequires: python3-flake8
+BuildRequires: %{use_python}-ddt
+BuildRequires: %{use_python}-flake8
+BuildRequires: %{use_python}-packaging
%endif
+
%if 0%{?suse_version}
%if 0%{?suse_version} > 1315
-Recommends: python3-packaging
Requires: python3-base
%else
-Recommends: python3-packaging
+Requires: python
%endif
+Recommends: %{use_python}-packaging
%endif
-Requires: sed
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
-BuildArch: noarch
+
%description
This is a source service for openSUSE Build Service.
@@ -57,21 +62,11 @@
%setup -q
%build
-#%if 0%{?suse_version} > 1315
-#sed -i -e "1 s,#!/usr/bin/python$,#!/usr/bin/python3," set_version
-#%endif
-
-#%if 0%{?is_Fedora_Rawhide}
-#sed -i -e "1 s,#!/usr/bin/python$,#!/usr/bin/python3," set_version
-#%endif
-
-#%if 0%{?is_Fedora_30}
-#sed -i -e ""1 s,#!/usr/bin/python$,#!/usr/bin/python3," set_version
-#%endif
+sed -i -e "1 s,#!/usr/bin/python$,#!/usr/bin/%{use_python}," set_version
%if %{with obs_scm_testsuite}
%check
-make test PYTHON=python3
+make test PYTHON=%{use_python}
%endif
%install
