From 506ba3ac8805e4c0b3ec6c53bc7350ca1be92dee9fbbbb000ac9c73596397391 Mon Sep 17 00:00:00 2001 From: Frank Schreiner Date: Wed, 26 Feb 2020 09:46:29 +0000 Subject: [PATCH 1/9] - Update to version 0.10.12.1582709176.d82a692: * fix lost commits on local run * fix breakage when working on a specific tag/commit * git-lfs should not be mandatory as tar_scm will never use it * Allow use of git-lfs only when running obs_scm * Document _none_ special version in .service * Version cleanup: don't strip hyphen when building Debian packages * Add new archive option for Debian: git-buildpackage * call git stash with LANG=C * improved comment for method get_changesrevision * Add debian package dep to git-lfs * Implement git LFS blobs retrieval OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-tar_scm?expand=0&rev=268 --- PKGBUILD | 2 +- _servicedata | 2 +- debian.dsc | 2 +- ...e-tar_scm-0.10.11.1579870213.888e79c.tar.gz | 3 --- ...e-tar_scm-0.10.12.1582709176.d82a692.tar.gz | 3 +++ obs-service-tar_scm.changes | 16 ++++++++++++++++ obs-service-tar_scm.spec | 18 ++++++++++++++++-- 7 files changed, 38 insertions(+), 8 deletions(-) delete mode 100644 obs-service-tar_scm-0.10.11.1579870213.888e79c.tar.gz create mode 100644 obs-service-tar_scm-0.10.12.1582709176.d82a692.tar.gz diff --git a/PKGBUILD b/PKGBUILD index a1aa254..3e72de7 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,5 +1,5 @@ pkgname=obs-service-tar_scm -pkgver=0.10.11.1579870213.888e79c +pkgver=0.10.12.1582709176.d82a692 pkgrel=0 pkgdesc="Source Service for the OpenSUSE Build Service (OBS)" arch=('any') diff --git a/_servicedata b/_servicedata index 0579c1b..651e2f6 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 - 888e79c03fa4a8b3aef514176ae77c3dcdcba991 \ No newline at end of file + 323b533327b27b2b4ec56c6639b755dbe905eac5 \ No newline at end of file diff --git a/debian.dsc b/debian.dsc index 09afa45..f8efca7 100644 --- a/debian.dsc +++ b/debian.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: obs-service-tar-scm -Version: 0.10.11.1579870213.888e79c +Version: 0.10.12.1582709176.d82a692 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.11.1579870213.888e79c.tar.gz b/obs-service-tar_scm-0.10.11.1579870213.888e79c.tar.gz deleted file mode 100644 index 0601b6f..0000000 --- a/obs-service-tar_scm-0.10.11.1579870213.888e79c.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:54dd4d51002a97b290e59fea8b96dcd6ad87cda03510eb77c4b0062a7c9c956b -size 68792 diff --git a/obs-service-tar_scm-0.10.12.1582709176.d82a692.tar.gz b/obs-service-tar_scm-0.10.12.1582709176.d82a692.tar.gz new file mode 100644 index 0000000..1fcb4d7 --- /dev/null +++ b/obs-service-tar_scm-0.10.12.1582709176.d82a692.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cf4468c8d7b1071e8e4d8d543cec424ff40880e919c3c97639f0c5d6170a100f +size 71905 diff --git a/obs-service-tar_scm.changes b/obs-service-tar_scm.changes index 5391a42..9a910c2 100644 --- a/obs-service-tar_scm.changes +++ b/obs-service-tar_scm.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Wed Feb 26 09:45:28 UTC 2020 - FSchreiner@suse.com + +- Update to version 0.10.12.1582709176.d82a692: + * fix lost commits on local run + * fix breakage when working on a specific tag/commit + * git-lfs should not be mandatory as tar_scm will never use it + * Allow use of git-lfs only when running obs_scm + * Document _none_ special version in .service + * Version cleanup: don't strip hyphen when building Debian packages + * Add new archive option for Debian: git-buildpackage + * call git stash with LANG=C + * improved comment for method get_changesrevision + * Add debian package dep to git-lfs + * Implement git LFS blobs retrieval + ------------------------------------------------------------------- Fri Jan 24 15:46:08 UTC 2020 - FSchreiner@suse.com diff --git a/obs-service-tar_scm.spec b/obs-service-tar_scm.spec index d913fec..f0c09a8 100644 --- a/obs-service-tar_scm.spec +++ b/obs-service-tar_scm.spec @@ -90,8 +90,8 @@ Recommends: obs-service-download_files \ ######## END OF MACROS AND FUN ################################### Name: obs-service-tar_scm -%define version_unconverted 0.10.11.1579870213.888e79c -Version: 0.10.11.1579870213.888e79c +%define version_unconverted 0.10.12.1582709176.d82a692 +Version: 0.10.12.1582709176.d82a692 Release: 0 Summary: An OBS source service: create tar ball from svn/git/hg License: GPL-2.0-or-later @@ -203,6 +203,16 @@ Provides: obs-service-tar_scm:/usr/lib/obs/service/snapcraft.service Experimental snapcraft support: This parses snapcraft.yaml files for SCM resources and packages them. +%package -n obs-service-gbp +Summary: Creates Debian source artefacts from a Git repository +Group: Development/Tools/Building +Requires: git-buildpackage >= 0.6.0 +Requires: obs-service-obs_scm-common = %version-%release +Provides: obs-service-tar_scm:/usr/lib/obs/service/obs_gbp.service + +%description -n obs-service-gbp +Debian git-buildpackage workflow support: uses gbp to create Debian +source artefacts (.dsc, .origin.tar.gz and .debian.tar.gz if non-native). %prep %setup -q -n obs-service-tar_scm-%version @@ -253,4 +263,8 @@ make %{use_test} %defattr(-,root,root) %{_prefix}/lib/obs/service/snapcraft* +%files -n obs-service-gbp +%defattr(-,root,root) +%{_prefix}/lib/obs/service/obs_gbp* + %changelog From b56453a2c6debbdea3ef9c4f6a44529be210b1cfc04755f415825640e60963e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Fri, 28 Feb 2020 14:56:09 +0000 Subject: [PATCH 2/9] update OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-tar_scm?expand=0&rev=269 --- PKGBUILD | 2 +- _servicedata | 2 +- debian.dsc | 2 +- obs-service-tar_scm-0.10.12.1582709176.d82a692.tar.gz | 3 --- obs-service-tar_scm-0.10.13.1582901608.a1c02c1.tar.gz | 3 +++ obs-service-tar_scm.changes | 7 +++++++ obs-service-tar_scm.spec | 4 ++-- 7 files changed, 15 insertions(+), 8 deletions(-) delete mode 100644 obs-service-tar_scm-0.10.12.1582709176.d82a692.tar.gz create mode 100644 obs-service-tar_scm-0.10.13.1582901608.a1c02c1.tar.gz diff --git a/PKGBUILD b/PKGBUILD index 3e72de7..057ff26 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,5 +1,5 @@ pkgname=obs-service-tar_scm -pkgver=0.10.12.1582709176.d82a692 +pkgver=0.10.13.1582901608.a1c02c1 pkgrel=0 pkgdesc="Source Service for the OpenSUSE Build Service (OBS)" arch=('any') diff --git a/_servicedata b/_servicedata index 651e2f6..86a3715 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 - 323b533327b27b2b4ec56c6639b755dbe905eac5 \ No newline at end of file + 5589afb1c47ec5b7a2686766925910878d983f35 \ No newline at end of file diff --git a/debian.dsc b/debian.dsc index f8efca7..bcca136 100644 --- a/debian.dsc +++ b/debian.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: obs-service-tar-scm -Version: 0.10.12.1582709176.d82a692 +Version: 0.10.13.1582901608.a1c02c1 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.12.1582709176.d82a692.tar.gz b/obs-service-tar_scm-0.10.12.1582709176.d82a692.tar.gz deleted file mode 100644 index 1fcb4d7..0000000 --- a/obs-service-tar_scm-0.10.12.1582709176.d82a692.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cf4468c8d7b1071e8e4d8d543cec424ff40880e919c3c97639f0c5d6170a100f -size 71905 diff --git a/obs-service-tar_scm-0.10.13.1582901608.a1c02c1.tar.gz b/obs-service-tar_scm-0.10.13.1582901608.a1c02c1.tar.gz new file mode 100644 index 0000000..ff85e4d --- /dev/null +++ b/obs-service-tar_scm-0.10.13.1582901608.a1c02c1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:537a1a63e1412b41b23010e6e399c3afb6aa3136c6f488aa05752c6c4eb1c1b8 +size 71374 diff --git a/obs-service-tar_scm.changes b/obs-service-tar_scm.changes index 9a910c2..88cc190 100644 --- a/obs-service-tar_scm.changes +++ b/obs-service-tar_scm.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Feb 28 14:50:17 UTC 2020 - adrian@suse.de + +- Update to version 0.10.12.1582901608.a1c02c1: + * simplify osc git update case a lot + * fixing revision usage on a commit hash + ------------------------------------------------------------------- Wed Feb 26 09:45:28 UTC 2020 - FSchreiner@suse.com diff --git a/obs-service-tar_scm.spec b/obs-service-tar_scm.spec index f0c09a8..b1627a8 100644 --- a/obs-service-tar_scm.spec +++ b/obs-service-tar_scm.spec @@ -90,8 +90,8 @@ Recommends: obs-service-download_files \ ######## END OF MACROS AND FUN ################################### Name: obs-service-tar_scm -%define version_unconverted 0.10.12.1582709176.d82a692 -Version: 0.10.12.1582709176.d82a692 +%define version_unconverted 0.10.13.1582901608.a1c02c1 +Version: 0.10.13.1582901608.a1c02c1 Release: 0 Summary: An OBS source service: create tar ball from svn/git/hg License: GPL-2.0-or-later From 2c13f1815d4221966ced924e1b7cd86dccefd89a7dd9d759a21a5c5a8d021a97 Mon Sep 17 00:00:00 2001 From: Frank Schreiner Date: Tue, 10 Mar 2020 15:25:21 +0000 Subject: [PATCH 3/9] - Update to version 0.10.14.1583853599.ccbb399: * support server side credentials for SCM repos OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-tar_scm?expand=0&rev=270 --- PKGBUILD | 2 +- _servicedata | 2 +- debian.dsc | 2 +- obs-service-tar_scm-0.10.13.1582901608.a1c02c1.tar.gz | 3 --- obs-service-tar_scm-0.10.14.1583853599.ccbb399.tar.gz | 3 +++ obs-service-tar_scm.changes | 6 ++++++ obs-service-tar_scm.spec | 7 +++++-- 7 files changed, 17 insertions(+), 8 deletions(-) delete mode 100644 obs-service-tar_scm-0.10.13.1582901608.a1c02c1.tar.gz create mode 100644 obs-service-tar_scm-0.10.14.1583853599.ccbb399.tar.gz diff --git a/PKGBUILD b/PKGBUILD index 057ff26..5af0a58 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,5 +1,5 @@ pkgname=obs-service-tar_scm -pkgver=0.10.13.1582901608.a1c02c1 +pkgver=0.10.14.1583853599.ccbb399 pkgrel=0 pkgdesc="Source Service for the OpenSUSE Build Service (OBS)" arch=('any') diff --git a/_servicedata b/_servicedata index 86a3715..f4e2e68 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 - 5589afb1c47ec5b7a2686766925910878d983f35 \ No newline at end of file + 74f6960ff5ae38c90a3b4ef6eb6ebcec206277a5 \ No newline at end of file diff --git a/debian.dsc b/debian.dsc index bcca136..f0668b3 100644 --- a/debian.dsc +++ b/debian.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: obs-service-tar-scm -Version: 0.10.13.1582901608.a1c02c1 +Version: 0.10.14.1583853599.ccbb399 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.13.1582901608.a1c02c1.tar.gz b/obs-service-tar_scm-0.10.13.1582901608.a1c02c1.tar.gz deleted file mode 100644 index ff85e4d..0000000 --- a/obs-service-tar_scm-0.10.13.1582901608.a1c02c1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:537a1a63e1412b41b23010e6e399c3afb6aa3136c6f488aa05752c6c4eb1c1b8 -size 71374 diff --git a/obs-service-tar_scm-0.10.14.1583853599.ccbb399.tar.gz b/obs-service-tar_scm-0.10.14.1583853599.ccbb399.tar.gz new file mode 100644 index 0000000..db2b478 --- /dev/null +++ b/obs-service-tar_scm-0.10.14.1583853599.ccbb399.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:42e865929bc224cc8559718aacd73f35468e857ab3f914886b42a8002cf57f3e +size 72840 diff --git a/obs-service-tar_scm.changes b/obs-service-tar_scm.changes index 88cc190..0586a9b 100644 --- a/obs-service-tar_scm.changes +++ b/obs-service-tar_scm.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Mar 10 15:22:18 UTC 2020 - FSchreiner@suse.com + +- Update to version 0.10.14.1583853599.ccbb399: + * support server side credentials for SCM repos + ------------------------------------------------------------------- Fri Feb 28 14:50:17 UTC 2020 - adrian@suse.de diff --git a/obs-service-tar_scm.spec b/obs-service-tar_scm.spec index b1627a8..4aa29dd 100644 --- a/obs-service-tar_scm.spec +++ b/obs-service-tar_scm.spec @@ -90,8 +90,8 @@ Recommends: obs-service-download_files \ ######## END OF MACROS AND FUN ################################### Name: obs-service-tar_scm -%define version_unconverted 0.10.13.1582901608.a1c02c1 -Version: 0.10.13.1582901608.a1c02c1 +%define version_unconverted 0.10.14.1583853599.ccbb399 +Version: 0.10.14.1583853599.ccbb399 Release: 0 Summary: An OBS source service: create tar ball from svn/git/hg License: GPL-2.0-or-later @@ -120,6 +120,8 @@ BuildRequires: %{pyyaml_package} BuildRequires: %{use_python}-argparse %endif BuildRequires: %{use_python}-dateutil +BuildRequires: %{use_python}-keyring +BuildRequires: %{use_python}-keyrings.alt # Why do we need this? we dont use it as runtime requires later BuildRequires: %{use_python}-lxml @@ -243,6 +245,7 @@ make %{use_test} %{_prefix}/lib/obs/service/tar_scm %dir %{_sysconfdir}/obs %dir %{_sysconfdir}/obs/services +%attr(-,obsservicerun,obsrun) %dir %{_sysconfdir}/obs/services/tar_scm.d %config(noreplace) %{_sysconfdir}/obs/services/* %files -n obs-service-tar From 11cb706f75aad11b20837636524847272089ae796cbcc020ce51bbed28ac9d9c Mon Sep 17 00:00:00 2001 From: Frank Schreiner Date: Mon, 16 Mar 2020 10:46:16 +0000 Subject: [PATCH 4/9] disabled keyring builddeps OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-tar_scm?expand=0&rev=271 --- 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 4aa29dd..da6eb3e 100644 --- a/obs-service-tar_scm.spec +++ b/obs-service-tar_scm.spec @@ -120,8 +120,10 @@ BuildRequires: %{pyyaml_package} BuildRequires: %{use_python}-argparse %endif BuildRequires: %{use_python}-dateutil +%if 0 BuildRequires: %{use_python}-keyring BuildRequires: %{use_python}-keyrings.alt +%endif # Why do we need this? we dont use it as runtime requires later BuildRequires: %{use_python}-lxml From b73dfcaa9a2b5f303d46a0a40da2f60b011ea471dd40a92847609e2d1a8b5f68 Mon Sep 17 00:00:00 2001 From: Frank Schreiner Date: Mon, 16 Mar 2020 11:16:47 +0000 Subject: [PATCH 5/9] * removed BuildRequires for python-keyring and python-keyring.alt * enable gbp based on repo macro config OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-tar_scm?expand=0&rev=272 --- obs-service-tar_scm.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/obs-service-tar_scm.spec b/obs-service-tar_scm.spec index da6eb3e..5175260 100644 --- a/obs-service-tar_scm.spec +++ b/obs-service-tar_scm.spec @@ -120,10 +120,6 @@ BuildRequires: %{pyyaml_package} BuildRequires: %{use_python}-argparse %endif BuildRequires: %{use_python}-dateutil -%if 0 -BuildRequires: %{use_python}-keyring -BuildRequires: %{use_python}-keyrings.alt -%endif # Why do we need this? we dont use it as runtime requires later BuildRequires: %{use_python}-lxml @@ -207,6 +203,7 @@ Provides: obs-service-tar_scm:/usr/lib/obs/service/snapcraft.service Experimental snapcraft support: This parses snapcraft.yaml files for SCM resources and packages them. +%if 0%{?enable_gbp} %package -n obs-service-gbp Summary: Creates Debian source artefacts from a Git repository Group: Development/Tools/Building @@ -217,6 +214,7 @@ Provides: obs-service-tar_scm:/usr/lib/obs/service/obs_gbp.service %description -n obs-service-gbp Debian git-buildpackage workflow support: uses gbp to create Debian source artefacts (.dsc, .origin.tar.gz and .debian.tar.gz if non-native). +%endif %prep %setup -q -n obs-service-tar_scm-%version @@ -268,8 +266,10 @@ make %{use_test} %defattr(-,root,root) %{_prefix}/lib/obs/service/snapcraft* +%if 0%{?enable_gbp} %files -n obs-service-gbp %defattr(-,root,root) %{_prefix}/lib/obs/service/obs_gbp* +%endif %changelog From 345eaa4fc26897ec47257fdfee16250dfecd39c72cb6bd497a6fea8ae74c1da3 Mon Sep 17 00:00:00 2001 From: Frank Schreiner Date: Mon, 16 Mar 2020 17:41:18 +0000 Subject: [PATCH 6/9] - Update to version 0.10.1.1584368026.9e8b88b: * [dist] don't install gbp files by default * [dist] remove python-keyring* from dependcies * [dist] make gbp switchable in spec file OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-tar_scm?expand=0&rev=273 --- PKGBUILD | 2 +- _servicedata | 6 ++++-- debian.dsc | 2 +- obs-service-tar_scm-0.10.14.1583853599.ccbb399.tar.gz | 3 --- obs-service-tar_scm-0.10.14.1584368026.9e8b88b.tar.gz | 3 +++ obs-service-tar_scm.changes | 8 ++++++++ obs-service-tar_scm.spec | 4 ++-- 7 files changed, 19 insertions(+), 9 deletions(-) delete mode 100644 obs-service-tar_scm-0.10.14.1583853599.ccbb399.tar.gz create mode 100644 obs-service-tar_scm-0.10.14.1584368026.9e8b88b.tar.gz diff --git a/PKGBUILD b/PKGBUILD index 5af0a58..55748a7 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,5 +1,5 @@ pkgname=obs-service-tar_scm -pkgver=0.10.14.1583853599.ccbb399 +pkgver=0.10.14.1584368026.9e8b88b pkgrel=0 pkgdesc="Source Service for the OpenSUSE Build Service (OBS)" arch=('any') diff --git a/_servicedata b/_servicedata index f4e2e68..3e62c69 100644 --- a/_servicedata +++ b/_servicedata @@ -1,8 +1,10 @@ git://github.com/adrianschroeter/obs-service-tar_scm.git - d44d677cf006d48b261f5e2054ba2126bed64ae1 + d44d677cf006d48b261f5e2054ba2126bed64ae1 + git://github.com/M0ses/obs-service-tar_scm.git - b742dfc0e12755cf306a95439494b5bdde7c0c61 + 9e8b88b088778c44db56781e6a908a0e82e27cf2 + git://github.com/openSUSE/obs-service-tar_scm.git 74f6960ff5ae38c90a3b4ef6eb6ebcec206277a5 \ No newline at end of file diff --git a/debian.dsc b/debian.dsc index f0668b3..a43df4c 100644 --- a/debian.dsc +++ b/debian.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: obs-service-tar-scm -Version: 0.10.14.1583853599.ccbb399 +Version: 0.10.14.1584368026.9e8b88b 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.14.1583853599.ccbb399.tar.gz b/obs-service-tar_scm-0.10.14.1583853599.ccbb399.tar.gz deleted file mode 100644 index db2b478..0000000 --- a/obs-service-tar_scm-0.10.14.1583853599.ccbb399.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:42e865929bc224cc8559718aacd73f35468e857ab3f914886b42a8002cf57f3e -size 72840 diff --git a/obs-service-tar_scm-0.10.14.1584368026.9e8b88b.tar.gz b/obs-service-tar_scm-0.10.14.1584368026.9e8b88b.tar.gz new file mode 100644 index 0000000..9e4f872 --- /dev/null +++ b/obs-service-tar_scm-0.10.14.1584368026.9e8b88b.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c54f537d25aeba9fc68ab3f4e45945b322d9d8b5b809d651755fa79e59087d9a +size 72846 diff --git a/obs-service-tar_scm.changes b/obs-service-tar_scm.changes index 0586a9b..4ba5449 100644 --- a/obs-service-tar_scm.changes +++ b/obs-service-tar_scm.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Mon Mar 16 14:19:14 UTC 2020 - FSchreiner@suse.com + +- Update to version 0.10.1.1584368026.9e8b88b: + * [dist] don't install gbp files by default + * [dist] remove python-keyring* from dependcies + * [dist] make gbp switchable in spec file + ------------------------------------------------------------------- Tue Mar 10 15:22:18 UTC 2020 - FSchreiner@suse.com diff --git a/obs-service-tar_scm.spec b/obs-service-tar_scm.spec index 5175260..3e59e33 100644 --- a/obs-service-tar_scm.spec +++ b/obs-service-tar_scm.spec @@ -90,8 +90,8 @@ Recommends: obs-service-download_files \ ######## END OF MACROS AND FUN ################################### Name: obs-service-tar_scm -%define version_unconverted 0.10.14.1583853599.ccbb399 -Version: 0.10.14.1583853599.ccbb399 +%define version_unconverted 0.10.14.1584368026.9e8b88b +Version: 0.10.14.1584368026.9e8b88b Release: 0 Summary: An OBS source service: create tar ball from svn/git/hg License: GPL-2.0-or-later From 4a1ac9dcfa9b7975a97d9f6d29f516d60d0df65699c85b7df1a570cbeca18333 Mon Sep 17 00:00:00 2001 From: Frank Schreiner Date: Tue, 17 Mar 2020 09:55:37 +0000 Subject: [PATCH 7/9] testing new version OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-tar_scm?expand=0&rev=274 --- PKGBUILD | 2 +- debian.dsc | 2 +- obs-service-tar_scm-0.10.14.1584368026.9e8b88b.tar.gz | 3 --- obs-service-tar_scm-0.10.14.1584435160.d912143.tar.gz | 3 +++ obs-service-tar_scm.changes | 8 -------- obs-service-tar_scm.spec | 4 ++-- 6 files changed, 7 insertions(+), 15 deletions(-) delete mode 100644 obs-service-tar_scm-0.10.14.1584368026.9e8b88b.tar.gz create mode 100644 obs-service-tar_scm-0.10.14.1584435160.d912143.tar.gz diff --git a/PKGBUILD b/PKGBUILD index 55748a7..be39291 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,5 +1,5 @@ pkgname=obs-service-tar_scm -pkgver=0.10.14.1584368026.9e8b88b +pkgver=0.10.14.1584435160.d912143 pkgrel=0 pkgdesc="Source Service for the OpenSUSE Build Service (OBS)" arch=('any') diff --git a/debian.dsc b/debian.dsc index a43df4c..7b0e931 100644 --- a/debian.dsc +++ b/debian.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: obs-service-tar-scm -Version: 0.10.14.1584368026.9e8b88b +Version: 0.10.14.1584435160.d912143 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.14.1584368026.9e8b88b.tar.gz b/obs-service-tar_scm-0.10.14.1584368026.9e8b88b.tar.gz deleted file mode 100644 index 9e4f872..0000000 --- a/obs-service-tar_scm-0.10.14.1584368026.9e8b88b.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c54f537d25aeba9fc68ab3f4e45945b322d9d8b5b809d651755fa79e59087d9a -size 72846 diff --git a/obs-service-tar_scm-0.10.14.1584435160.d912143.tar.gz b/obs-service-tar_scm-0.10.14.1584435160.d912143.tar.gz new file mode 100644 index 0000000..74582ff --- /dev/null +++ b/obs-service-tar_scm-0.10.14.1584435160.d912143.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a3130ef09100157f5d3518574c87f7415e8de23d9f358d5210d0856d1775f8b0 +size 73131 diff --git a/obs-service-tar_scm.changes b/obs-service-tar_scm.changes index 4ba5449..0586a9b 100644 --- a/obs-service-tar_scm.changes +++ b/obs-service-tar_scm.changes @@ -1,11 +1,3 @@ -------------------------------------------------------------------- -Mon Mar 16 14:19:14 UTC 2020 - FSchreiner@suse.com - -- Update to version 0.10.1.1584368026.9e8b88b: - * [dist] don't install gbp files by default - * [dist] remove python-keyring* from dependcies - * [dist] make gbp switchable in spec file - ------------------------------------------------------------------- Tue Mar 10 15:22:18 UTC 2020 - FSchreiner@suse.com diff --git a/obs-service-tar_scm.spec b/obs-service-tar_scm.spec index 3e59e33..c0ad463 100644 --- a/obs-service-tar_scm.spec +++ b/obs-service-tar_scm.spec @@ -90,8 +90,8 @@ Recommends: obs-service-download_files \ ######## END OF MACROS AND FUN ################################### Name: obs-service-tar_scm -%define version_unconverted 0.10.14.1584368026.9e8b88b -Version: 0.10.14.1584368026.9e8b88b +%define version_unconverted 0.10.14.1584435160.d912143 +Version: 0.10.14.1584435160.d912143 Release: 0 Summary: An OBS source service: create tar ball from svn/git/hg License: GPL-2.0-or-later From add44096a802fee95cd9969566ab4a687cd45931959ab2bf53fdf402dc2b0da0 Mon Sep 17 00:00:00 2001 From: Frank Schreiner Date: Tue, 17 Mar 2020 16:45:36 +0000 Subject: [PATCH 8/9] - Update to version 0.10.14.1584435160.d912143: * [dist] don't install gbp files by default * [dist] remove python-keyring* from dependcies * [dist] make gbp switchable in spec file OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-tar_scm?expand=0&rev=275 --- _servicedata | 2 +- obs-service-tar_scm.changes | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/_servicedata b/_servicedata index 3e62c69..a5c2ab3 100644 --- a/_servicedata +++ b/_servicedata @@ -7,4 +7,4 @@ 9e8b88b088778c44db56781e6a908a0e82e27cf2 git://github.com/openSUSE/obs-service-tar_scm.git - 74f6960ff5ae38c90a3b4ef6eb6ebcec206277a5 \ No newline at end of file + d912143a87161e3c306c021f8e122140068a1dc6 \ No newline at end of file diff --git a/obs-service-tar_scm.changes b/obs-service-tar_scm.changes index 0586a9b..0784385 100644 --- a/obs-service-tar_scm.changes +++ b/obs-service-tar_scm.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Tue Mar 17 16:44:31 UTC 2020 - FSchreiner@suse.com + +- Update to version 0.10.14.1584435160.d912143: + * [dist] don't install gbp files by default + * [dist] remove python-keyring* from dependcies + * [dist] make gbp switchable in spec file + ------------------------------------------------------------------- Tue Mar 10 15:22:18 UTC 2020 - FSchreiner@suse.com From b66c88ad1ec332ddaf62332cdebae324c08be0f125e92896b777e8be6956ef62 Mon Sep 17 00:00:00 2001 From: Frank Schreiner Date: Tue, 17 Mar 2020 16:47:12 +0000 Subject: [PATCH 9/9] update after merge OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-tar_scm?expand=0&rev=276 --- PKGBUILD | 2 +- debian.dsc | 2 +- obs-service-tar_scm-0.10.14.1584435160.d912143.tar.gz | 3 --- obs-service-tar_scm-0.10.14.1584463383.06b0455.tar.gz | 3 +++ obs-service-tar_scm.spec | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) delete mode 100644 obs-service-tar_scm-0.10.14.1584435160.d912143.tar.gz create mode 100644 obs-service-tar_scm-0.10.14.1584463383.06b0455.tar.gz diff --git a/PKGBUILD b/PKGBUILD index be39291..44509a4 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,5 +1,5 @@ pkgname=obs-service-tar_scm -pkgver=0.10.14.1584435160.d912143 +pkgver=0.10.14.1584463383.06b0455 pkgrel=0 pkgdesc="Source Service for the OpenSUSE Build Service (OBS)" arch=('any') diff --git a/debian.dsc b/debian.dsc index 7b0e931..293c063 100644 --- a/debian.dsc +++ b/debian.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: obs-service-tar-scm -Version: 0.10.14.1584435160.d912143 +Version: 0.10.14.1584463383.06b0455 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.14.1584435160.d912143.tar.gz b/obs-service-tar_scm-0.10.14.1584435160.d912143.tar.gz deleted file mode 100644 index 74582ff..0000000 --- a/obs-service-tar_scm-0.10.14.1584435160.d912143.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a3130ef09100157f5d3518574c87f7415e8de23d9f358d5210d0856d1775f8b0 -size 73131 diff --git a/obs-service-tar_scm-0.10.14.1584463383.06b0455.tar.gz b/obs-service-tar_scm-0.10.14.1584463383.06b0455.tar.gz new file mode 100644 index 0000000..f0b7e22 --- /dev/null +++ b/obs-service-tar_scm-0.10.14.1584463383.06b0455.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:956ee7ba6d057abe8ae869d9dc43700353856da5ac95cdda1043affe07d0a025 +size 72864 diff --git a/obs-service-tar_scm.spec b/obs-service-tar_scm.spec index c0ad463..40751eb 100644 --- a/obs-service-tar_scm.spec +++ b/obs-service-tar_scm.spec @@ -90,8 +90,8 @@ Recommends: obs-service-download_files \ ######## END OF MACROS AND FUN ################################### Name: obs-service-tar_scm -%define version_unconverted 0.10.14.1584435160.d912143 -Version: 0.10.14.1584435160.d912143 +%define version_unconverted 0.10.14.1584463383.06b0455 +Version: 0.10.14.1584463383.06b0455 Release: 0 Summary: An OBS source service: create tar ball from svn/git/hg License: GPL-2.0-or-later