diff --git a/PKGBUILD b/PKGBUILD index 8dbe1d5..f60196e 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,5 +1,5 @@ pkgname=obs-service-tar_scm -pkgver=0.8.0.1507129410.0cb2d44 +pkgver=0.9.0.1523267117.de861d8 pkgrel=0 pkgdesc="Source Service for the OpenSUSE Build Service (OBS)" arch=('any') @@ -8,7 +8,7 @@ license=('GPL3') groups=('base-devel') 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") +source=("obs-service-tar_scm-${pkgver}.tar.gz") provides=('obs-service-tar') sha256sums=('SKIP') diff --git a/_servicedata b/_servicedata index 40c4624..d9020ad 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 - 092ed79e144abbfee97fef9aebf1e93bc40ab3fa \ No newline at end of file + e6cc8b8ac6fdba7cf6fb9671d3ccc4bffb10bb0e \ No newline at end of file diff --git a/obs-service-tar_scm-0.9.0.1523267117.de861d8.tar.gz b/obs-service-tar_scm-0.9.0.1523267117.de861d8.tar.gz deleted file mode 100644 index 86b694f..0000000 --- a/obs-service-tar_scm-0.9.0.1523267117.de861d8.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5583af53cd049d7b1d7d5e41ba2782c7080d18c89d091480786892a7ae823472 -size 61887 diff --git a/obs-service-tar_scm-0.9.1.1530616709.1329314.tar.gz b/obs-service-tar_scm-0.9.1.1530616709.1329314.tar.gz new file mode 100644 index 0000000..26dcf03 --- /dev/null +++ b/obs-service-tar_scm-0.9.1.1530616709.1329314.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0e7167a3fcfe86fb0e5aec7008f8503cd337a3a2bf93dc1f134f3d6964c9bfc1 +size 62400 diff --git a/obs-service-tar_scm.changes b/obs-service-tar_scm.changes index 6a1bdb2..266a955 100644 --- a/obs-service-tar_scm.changes +++ b/obs-service-tar_scm.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Tue Jul 03 19:31:48 UTC 2018 - opensuse-packaging@opensuse.org + +- Update to version 0.9.1.1530616709.1329314: + * improve handling of corrupt git cache directories + * only do git stash save/pop if we have a non-empty working tree (#228) + * sort imports + * don't allow DEBUG_TAR_SCM to change behaviour (#240) + * add stub user docs in lieu of something proper (#238) + * [dist] fix build for distros not yet supporting Recommends tag + * Remove clone_dir if clone fails + * python-unittest2 is only required for the optional make check + * move python-unittest2 dep to test suite only part (submission by olh) + ------------------------------------------------------------------- Thu Apr 19 09:52:18 UTC 2018 - fschreiner@suse.de diff --git a/obs-service-tar_scm.spec b/obs-service-tar_scm.spec index e740b19..3ebc39d 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.9.0.1523267117.de861d8 -Version: 0.9.0.1523267117.de861d8 +%define version_unconverted 0.9.1.1530616709.1329314 +Version: 0.9.1.1530616709.1329314 Release: 0 Summary: An OBS source service: create tar ball from svn/git/hg License: GPL-2.0-or-later @@ -51,13 +51,15 @@ BuildRequires: python-PyYAML BuildRequires: python-dateutil BuildRequires: python-lxml BuildRequires: python-mock +BuildRequires: python-unittest2 %endif BuildRequires: python >= 2.6 -BuildRequires: python-unittest2 Requires: git-core +%if 0%{?suse_version} >= 1315 Recommends: bzr Recommends: mercurial Recommends: subversion +%endif Requires: obs-service-obs_scm-common = %version-%release BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch @@ -100,9 +102,11 @@ 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 %description -n obs-service-obs_scm @@ -115,9 +119,11 @@ into a tar ball during build time. 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 +%endif Requires: obs-service-obs_scm-common = %version-%release %description -n obs-service-appimage @@ -129,9 +135,11 @@ 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 +%endif Requires: obs-service-obs_scm-common = %version-%release %description -n obs-service-snapcraft