From 36175b03088888b5ab3f6028107cb5d950669b167da5743033296c2327fa0b35 Mon Sep 17 00:00:00 2001 From: Lars Vogdt Date: Sun, 12 May 2019 12:52:23 +0000 Subject: [PATCH] Accepting request 701780 from home:GeoDerp:redflower - Changed source files to support python 3 - fix for Fedora 30/Rawhide OBS-URL: https://build.opensuse.org/request/show/701780 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-set_version?expand=0&rev=95 --- obs-service-set_version-0.5.11.tar.gz | 4 ++-- obs-service-set_version.changes | 10 ++++++++++ obs-service-set_version.spec | 16 ++++++++++++---- 3 files changed, 24 insertions(+), 6 deletions(-) diff --git a/obs-service-set_version-0.5.11.tar.gz b/obs-service-set_version-0.5.11.tar.gz index bfe8325..7d29ace 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:2dab442bcbf66b3447072dacb161d94a82a5ebf0ea5aa927829dab5b1543154d -size 15332 +oid sha256:53b58e449ac91b66763cfde526003164ca81da3b0a7daff930e30a6c55e2e7f9 +size 14827 diff --git a/obs-service-set_version.changes b/obs-service-set_version.changes index de68a24..5fe7c5e 100644 --- a/obs-service-set_version.changes +++ b/obs-service-set_version.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Thu May 9 10:33:23 UTC 2019 - John Whately + +- Changed source files to support python 3 + +------------------------------------------------------------------- +Sat May 4 05:25:59 UTC 2019 - John Whately + +- fix for Fedora 30/Rawhide + ------------------------------------------------------------------- Mon Nov 26 18:04:26 CET 2018 - ro@suse.de diff --git a/obs-service-set_version.spec b/obs-service-set_version.spec index 2574018..4707970 100644 --- a/obs-service-set_version.spec +++ b/obs-service-set_version.spec @@ -40,7 +40,7 @@ BuildRequires: python3-flake8 Recommends: python3-packaging Requires: python3-base %else -Recommends: python-packaging +Recommends: python3-packaging %endif %endif Requires: sed @@ -57,9 +57,17 @@ 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%{?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 %if %{with obs_scm_testsuite} %check