From 32247dbd35f5fb8de8d87379169d5572eb6ef9f680b7b5fb8ac158a0484d7fd2 Mon Sep 17 00:00:00 2001 From: Ruediger Oertel Date: Fri, 29 Mar 2019 14:07:23 +0000 Subject: [PATCH 1/9] Accepting request 689884 from home:juliogonzalezgil:branches:openSUSE:Tools - Change requirement locale_package to glibc-common to fix building for CentOS7 and older, and Fedora26 and older Package was able to build locally for CentOS6, CentOS7 and build for Fedora29 started (ongoing) OBS-URL: https://build.opensuse.org/request/show/689884 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-tar_scm?expand=0&rev=247 --- obs-service-tar_scm.changes | 6 ++++++ obs-service-tar_scm.spec | 4 +++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/obs-service-tar_scm.changes b/obs-service-tar_scm.changes index af57ff4..2b53a38 100644 --- a/obs-service-tar_scm.changes +++ b/obs-service-tar_scm.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Mar 29 13:49:15 UTC 2019 - Julio González Gil + +- Change requirement locale_package to glibc-common to fix building + for CentOS6 and CentOS7 + ------------------------------------------------------------------- Wed Mar 06 15:59:39 UTC 2019 - adrian@suse.de diff --git a/obs-service-tar_scm.spec b/obs-service-tar_scm.spec index ac874bc..a2a623f 100644 --- a/obs-service-tar_scm.spec +++ b/obs-service-tar_scm.spec @@ -23,7 +23,9 @@ %define locale_package glibc-locale %endif %endif -%if 0%{?fedora_version} || 0%{?rhel_version} || 0%{?centos_version} +%if 0%{?fedora_version} < 27 || 0%{?rhel_version} < 8 || 0%{?centos_version} < 8 +%define locale_package glibc-common +%else %define locale_package glibc-langpack-en %endif From a5059e4ee53bcff8a07f8eefe102968606c0cf2d6ac3ecc77862fb30f906792e Mon Sep 17 00:00:00 2001 From: Ruediger Oertel Date: Fri, 29 Mar 2019 14:16:15 +0000 Subject: [PATCH 2/9] next iteration of last fix OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-tar_scm?expand=0&rev=248 --- obs-service-tar_scm.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/obs-service-tar_scm.spec b/obs-service-tar_scm.spec index a2a623f..98ec2b8 100644 --- a/obs-service-tar_scm.spec +++ b/obs-service-tar_scm.spec @@ -23,11 +23,13 @@ %define locale_package glibc-locale %endif %endif +%if 0%{?fedora_version} || 0%{?rhel_version} || 0%{?centos_version} %if 0%{?fedora_version} < 27 || 0%{?rhel_version} < 8 || 0%{?centos_version} < 8 %define locale_package glibc-common %else %define locale_package glibc-langpack-en %endif +%endif %bcond_without obs_scm_testsuite From 512c7373ed363e729f0a637066bce4231826ed92c8103f214e160d7f5723909c Mon Sep 17 00:00:00 2001 From: Marcus Rueckert Date: Tue, 9 Apr 2019 17:03:57 +0000 Subject: [PATCH 3/9] - locally apply fixes from https://github.com/openSUSE/obs-service-tar_scm/pull/298 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-tar_scm?expand=0&rev=249 --- obs-service-tar_scm.changes | 6 ++++++ obs-service-tar_scm.spec | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/obs-service-tar_scm.changes b/obs-service-tar_scm.changes index 2b53a38..33fd0e0 100644 --- a/obs-service-tar_scm.changes +++ b/obs-service-tar_scm.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Apr 9 17:03:08 UTC 2019 - Marcus Rueckert + +- locally apply fixes from + https://github.com/openSUSE/obs-service-tar_scm/pull/298 + ------------------------------------------------------------------- Fri Mar 29 13:49:15 UTC 2019 - Julio González Gil diff --git a/obs-service-tar_scm.spec b/obs-service-tar_scm.spec index 98ec2b8..d074bdb 100644 --- a/obs-service-tar_scm.spec +++ b/obs-service-tar_scm.spec @@ -24,10 +24,10 @@ %endif %endif %if 0%{?fedora_version} || 0%{?rhel_version} || 0%{?centos_version} -%if 0%{?fedora_version} < 27 || 0%{?rhel_version} < 8 || 0%{?centos_version} < 8 -%define locale_package glibc-common -%else +%if 0%{?fedora_version} >= 27 || 0%{?rhel_version} >= 8 || 0%{?centos_version} >= 8 %define locale_package glibc-langpack-en +%else +%define locale_package glibc-common %endif %endif From 89388efd2804e6c063e2472d77561e36bebb1d31c6d1d910e80e5d5238d08df0 Mon Sep 17 00:00:00 2001 From: Marcus Rueckert Date: Tue, 9 Apr 2019 17:18:38 +0000 Subject: [PATCH 4/9] - centos_version and rhel_version are triple digits OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-tar_scm?expand=0&rev=250 --- obs-service-tar_scm.changes | 5 +++++ obs-service-tar_scm.spec | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/obs-service-tar_scm.changes b/obs-service-tar_scm.changes index 33fd0e0..13f2e51 100644 --- a/obs-service-tar_scm.changes +++ b/obs-service-tar_scm.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Apr 9 17:18:09 UTC 2019 - Marcus Rueckert + +- centos_version and rhel_version are triple digits + ------------------------------------------------------------------- Tue Apr 9 17:03:08 UTC 2019 - Marcus Rueckert diff --git a/obs-service-tar_scm.spec b/obs-service-tar_scm.spec index d074bdb..afdb060 100644 --- a/obs-service-tar_scm.spec +++ b/obs-service-tar_scm.spec @@ -24,7 +24,7 @@ %endif %endif %if 0%{?fedora_version} || 0%{?rhel_version} || 0%{?centos_version} -%if 0%{?fedora_version} >= 27 || 0%{?rhel_version} >= 8 || 0%{?centos_version} >= 8 +%if 0%{?fedora_version} >= 27 || 0%{?rhel_version} >= 800 || 0%{?centos_version} >= 800 %define locale_package glibc-langpack-en %else %define locale_package glibc-common From 74753ea83f9c273df192c67020fa7c4ff8884838b84a6a32f4e32704462dbaed Mon Sep 17 00:00:00 2001 From: Frank Schreiner Date: Fri, 26 Apr 2019 12:41:15 +0000 Subject: [PATCH 5/9] - Update to version 0.10.7.1556277536.7e9915a: * [dist] spec file: python3 only and multidist * Git also uses the LANGUAGE variable * centos_version and rhel_version are triple digits * Minimize diff with the version in openSUSE:Tools * Fix the logic to pick the locale package on Fedora * Forgot the guard 0 in one conditional OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-tar_scm?expand=0&rev=251 --- PKGBUILD | 2 +- _servicedata | 2 +- debian.dsc | 2 +- ...e-tar_scm-0.10.6.1551887937.e42c270.tar.gz | 3 - ...e-tar_scm-0.10.7.1556277536.7e9915a.tar.gz | 3 + obs-service-tar_scm.changes | 11 +++ obs-service-tar_scm.spec | 73 ++++++++++++------- 7 files changed, 64 insertions(+), 32 deletions(-) delete mode 100644 obs-service-tar_scm-0.10.6.1551887937.e42c270.tar.gz create mode 100644 obs-service-tar_scm-0.10.7.1556277536.7e9915a.tar.gz diff --git a/PKGBUILD b/PKGBUILD index 604c1e3..9b30228 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,5 +1,5 @@ pkgname=obs-service-tar_scm -pkgver=0.10.6.1551887937.e42c270 +pkgver=0.10.7.1556277536.7e9915a pkgrel=0 pkgdesc="Source Service for the OpenSUSE Build Service (OBS)" arch=('any') diff --git a/_servicedata b/_servicedata index aae1607..086a50b 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 - 689f06bdad912d238ee2714eeae9f53218953b9a \ No newline at end of file + 77d3c335255671fd6be192d9f8bd941bb166a4c5 \ No newline at end of file diff --git a/debian.dsc b/debian.dsc index bf65f7c..ee65930 100644 --- a/debian.dsc +++ b/debian.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: obs-service-tar-scm -Version: 0.10.6.1551887937.e42c270 +Version: 0.10.7.1556277536.7e9915a 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.6.1551887937.e42c270.tar.gz b/obs-service-tar_scm-0.10.6.1551887937.e42c270.tar.gz deleted file mode 100644 index 7d936ce..0000000 --- a/obs-service-tar_scm-0.10.6.1551887937.e42c270.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:793ceaa98a3c15ebcd01886275aaec9bb051b914097bfd1ab16ecf773664ee70 -size 67763 diff --git a/obs-service-tar_scm-0.10.7.1556277536.7e9915a.tar.gz b/obs-service-tar_scm-0.10.7.1556277536.7e9915a.tar.gz new file mode 100644 index 0000000..efcdee4 --- /dev/null +++ b/obs-service-tar_scm-0.10.7.1556277536.7e9915a.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:68b44a46216cd819093e60f31dd3abc7b386758809976d5453e1aab687e7ce53 +size 67532 diff --git a/obs-service-tar_scm.changes b/obs-service-tar_scm.changes index 13f2e51..3d49cbf 100644 --- a/obs-service-tar_scm.changes +++ b/obs-service-tar_scm.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Fri Apr 26 12:40:14 UTC 2019 - FSchreiner@suse.com + +- Update to version 0.10.7.1556277536.7e9915a: + * [dist] spec file: python3 only and multidist + * Git also uses the LANGUAGE variable + * centos_version and rhel_version are triple digits + * Minimize diff with the version in openSUSE:Tools + * Fix the logic to pick the locale package on Fedora + * Forgot the guard 0 in one conditional + ------------------------------------------------------------------- Tue Apr 9 17:18:09 UTC 2019 - Marcus Rueckert diff --git a/obs-service-tar_scm.spec b/obs-service-tar_scm.spec index afdb060..c3b7fb9 100644 --- a/obs-service-tar_scm.spec +++ b/obs-service-tar_scm.spec @@ -16,14 +16,31 @@ # +%if 0%{?suse_version} >= 1500 || 0%{?fedora_version} >= 29 +%bcond_without python3 +%else +%bcond_with python3 +%endif + +%if %{with python3} +%define use_python python3 +%define use_test test3 +%else +%define use_python python +%define use_test test +%endif + %if 0%{?suse_version} +%define pyyaml_package %{use_python}-PyYAML %if 0%{?suse_version} >= 1550 %define locale_package glibc-locale-base %else %define locale_package glibc-locale %endif %endif -%if 0%{?fedora_version} || 0%{?rhel_version} || 0%{?centos_version} + +%if 0%{?fedora_version} || 0%{?rhel_version} || 0%{?centos_version} || 0%{?scientificlinux_version} +%define pyyaml_package PyYAML %if 0%{?fedora_version} >= 27 || 0%{?rhel_version} >= 800 || 0%{?centos_version} >= 800 %define locale_package glibc-langpack-en %else @@ -31,45 +48,52 @@ %endif %endif +%if 0%{?mageia} || 0%{?mandriva_version} +%define pyyaml_package python-yaml +%define locale_package locales +%endif + %bcond_without obs_scm_testsuite Name: obs-service-tar_scm -%define version_unconverted 0.10.6.1551887937.e42c270 -Version: 0.10.6.1551887937.e42c270 +%define version_unconverted 0.10.7.1556277536.7e9915a +Version: 0.10.7.1556277536.7e9915a Release: 0 Summary: An OBS source service: create tar ball from svn/git/hg License: GPL-2.0-or-later Group: Development/Tools/Building Url: https://github.com/openSUSE/obs-service-tar_scm Source: %{name}-%{version}.tar.gz + # Fix build on Ubuntu by disabling mercurial tests, not applied in rpm # based distributions #Patch0: 0001-Debianization-disable-running-mercurial-tests.patch + %if %{with obs_scm_testsuite} BuildRequires: %{locale_package} +BuildRequires: %{use_python}-mock +BuildRequires: %{use_python}-six +BuildRequires: %{use_python}-unittest2 BuildRequires: bzr BuildRequires: git-core BuildRequires: mercurial BuildRequires: subversion -%if 0%{?fedora_version} || 0%{?rhel_version} || 0%{?centos_version} +%endif + +%if 0%{?fedora_version} || 0%{?rhel_version} || 0%{?centos_version} || 0%{?mageia} || 0%{?mandriva_version} %define py_compile(O) \ find %1 -name '*.pyc' -exec rm -f {} \\; \ -python -c "import sys, os, compileall; br='%{buildroot}'; compileall.compile_dir(sys.argv[1], ddir=br and (sys.argv[1][len(os.path.abspath(br)):]+'/') or None)" %1 \ +%{use_python} -c "import sys, os, compileall; br='%{buildroot}'; compileall.compile_dir(sys.argv[1], ddir=br and (sys.argv[1][len(os.path.abspath(br)):]+'/') or None)" %1 \ %{-O: \ find %1 -name '*.pyo' -exec rm -f {} \\; \ -python -O -c "import sys, os, compileall; br='%{buildroot}'; compileall.compile_dir(sys.argv[1], ddir=br and (sys.argv[1][len(os.path.abspath(br)):]+'/') or None)" %1 \ +%{use_python} -O -c "import sys, os, compileall; br='%{buildroot}'; compileall.compile_dir(sys.argv[1], ddir=br and (sys.argv[1][len(os.path.abspath(br)):]+'/') or None)" %1 \ } +%endif + +BuildRequires: %{pyyaml_package} +BuildRequires: %{use_python}-dateutil +BuildRequires: %{use_python}-lxml -BuildRequires: PyYAML -%else -BuildRequires: python-PyYAML -%endif -BuildRequires: python-dateutil -BuildRequires: python-lxml -BuildRequires: python-mock -BuildRequires: python-six -BuildRequires: python-unittest2 -%endif BuildRequires: python >= 2.6 Requires: git-core @@ -91,14 +115,11 @@ It supports downloading from svn, git, hg and bzr repositories. Summary: Common parts of SCM handling services Group: Development/Tools/Building Requires: %{locale_package} -Requires: python-dateutil -%if 0%{?fedora_version} || 0%{?rhel_version} || 0%{?centos_version} -Requires: PyYAML -%else -Requires: python-PyYAML +Requires: %{pyyaml_package} +Requires: %{use_python}-dateutil + %if 0%{?suse_version} < 1315 -Requires: python-argparse -%endif +Requires: %{use_python}-argparse %endif %if 0%{?fedora_version} >= 25 @@ -113,8 +134,8 @@ Group: Development/Tools/Building Requires: obs-service-obs_scm-common = %version-%release Provides: obs-service-tar_scm:/usr/lib/obs/service/tar.service %if (0%{?fedora_version} && 0%{?fedora_version} < 26) || 0%{?centos} == 6 || 0%{?centos} == 7 -BuildRequires: python-argparse -Requires: python-argparse +BuildRequires: %{use_python}-argparse +Requires: %{use_python}-argparse %endif %description -n obs-service-tar @@ -192,7 +213,7 @@ make install DESTDIR="%{buildroot}" PREFIX="%{_prefix}" SYSCFG="%{_sysconfdir}" # No need to run PEP8 tests here; that would require a potentially # brittle BuildRequires: python-pep8, and any style issues are already # caught by Travis CI. -make test +make %{use_test} %endif %endif From 59df3c8ed70f3d3deae3ad2a8331f1efd7c231b02e22d2d7780a81a439d30cc8 Mon Sep 17 00:00:00 2001 From: Marcus Rueckert Date: Fri, 26 Apr 2019 19:01:16 +0000 Subject: [PATCH 6/9] - the current guessing code is finding python2 and then uses that, because python2 still seems to be available in the build env, as we already know which python version we want we can just pass the path to make and skip the whole guessing. OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-tar_scm?expand=0&rev=252 --- obs-service-tar_scm.changes | 8 ++++++++ obs-service-tar_scm.spec | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/obs-service-tar_scm.changes b/obs-service-tar_scm.changes index 3d49cbf..78f4f48 100644 --- a/obs-service-tar_scm.changes +++ b/obs-service-tar_scm.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Fri Apr 26 19:00:00 UTC 2019 - Marcus Rueckert + +- the current guessing code is finding python2 and then uses that, + because python2 still seems to be available in the build env, + as we already know which python version we want we can just pass + the path to make and skip the whole guessing. + ------------------------------------------------------------------- Fri Apr 26 12:40:14 UTC 2019 - FSchreiner@suse.com diff --git a/obs-service-tar_scm.spec b/obs-service-tar_scm.spec index c3b7fb9..d7e32c5 100644 --- a/obs-service-tar_scm.spec +++ b/obs-service-tar_scm.spec @@ -204,7 +204,7 @@ resources and packages them. %endif %install -make install DESTDIR="%{buildroot}" PREFIX="%{_prefix}" SYSCFG="%{_sysconfdir}" +make install DESTDIR="%{buildroot}" PREFIX="%{_prefix}" SYSCFG="%{_sysconfdir}" PYTHON="%{_bindir}/%{use_python}" %if %{with obs_scm_testsuite} %if 0%{?suse_version} >= 1220 From ca1c9d764cff0aa9de9d0e35c7b0d038cc0d12db45a1f2c7faa88a2f31f329d7 Mon Sep 17 00:00:00 2001 From: Frank Schreiner Date: Fri, 3 May 2019 15:26:27 +0000 Subject: [PATCH 7/9] - Update to version 0.10.8.1556896538.0693a62: * Compile python files before install * change order in GNUMakefile to prefer python3 * More thorought spec file cleanup * predefine python version in spec file for GNUMAkefile OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-tar_scm?expand=0&rev=253 --- PKGBUILD | 2 +- _servicedata | 2 +- debian.dsc | 2 +- ...e-tar_scm-0.10.7.1556277536.7e9915a.tar.gz | 3 - ...e-tar_scm-0.10.8.1556896538.0693a62.tar.gz | 3 + obs-service-tar_scm.changes | 9 ++ obs-service-tar_scm.spec | 132 +++++++++--------- 7 files changed, 82 insertions(+), 71 deletions(-) delete mode 100644 obs-service-tar_scm-0.10.7.1556277536.7e9915a.tar.gz create mode 100644 obs-service-tar_scm-0.10.8.1556896538.0693a62.tar.gz diff --git a/PKGBUILD b/PKGBUILD index 9b30228..bb9ff00 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,5 +1,5 @@ pkgname=obs-service-tar_scm -pkgver=0.10.7.1556277536.7e9915a +pkgver=0.10.8.1556896538.0693a62 pkgrel=0 pkgdesc="Source Service for the OpenSUSE Build Service (OBS)" arch=('any') diff --git a/_servicedata b/_servicedata index 086a50b..8360418 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 - 77d3c335255671fd6be192d9f8bd941bb166a4c5 \ No newline at end of file + 0693a62a62e90ce8fc137425a91f7842c18f5557 \ No newline at end of file diff --git a/debian.dsc b/debian.dsc index ee65930..6c49ccd 100644 --- a/debian.dsc +++ b/debian.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: obs-service-tar-scm -Version: 0.10.7.1556277536.7e9915a +Version: 0.10.8.1556896538.0693a62 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.7.1556277536.7e9915a.tar.gz b/obs-service-tar_scm-0.10.7.1556277536.7e9915a.tar.gz deleted file mode 100644 index efcdee4..0000000 --- a/obs-service-tar_scm-0.10.7.1556277536.7e9915a.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:68b44a46216cd819093e60f31dd3abc7b386758809976d5453e1aab687e7ce53 -size 67532 diff --git a/obs-service-tar_scm-0.10.8.1556896538.0693a62.tar.gz b/obs-service-tar_scm-0.10.8.1556896538.0693a62.tar.gz new file mode 100644 index 0000000..42557ca --- /dev/null +++ b/obs-service-tar_scm-0.10.8.1556896538.0693a62.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c2a133af2e49f2374a5d2ac761041b6f53a96755c6a5eb5f3fb2da541f524e1f +size 67904 diff --git a/obs-service-tar_scm.changes b/obs-service-tar_scm.changes index 78f4f48..9a22554 100644 --- a/obs-service-tar_scm.changes +++ b/obs-service-tar_scm.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Fri May 03 15:24:40 UTC 2019 - FSchreiner@suse.com + +- Update to version 0.10.8.1556896538.0693a62: + * Compile python files before install + * change order in GNUMakefile to prefer python3 + * More thorought spec file cleanup + * predefine python version in spec file for GNUMAkefile + ------------------------------------------------------------------- Fri Apr 26 19:00:00 UTC 2019 - Marcus Rueckert diff --git a/obs-service-tar_scm.spec b/obs-service-tar_scm.spec index d7e32c5..0dc7804 100644 --- a/obs-service-tar_scm.spec +++ b/obs-service-tar_scm.spec @@ -16,23 +16,37 @@ # +%if 0%{?suse_version} && 0%{?suse_version} >= 1220 +%bcond_without obs_scm_testsuite +%else +%bcond_with obs_scm_testsuite +%endif + %if 0%{?suse_version} >= 1500 || 0%{?fedora_version} >= 29 %bcond_without python3 %else %bcond_with python3 %endif +# 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%{?suse_version} && 0%{?suse_version} < 1315) || (0%{?fedora_version} && 0%{?fedora_version} < 26) +%bcond_without needs_external_argparse +%else +%bcond_with needs_external_argparse +%endif + %if %{with python3} %define use_python python3 -%define use_test test3 +%define use_test test3 %else %define use_python python -%define use_test test +%define use_test test %endif %if 0%{?suse_version} %define pyyaml_package %{use_python}-PyYAML -%if 0%{?suse_version} >= 1550 +%if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150100 %define locale_package glibc-locale-base %else %define locale_package glibc-locale @@ -40,7 +54,12 @@ %endif %if 0%{?fedora_version} || 0%{?rhel_version} || 0%{?centos_version} || 0%{?scientificlinux_version} +%if 0%{?fedora_version} >= 29 || 0%{?rhel_version} >= 800 || 0%{?centos_version} >= 800 +%define pyyaml_package %{use_python}-PyYAML +%else %define pyyaml_package PyYAML +%endif + %if 0%{?fedora_version} >= 27 || 0%{?rhel_version} >= 800 || 0%{?centos_version} >= 800 %define locale_package glibc-langpack-en %else @@ -53,11 +72,26 @@ %define locale_package locales %endif -%bcond_without obs_scm_testsuite +# avoid code duplication +%define scm_common_dep \ +Requires: obs-service-obs_scm-common = %version-%release \ +%{nil} + +%define scm_dependencies \ +Requires: git-core \ +%if 0%{?suse_version} >= 1315 \ +Recommends: bzr \ +Recommends: mercurial \ +Recommends: subversion \ +Recommends: obs-service-download_files \ +%endif \ +%{nil} + +######## END OF MACROS AND FUN ################################### Name: obs-service-tar_scm -%define version_unconverted 0.10.7.1556277536.7e9915a -Version: 0.10.7.1556277536.7e9915a +%define version_unconverted 0.10.8.1556896538.0693a62 +Version: 0.10.8.1556896538.0693a62 Release: 0 Summary: An OBS source service: create tar ball from svn/git/hg License: GPL-2.0-or-later @@ -80,29 +114,25 @@ BuildRequires: mercurial BuildRequires: subversion %endif -%if 0%{?fedora_version} || 0%{?rhel_version} || 0%{?centos_version} || 0%{?mageia} || 0%{?mandriva_version} -%define py_compile(O) \ -find %1 -name '*.pyc' -exec rm -f {} \\; \ -%{use_python} -c "import sys, os, compileall; br='%{buildroot}'; compileall.compile_dir(sys.argv[1], ddir=br and (sys.argv[1][len(os.path.abspath(br)):]+'/') or None)" %1 \ -%{-O: \ -find %1 -name '*.pyo' -exec rm -f {} \\; \ -%{use_python} -O -c "import sys, os, compileall; br='%{buildroot}'; compileall.compile_dir(sys.argv[1], ddir=br and (sys.argv[1][len(os.path.abspath(br)):]+'/') or None)" %1 \ -} -%endif - +BuildRequires: %{locale_package} BuildRequires: %{pyyaml_package} +%if %{with needs_external_argparse} +BuildRequires: %{use_python}-argparse +%endif BuildRequires: %{use_python}-dateutil +# Why do we need this? we dont use it as runtime requires later BuildRequires: %{use_python}-lxml +%if %{with python3} +BuildRequires: %{use_python} +%else BuildRequires: python >= 2.6 -Requires: git-core - -%if 0%{?suse_version} >= 1315 -Recommends: bzr -Recommends: mercurial -Recommends: subversion %endif -Requires: obs-service-obs_scm-common = %version-%release +%scm_common_dep +%scm_dependencies +# +# +# BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch @@ -117,26 +147,22 @@ Group: Development/Tools/Building Requires: %{locale_package} Requires: %{pyyaml_package} Requires: %{use_python}-dateutil - -%if 0%{?suse_version} < 1315 +%if %{with needs_external_argparse} Requires: %{use_python}-argparse %endif -%if 0%{?fedora_version} >= 25 -Requires: python2 -%endif - %description -n obs-service-obs_scm-common +This is a source service for openSUSE Build Service. + +It supports downloading from svn, git, hg and bzr repositories. + +This package holds the shared files for different services. %package -n obs-service-tar Summary: Creates a tar archive from local directory Group: Development/Tools/Building -Requires: obs-service-obs_scm-common = %version-%release Provides: obs-service-tar_scm:/usr/lib/obs/service/tar.service -%if (0%{?fedora_version} && 0%{?fedora_version} < 26) || 0%{?centos} == 6 || 0%{?centos} == 7 -BuildRequires: %{use_python}-argparse -Requires: %{use_python}-argparse -%endif +%scm_common_dep %description -n obs-service-tar Creates a tar archive from local directory @@ -145,13 +171,8 @@ Creates a tar archive from local directory Summary: Creates a OBS cpio from a remote SCM resource Group: Development/Tools/Building Provides: obs-service-tar_scm:/usr/lib/obs/service/obs_scm.service -Requires: git-core -%if 0%{?suse_version} >= 1315 -Recommends: bzr -Recommends: mercurial -Recommends: subversion -%endif -Requires: obs-service-obs_scm-common = %version-%release +%scm_common_dep +%scm_dependencies %description -n obs-service-obs_scm Creates a OBS cpio from a remote SCM resource. @@ -162,14 +183,8 @@ into a tar ball during build time. %package -n obs-service-appimage Summary: Handles source downloads defined in appimage.yml files Group: Development/Tools/Building -Requires: git-core -%if 0%{?suse_version} >= 1315 -Recommends: bzr -Recommends: mercurial -Recommends: subversion -Recommends: obs-service-download_files -%endif -Requires: obs-service-obs_scm-common = %version-%release +%scm_common_dep +%scm_dependencies %description -n obs-service-appimage Experimental appimage support: This parses appimage.yml files for SCM @@ -179,14 +194,8 @@ resources and packages them. Summary: Handles source downloads defined in snapcraft.yaml files Group: Development/Tools/Building Provides: obs-service-tar_scm:/usr/lib/obs/service/snapcraft.service -Requires: git-core -%if 0%{?suse_version} >= 1315 -Recommends: bzr -Recommends: mercurial -Recommends: subversion -Recommends: obs-service-download_files -%endif -Requires: obs-service-obs_scm-common = %version-%release +%scm_common_dep +%scm_dependencies %description -n obs-service-snapcraft Experimental snapcraft support: This parses snapcraft.yaml files for SCM @@ -197,25 +206,18 @@ resources and packages them. %setup -q -n obs-service-tar_scm-%version %build -%if 0%{?fedora_version} || 0%{?rhel_version} || 0%{?centos_version} -%py_compile . -%else -%py_compile %{buildroot} -%endif %install make install DESTDIR="%{buildroot}" PREFIX="%{_prefix}" SYSCFG="%{_sysconfdir}" PYTHON="%{_bindir}/%{use_python}" %if %{with obs_scm_testsuite} -%if 0%{?suse_version} >= 1220 - +# moved conditional to the top as it helps to have it all in one place and only rely on the bcond_with here. %check # No need to run PEP8 tests here; that would require a potentially # brittle BuildRequires: python-pep8, and any style issues are already # caught by Travis CI. make %{use_test} %endif -%endif %files %defattr(-,root,root) From 689521a21e45c428b6274f3453dc6865c623da450dcb70dd548d407cb801efd7 Mon Sep 17 00:00:00 2001 From: Frank Schreiner Date: Tue, 7 May 2019 22:43:05 +0000 Subject: [PATCH 8/9] - Update to version 0.10.9.1557261720.32a1cdb: * fix encoding error for surrogates * glibc-common was used up to FC23 and RHEL7 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-tar_scm?expand=0&rev=254 --- PKGBUILD | 2 +- _servicedata | 2 +- debian.dsc | 2 +- obs-service-tar_scm-0.10.8.1556896538.0693a62.tar.gz | 3 --- obs-service-tar_scm-0.10.9.1557261720.32a1cdb.tar.gz | 3 +++ obs-service-tar_scm.changes | 7 +++++++ obs-service-tar_scm.spec | 6 +++--- 7 files changed, 16 insertions(+), 9 deletions(-) delete mode 100644 obs-service-tar_scm-0.10.8.1556896538.0693a62.tar.gz create mode 100644 obs-service-tar_scm-0.10.9.1557261720.32a1cdb.tar.gz diff --git a/PKGBUILD b/PKGBUILD index bb9ff00..becf5c0 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,5 +1,5 @@ pkgname=obs-service-tar_scm -pkgver=0.10.8.1556896538.0693a62 +pkgver=0.10.9.1557261720.32a1cdb pkgrel=0 pkgdesc="Source Service for the OpenSUSE Build Service (OBS)" arch=('any') diff --git a/_servicedata b/_servicedata index 8360418..7b9ec84 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 - 0693a62a62e90ce8fc137425a91f7842c18f5557 \ No newline at end of file + d35048f2cac019c9f452fe8fac2fe1eab5018e6e \ No newline at end of file diff --git a/debian.dsc b/debian.dsc index 6c49ccd..b736e5d 100644 --- a/debian.dsc +++ b/debian.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: obs-service-tar-scm -Version: 0.10.8.1556896538.0693a62 +Version: 0.10.9.1557261720.32a1cdb 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.8.1556896538.0693a62.tar.gz b/obs-service-tar_scm-0.10.8.1556896538.0693a62.tar.gz deleted file mode 100644 index 42557ca..0000000 --- a/obs-service-tar_scm-0.10.8.1556896538.0693a62.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c2a133af2e49f2374a5d2ac761041b6f53a96755c6a5eb5f3fb2da541f524e1f -size 67904 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 new file mode 100644 index 0000000..6ff29f5 --- /dev/null +++ b/obs-service-tar_scm-0.10.9.1557261720.32a1cdb.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1e8c0fe852cd04b5c4783f36f0636c62fa0204687d488c384aa3b40d288ebfb7 +size 67614 diff --git a/obs-service-tar_scm.changes b/obs-service-tar_scm.changes index 9a22554..f22c1dc 100644 --- a/obs-service-tar_scm.changes +++ b/obs-service-tar_scm.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue May 07 22:41:38 UTC 2019 - FSchreiner@suse.com + +- Update to version 0.10.9.1557261720.32a1cdb: + * fix encoding error for surrogates + * glibc-common was used up to FC23 and RHEL7 + ------------------------------------------------------------------- Fri May 03 15:24:40 UTC 2019 - FSchreiner@suse.com diff --git a/obs-service-tar_scm.spec b/obs-service-tar_scm.spec index 0dc7804..f7525ba 100644 --- a/obs-service-tar_scm.spec +++ b/obs-service-tar_scm.spec @@ -60,7 +60,7 @@ %define pyyaml_package PyYAML %endif -%if 0%{?fedora_version} >= 27 || 0%{?rhel_version} >= 800 || 0%{?centos_version} >= 800 +%if 0%{?fedora_version} >= 24 || 0%{?rhel_version} >= 800 || 0%{?centos_version} >= 800 %define locale_package glibc-langpack-en %else %define locale_package glibc-common @@ -90,8 +90,8 @@ Recommends: obs-service-download_files \ ######## END OF MACROS AND FUN ################################### Name: obs-service-tar_scm -%define version_unconverted 0.10.8.1556896538.0693a62 -Version: 0.10.8.1556896538.0693a62 +%define version_unconverted 0.10.9.1557261720.32a1cdb +Version: 0.10.9.1557261720.32a1cdb Release: 0 Summary: An OBS source service: create tar ball from svn/git/hg License: GPL-2.0-or-later From 5c6d6b69cbc1acf1e2522c7356a010d6426ba70dd9bcfe8740d1197124d07108 Mon Sep 17 00:00:00 2001 From: Lars Vogdt Date: Sat, 25 May 2019 13:30:31 +0000 Subject: [PATCH 9/9] Accepting request 701575 from home:juliogonzalezgil:branches:openSUSE:Tools - Require external argparse for RHEL6 OBS-URL: https://build.opensuse.org/request/show/701575 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-tar_scm?expand=0&rev=255 --- obs-service-tar_scm.changes | 5 +++++ obs-service-tar_scm.spec | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/obs-service-tar_scm.changes b/obs-service-tar_scm.changes index f22c1dc..3cf08d0 100644 --- a/obs-service-tar_scm.changes +++ b/obs-service-tar_scm.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed May 8 13:26:40 UTC 2019 - Julio González Gil + +- Require external argparse for RHEL6 + ------------------------------------------------------------------- Tue May 07 22:41:38 UTC 2019 - FSchreiner@suse.com diff --git a/obs-service-tar_scm.spec b/obs-service-tar_scm.spec index f7525ba..56655bb 100644 --- a/obs-service-tar_scm.spec +++ b/obs-service-tar_scm.spec @@ -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%{?suse_version} && 0%{?suse_version} < 1315) || (0%{?fedora_version} && 0%{?fedora_version} < 26) +%if (0%{?centos_version} == 6) || (0%{?rhel_version} == 600) || (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