From ff0e56e391af7cc4666b30a64acdb32d640c7270412fcc913d1deee5a59ad088 Mon Sep 17 00:00:00 2001 From: Frank Schreiner Date: Tue, 4 Jun 2019 11:46:55 +0000 Subject: [PATCH 1/3] - Update to version 0.10.9.1559647449.d965035: * [dist] enable python3 in SLE >= 12 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-tar_scm?expand=0&rev=258 --- PKGBUILD | 2 +- _servicedata | 2 +- debian.dsc | 2 +- obs-service-tar_scm-0.10.9.1557261720.32a1cdb.tar.gz | 3 --- obs-service-tar_scm-0.10.9.1559647449.d965035.tar.gz | 3 +++ obs-service-tar_scm.changes | 6 ++++++ obs-service-tar_scm.spec | 6 +++--- 7 files changed, 15 insertions(+), 9 deletions(-) delete mode 100644 obs-service-tar_scm-0.10.9.1557261720.32a1cdb.tar.gz create mode 100644 obs-service-tar_scm-0.10.9.1559647449.d965035.tar.gz diff --git a/PKGBUILD b/PKGBUILD index becf5c0..a530b18 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,5 +1,5 @@ pkgname=obs-service-tar_scm -pkgver=0.10.9.1557261720.32a1cdb +pkgver=0.10.9.1559647449.d965035 pkgrel=0 pkgdesc="Source Service for the OpenSUSE Build Service (OBS)" arch=('any') diff --git a/_servicedata b/_servicedata index 7b9ec84..e530f7d 100644 --- a/_servicedata +++ b/_servicedata @@ -5,4 +5,4 @@ git://github.com/M0ses/obs-service-tar_scm.git b742dfc0e12755cf306a95439494b5bdde7c0c61 git://github.com/openSUSE/obs-service-tar_scm.git - d35048f2cac019c9f452fe8fac2fe1eab5018e6e \ No newline at end of file + d965035ca4cd4cf989b803d4402f78f2344b5a72 \ No newline at end of file diff --git a/debian.dsc b/debian.dsc index b736e5d..1e0d48a 100644 --- a/debian.dsc +++ b/debian.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: obs-service-tar-scm -Version: 0.10.9.1557261720.32a1cdb +Version: 0.10.9.1559647449.d965035 Provides: obs-service-obs_scm, obs-service-tar Binary: obs-service-tar_scm Maintainer: Adrian Schroeter diff --git a/obs-service-tar_scm-0.10.9.1557261720.32a1cdb.tar.gz b/obs-service-tar_scm-0.10.9.1557261720.32a1cdb.tar.gz deleted file mode 100644 index 6ff29f5..0000000 --- a/obs-service-tar_scm-0.10.9.1557261720.32a1cdb.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1e8c0fe852cd04b5c4783f36f0636c62fa0204687d488c384aa3b40d288ebfb7 -size 67614 diff --git a/obs-service-tar_scm-0.10.9.1559647449.d965035.tar.gz b/obs-service-tar_scm-0.10.9.1559647449.d965035.tar.gz new file mode 100644 index 0000000..46c6383 --- /dev/null +++ b/obs-service-tar_scm-0.10.9.1559647449.d965035.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7c065b7933645f9bddc6e27706cab027bed6ed4b6d39994f9b13c314fda972cc +size 67630 diff --git a/obs-service-tar_scm.changes b/obs-service-tar_scm.changes index 3cf08d0..fbdfcc3 100644 --- a/obs-service-tar_scm.changes +++ b/obs-service-tar_scm.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Jun 04 11:42:50 UTC 2019 - FSchreiner@suse.com + +- Update to version 0.10.9.1559647449.d965035: + * [dist] enable python3 in SLE >= 12 + ------------------------------------------------------------------- Wed May 8 13:26:40 UTC 2019 - Julio González Gil diff --git a/obs-service-tar_scm.spec b/obs-service-tar_scm.spec index 56655bb..06fb26b 100644 --- a/obs-service-tar_scm.spec +++ b/obs-service-tar_scm.spec @@ -22,7 +22,7 @@ %bcond_with obs_scm_testsuite %endif -%if 0%{?suse_version} >= 1500 || 0%{?fedora_version} >= 29 +%if 0%{?suse_version} >= 1500 || 0%{?fedora_version} >= 29 || 0%{?sle_version} >= 120000 %bcond_without python3 %else %bcond_with python3 @@ -90,8 +90,8 @@ Recommends: obs-service-download_files \ ######## END OF MACROS AND FUN ################################### Name: obs-service-tar_scm -%define version_unconverted 0.10.9.1557261720.32a1cdb -Version: 0.10.9.1557261720.32a1cdb +%define version_unconverted 0.10.9.1559647449.d965035 +Version: 0.10.9.1559647449.d965035 Release: 0 Summary: An OBS source service: create tar ball from svn/git/hg License: GPL-2.0-or-later From b5315d597f44ee53486f4545c1a049d28e7ca0c68c7e702bc355a5601eb10513 Mon Sep 17 00:00:00 2001 From: Frank Schreiner Date: Wed, 5 Jun 2019 14:49:19 +0000 Subject: [PATCH 2/3] - Update to version 0.10.9.1559745964.22c86cd: * [dist] python3 for SLE12 and openSUSE 42.3 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-tar_scm?expand=0&rev=259 --- PKGBUILD | 2 +- _servicedata | 2 +- debian.dsc | 2 +- obs-service-tar_scm.changes | 6 ++++++ obs-service-tar_scm.spec | 10 ++++++---- 5 files changed, 15 insertions(+), 7 deletions(-) diff --git a/PKGBUILD b/PKGBUILD index a530b18..dbb5c0e 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,5 +1,5 @@ pkgname=obs-service-tar_scm -pkgver=0.10.9.1559647449.d965035 +pkgver=0.10.9.1559745964.22c86cd pkgrel=0 pkgdesc="Source Service for the OpenSUSE Build Service (OBS)" arch=('any') diff --git a/_servicedata b/_servicedata index e530f7d..455c1a8 100644 --- a/_servicedata +++ b/_servicedata @@ -5,4 +5,4 @@ git://github.com/M0ses/obs-service-tar_scm.git b742dfc0e12755cf306a95439494b5bdde7c0c61 git://github.com/openSUSE/obs-service-tar_scm.git - d965035ca4cd4cf989b803d4402f78f2344b5a72 \ No newline at end of file + 136e6bf6ac30d7e035d4e1f407b3bf56b9f7bcf1 \ No newline at end of file diff --git a/debian.dsc b/debian.dsc index 1e0d48a..d00ab8c 100644 --- a/debian.dsc +++ b/debian.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: obs-service-tar-scm -Version: 0.10.9.1559647449.d965035 +Version: 0.10.9.1559745964.22c86cd Provides: obs-service-obs_scm, obs-service-tar Binary: obs-service-tar_scm Maintainer: Adrian Schroeter diff --git a/obs-service-tar_scm.changes b/obs-service-tar_scm.changes index fbdfcc3..926f53c 100644 --- a/obs-service-tar_scm.changes +++ b/obs-service-tar_scm.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Jun 05 14:47:42 UTC 2019 - FSchreiner@suse.com + +- Update to version 0.10.9.1559745964.22c86cd: + * [dist] python3 for SLE12 and openSUSE 42.3 + ------------------------------------------------------------------- Tue Jun 04 11:42:50 UTC 2019 - FSchreiner@suse.com diff --git a/obs-service-tar_scm.spec b/obs-service-tar_scm.spec index 06fb26b..aea2888 100644 --- a/obs-service-tar_scm.spec +++ b/obs-service-tar_scm.spec @@ -22,7 +22,7 @@ %bcond_with obs_scm_testsuite %endif -%if 0%{?suse_version} >= 1500 || 0%{?fedora_version} >= 29 || 0%{?sle_version} >= 120000 +%if 0%{?suse_version} >= 1315 || 0%{?fedora_version} >= 29 %bcond_without python3 %else %bcond_with python3 @@ -30,7 +30,7 @@ # This list probably needs to be extended # logic seems to be if python < 2.7 ; then needs_external_argparse ; fi -%if (0%{?centos_version} == 6) || (0%{?rhel_version} == 600) || (0%{?suse_version} && 0%{?suse_version} < 1315) || (0%{?fedora_version} && 0%{?fedora_version} < 26) +%if (0%{?centos_version} == 6) || (0%{?suse_version} && 0%{?suse_version} < 1315) || (0%{?fedora_version} && 0%{?fedora_version} < 26) %bcond_without needs_external_argparse %else %bcond_with needs_external_argparse @@ -90,8 +90,8 @@ Recommends: obs-service-download_files \ ######## END OF MACROS AND FUN ################################### Name: obs-service-tar_scm -%define version_unconverted 0.10.9.1559647449.d965035 -Version: 0.10.9.1559647449.d965035 +%define version_unconverted 0.10.9.1559745964.22c86cd +Version: 0.10.9.1559745964.22c86cd Release: 0 Summary: An OBS source service: create tar ball from svn/git/hg License: GPL-2.0-or-later @@ -125,6 +125,8 @@ BuildRequires: %{use_python}-lxml %if %{with python3} BuildRequires: %{use_python} +# Fix missing Requires in python3-pbr in Leap42.3 +BuildRequires: %{use_python}-setuptools %else BuildRequires: python >= 2.6 %endif From 39c7d5ef319e00fd96e5999f2f9a292865e0d08bb0899592c3f6aac1fbcb5220 Mon Sep 17 00:00:00 2001 From: Frank Schreiner Date: Wed, 5 Jun 2019 15:09:36 +0000 Subject: [PATCH 3/3] updates OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-tar_scm?expand=0&rev=260 --- obs-service-tar_scm-0.10.9.1559647449.d965035.tar.gz | 3 --- obs-service-tar_scm-0.10.9.1559745964.22c86cd.tar.gz | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-) delete mode 100644 obs-service-tar_scm-0.10.9.1559647449.d965035.tar.gz create mode 100644 obs-service-tar_scm-0.10.9.1559745964.22c86cd.tar.gz diff --git a/obs-service-tar_scm-0.10.9.1559647449.d965035.tar.gz b/obs-service-tar_scm-0.10.9.1559647449.d965035.tar.gz deleted file mode 100644 index 46c6383..0000000 --- a/obs-service-tar_scm-0.10.9.1559647449.d965035.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7c065b7933645f9bddc6e27706cab027bed6ed4b6d39994f9b13c314fda972cc -size 67630 diff --git a/obs-service-tar_scm-0.10.9.1559745964.22c86cd.tar.gz b/obs-service-tar_scm-0.10.9.1559745964.22c86cd.tar.gz new file mode 100644 index 0000000..f5b584b --- /dev/null +++ b/obs-service-tar_scm-0.10.9.1559745964.22c86cd.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ff2f8a2b1628ebbb4732145b2e24f9e2f5d2081fcae22c8bcfa2e70faebdc18c +size 67980