From 2e2dae25cd33ac35c37418997ac9c009963a6498972d03ca27c777d84e140264 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Wed, 11 Oct 2017 06:49:17 +0000 Subject: [PATCH 1/5] Accepting request 532991 from home:valo:branches:openSUSE:Tools Adds PKGBUILD for Archlinux OBS-URL: https://build.opensuse.org/request/show/532991 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-tar_scm?expand=0&rev=187 --- PKGBUILD | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 PKGBUILD diff --git a/PKGBUILD b/PKGBUILD new file mode 100644 index 0000000..5c61374 --- /dev/null +++ b/PKGBUILD @@ -0,0 +1,18 @@ +pkgname=obs-service-tar_scm +pkgver=0.8.0.1499787575.2419460 +pkgrel=0 +pkgdesc="Source Service for the OpenSUSE Build Service (OBS)" +arch=('any') +url="https://github.com/openSUSE/obs-service-tar_scm" +license=('GPL3') +groups=('base-devel') +depends=('python2' 'python2-yaml' 'python2-dateutil' 'git' 'bzr' 'mercurial' 'subversion' ) +source=("obs-service-tar_scm-${pkgver}.tar.gz::https://github.com/openSUSE/obs-service-tar_scm/archive/v${pkgver}.tar.gz") +provides=('obs-service-tar') +sha256sums=('SKIP') + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" PREFIX=/usr install +} + From bbea40d12d1f274533889f587a3a86166a9b67a368d1bbe9732ca09eee42ed50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Wed, 11 Oct 2017 06:50:26 +0000 Subject: [PATCH 2/5] fix fedora build OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-tar_scm?expand=0&rev=188 --- _servicedata | 2 +- ...rvice-tar_scm-0.8.0.1499787575.2419460.tar.gz | 3 --- ...rvice-tar_scm-0.8.0.1507129410.0cb2d44.tar.gz | 3 +++ obs-service-tar_scm.changes | 12 ++++++++++++ obs-service-tar_scm.spec | 16 ++++++++++++++-- 5 files changed, 30 insertions(+), 6 deletions(-) delete mode 100644 obs-service-tar_scm-0.8.0.1499787575.2419460.tar.gz create mode 100644 obs-service-tar_scm-0.8.0.1507129410.0cb2d44.tar.gz diff --git a/_servicedata b/_servicedata index 60bda89..8893f2e 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 - af556cadb955aa9872293ea8d738d60f065e592c \ No newline at end of file + 750affe3712d0fccfbc7b9cab03d278de28f5543 \ No newline at end of file diff --git a/obs-service-tar_scm-0.8.0.1499787575.2419460.tar.gz b/obs-service-tar_scm-0.8.0.1499787575.2419460.tar.gz deleted file mode 100644 index cc54310..0000000 --- a/obs-service-tar_scm-0.8.0.1499787575.2419460.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2969942d1a1e49c4aa6f26d6997acfbe2926709cdf19519f9ffcedb3eae6567d -size 61172 diff --git a/obs-service-tar_scm-0.8.0.1507129410.0cb2d44.tar.gz b/obs-service-tar_scm-0.8.0.1507129410.0cb2d44.tar.gz new file mode 100644 index 0000000..0519c80 --- /dev/null +++ b/obs-service-tar_scm-0.8.0.1507129410.0cb2d44.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:74419067039042ee3b53a122c61662fbe9bc17ffd359de70fda28bf0880c40fa +size 59576 diff --git a/obs-service-tar_scm.changes b/obs-service-tar_scm.changes index 5a30ea8..9140231 100644 --- a/obs-service-tar_scm.changes +++ b/obs-service-tar_scm.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Wed Oct 11 06:48:27 UTC 2017 - adrian@suse.de + +- Update to version 0.8.0.1507129410.0cb2d44: + * mention _none_ version string for people who need it for kiwi root archives for example + * git: Support url change + * change ordering so that latest change is on top + * also override timestamps of files in cpio + * Sort cpio file list + * [dist] fix spec file py_compile for fedora + * Sort tar file list + ------------------------------------------------------------------- Wed Jul 12 05:58:08 UTC 2017 - opensuse-packaging@opensuse.org diff --git a/obs-service-tar_scm.spec b/obs-service-tar_scm.spec index 68481b1..b1ec8b2 100644 --- a/obs-service-tar_scm.spec +++ b/obs-service-tar_scm.spec @@ -19,8 +19,8 @@ %bcond_without obs_scm_testsuite Name: obs-service-tar_scm -%define version_unconverted 0.8.0.1499787575.2419460 -Version: 0.8.0.1499787575.2419460 +%define version_unconverted 0.8.0.1507129410.0cb2d44 +Version: 0.8.0.1507129410.0cb2d44 Release: 0 Summary: An OBS source service: create tar ball from svn/git/hg License: GPL-2.0+ @@ -35,6 +35,14 @@ BuildRequires: bzr BuildRequires: git-core BuildRequires: mercurial %if 0%{?fedora_version} || 0%{?rhel_version} || 0%{?centos_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 \ +%{-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 \ +} + BuildRequires: PyYAML %else BuildRequires: python-PyYAML @@ -135,7 +143,11 @@ 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}" From 403be7cf509daef05c6a03466563193ecd8262fe25ebc6e89f1e74cde241181e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Wed, 11 Oct 2017 06:58:51 +0000 Subject: [PATCH 3/5] fix version for Arch OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-tar_scm?expand=0&rev=189 --- PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PKGBUILD b/PKGBUILD index 5c61374..decf0eb 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,5 +1,5 @@ pkgname=obs-service-tar_scm -pkgver=0.8.0.1499787575.2419460 +pkgver=0.8.0.1507129410.0cb2d44 pkgrel=0 pkgdesc="Source Service for the OpenSUSE Build Service (OBS)" arch=('any') From 06be79dda18e78edbe40a44ca901dfde226cdec724070425c87bd50063c2ccc3 Mon Sep 17 00:00:00 2001 From: Marcus Rueckert Date: Wed, 11 Oct 2017 12:49:36 +0000 Subject: [PATCH 4/5] Accepting request 533403 from home:valo:branches:openSUSE:Tools Fixes missing dependencies OBS-URL: https://build.opensuse.org/request/show/533403 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-tar_scm?expand=0&rev=190 --- PKGBUILD | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/PKGBUILD b/PKGBUILD index decf0eb..971901c 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -6,7 +6,8 @@ arch=('any') url="https://github.com/openSUSE/obs-service-tar_scm" license=('GPL3') groups=('base-devel') -depends=('python2' 'python2-yaml' 'python2-dateutil' 'git' 'bzr' 'mercurial' 'subversion' ) +makedepends=('python2' 'python-yaml' 'python-dateutil' 'python-lxml' 'python-mock' 'python2-unittest2' 'bzr' 'git' 'mercurial' 'subversion' ) +depends=('python2' 'python2-yaml' 'python2-dateutil' 'python-argparse' 'cpio' 'git' 'bzr' 'mercurial' 'subversion' ) source=("obs-service-tar_scm-${pkgver}.tar.gz::https://github.com/openSUSE/obs-service-tar_scm/archive/v${pkgver}.tar.gz") provides=('obs-service-tar') sha256sums=('SKIP') From c3c8cfae4d2b144682c5b35e78f3dbbbc68675932a13bb4b2213eac0b7a67b1c Mon Sep 17 00:00:00 2001 From: Frank Schreiner Date: Thu, 12 Oct 2017 08:10:35 +0000 Subject: [PATCH 5/5] Accepting request 533426 from home:valo:branches:openSUSE:Tools Fixes the makedepends array so it builds with python2 packages OBS-URL: https://build.opensuse.org/request/show/533426 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-tar_scm?expand=0&rev=191 --- PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/PKGBUILD b/PKGBUILD index 971901c..8dbe1d5 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -6,8 +6,8 @@ arch=('any') url="https://github.com/openSUSE/obs-service-tar_scm" license=('GPL3') groups=('base-devel') -makedepends=('python2' 'python-yaml' 'python-dateutil' 'python-lxml' 'python-mock' 'python2-unittest2' 'bzr' 'git' 'mercurial' 'subversion' ) -depends=('python2' 'python2-yaml' 'python2-dateutil' 'python-argparse' 'cpio' 'git' 'bzr' 'mercurial' 'subversion' ) +makedepends=('python2' 'python2-yaml' 'python2-dateutil' 'python2-lxml' 'python2-mock' 'python2-unittest2' 'bzr' 'git' 'mercurial' 'subversion' ) +depends=('python2' 'python2-yaml' 'python2-dateutil' 'python2-argparse' 'cpio' 'git' 'bzr' 'mercurial' 'subversion' ) source=("obs-service-tar_scm-${pkgver}.tar.gz::https://github.com/openSUSE/obs-service-tar_scm/archive/v${pkgver}.tar.gz") provides=('obs-service-tar') sha256sums=('SKIP')