From 0e5a650455f5ed2ecf214a87c67839e86f55ef016adab6d83d2163d580207ecf Mon Sep 17 00:00:00 2001
From: Frank Schreiner <FSchreiner@suse.com>
Date: Thu, 16 May 2019 13:22:57 +0000
Subject: [PATCH] - Update to version 0.5.11:   * fix python/python3 shebang  
 * try to fix set_version:157:13: E117 over-indented (comment)

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-set_version?expand=0&rev=99
---
 _servicedata                          |  2 +-
 obs-service-set_version-0.5.11.tar.gz |  4 +--
 obs-service-set_version.changes       |  6 +++++
 obs-service-set_version.spec          | 37 ++++++++++++---------------
 4 files changed, 26 insertions(+), 23 deletions(-)

diff --git a/_servicedata b/_servicedata
index d8c9ba6..2542695 100644
--- a/_servicedata
+++ b/_servicedata
@@ -4,4 +4,4 @@
   <param name="changesrevision">eaedc529acba421821e0e5dcb4956c66e7f315a9</param></service>
 <service name="tar_scm">
                 <param name="url">https://github.com/openSUSE/obs-service-set_version.git</param>
-              <param name="changesrevision">74b26c829341eb4e0c3fff7c0585e8168eed76b9</param></service></servicedata>
\ No newline at end of file
+              <param name="changesrevision">1a1f5313c47d568dab814a0a827788d4924bf648</param></service></servicedata>
\ No newline at end of file
diff --git a/obs-service-set_version-0.5.11.tar.gz b/obs-service-set_version-0.5.11.tar.gz
index 7d29ace..c61705b 100644
--- a/obs-service-set_version-0.5.11.tar.gz
+++ b/obs-service-set_version-0.5.11.tar.gz
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:53b58e449ac91b66763cfde526003164ca81da3b0a7daff930e30a6c55e2e7f9
-size 14827
+oid sha256:02be35a2b0a5d4bf14d6c8b1b85bfed33708de7789502884553293780634b0da
+size 15219
diff --git a/obs-service-set_version.changes b/obs-service-set_version.changes
index 9f902c2..03f068c 100644
--- a/obs-service-set_version.changes
+++ b/obs-service-set_version.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu May 16 13:11:28 UTC 2019 - FSchreiner@suse.com
+
+- 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 <adrian@suse.de>
 
diff --git a/obs-service-set_version.spec b/obs-service-set_version.spec
index e4995c1..ea10eda 100644
--- a/obs-service-set_version.spec
+++ b/obs-service-set_version.spec
@@ -19,6 +19,12 @@
 %bcond_without obs_scm_testsuite
 %define service set_version
 
+%if 0%{?suse_version} > 1315  || 0%{?fedora} > 29
+%define use_python python3
+%else
+%define use_python python
+%endif
+
 Name:           obs-service-%{service}
 Version:        0.5.11
 Release:        0
@@ -27,22 +33,23 @@ License:        GPL-2.0-or-later
 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:  python3-packaging
+BuildRequires:  %{use_python}-ddt
+BuildRequires:  %{use_python}-flake8
+BuildRequires:  %{use_python}-packaging
 %endif
+
 %if 0%{?suse_version}
 %if 0%{?suse_version} > 1315
 Requires:       python3-base
 %else
-Requires:       python3
+Requires:       python
 %endif
-Recommends:     python3-packaging
+Recommends:     %{use_python}-packaging
 %endif
-Requires:       sed
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-BuildArch:      noarch
 
 %description
 This is a source service for openSUSE Build Service.
@@ -54,21 +61,11 @@ a given version or to the existing files.
 %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