From 2e44aea917cb2c2b13dc72c3aaa0f5ed23694b3ba1529879f01e6c56f3ae0655 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Fri, 24 Jul 2015 08:46:03 +0000 Subject: [PATCH 01/18] Accepting request 313394 from home:hiberis:branches:openSUSE:Tools OBS-URL: https://build.opensuse.org/request/show/313394 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-tar_scm?expand=0&rev=90 --- ...tion-disable-running-mercurial-tests.patch | 45 +++++++++++++++++++ debian.dsc | 2 +- debian.series | 1 + obs-service-tar_scm.changes | 5 +++ 4 files changed, 52 insertions(+), 1 deletion(-) create mode 100644 0001-Debianization-disable-running-mercurial-tests.patch create mode 100644 debian.series diff --git a/0001-Debianization-disable-running-mercurial-tests.patch b/0001-Debianization-disable-running-mercurial-tests.patch new file mode 100644 index 0000000..14eca12 --- /dev/null +++ b/0001-Debianization-disable-running-mercurial-tests.patch @@ -0,0 +1,45 @@ +From c2c2e7bbaea6d224ad5742f47fb4baab63365e6d Mon Sep 17 00:00:00 2001 +From: Hib Eris +Date: Mon, 22 Jun 2015 15:23:30 +0200 +Subject: [PATCH] Debianization: disable running mercurial tests + +This is needed to make this package build on the Ubuntu +distributions at build.opensuse.org. These distributions +provide only Ubuntu's main repository, which does not contain +the mercurial package. The mercurial package is only needed +to run mercurial tests, thus disabeling mercurial tests allows +building the package. +--- + debian/control | 2 +- + tests/test.py | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/debian/control b/debian/control +index a45fa04..6f3551d 100644 +--- a/debian/control ++++ b/debian/control +@@ -2,7 +2,7 @@ Source: obs-service-tar-scm + Section: devel + Priority: extra + Maintainer: Daniel Gollub +-Build-Depends: debhelper (>= 8.0.0), bzr, git, mercurial, pep8, python (>= 2.6), python-argparse | python (>= 2.7), python-unittest2, subversion ++Build-Depends: debhelper (>= 8.0.0), bzr, git, pep8, python (>= 2.6), python-argparse | python (>= 2.7), python-unittest2, subversion + Standards-Version: 3.9.3 + Homepage: https://github.com/openSUSE/obs-service-tar_scm + X-Python-Version: >= 2.6 +diff --git a/tests/test.py b/tests/test.py +index 3814e71..ca480b7 100755 +--- a/tests/test.py ++++ b/tests/test.py +@@ -23,7 +23,7 @@ if __name__ == '__main__': + # temporarily comment out any of these: + SvnTests, + GitTests, +- HgTests, ++ #HgTests, + BzrTests, + UnitTestCases + ] +-- +2.1.4 + diff --git a/debian.dsc b/debian.dsc index edbf03d..1c65e8f 100644 --- a/debian.dsc +++ b/debian.dsc @@ -5,4 +5,4 @@ Binary: obs-service-tar-scm Maintainer: Adrian Schroeter Architecture: all Standards-Version: 3.7.2 -Build-Depends: debhelper (>= 7), bzr, git, mercurial, python (>= 2.6), python-argparse | python (>= 2.7), subversion, python-unittest2, pep8, python-lxml +Build-Depends: debhelper (>= 7), bzr, git, python (>= 2.6), python-argparse | python (>= 2.7), subversion, python-unittest2, pep8, python-lxml diff --git a/debian.series b/debian.series new file mode 100644 index 0000000..30c8064 --- /dev/null +++ b/debian.series @@ -0,0 +1 @@ +0001-Debianization-disable-running-mercurial-tests.patch -p1 diff --git a/obs-service-tar_scm.changes b/obs-service-tar_scm.changes index ffb0adf..079862e 100644 --- a/obs-service-tar_scm.changes +++ b/obs-service-tar_scm.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jun 24 08:07:29 UTC 2015 - hib@hiberis.nl + +- Fix build on Ubuntu by disabling mercurial tests + ------------------------------------------------------------------- Mon Jun 22 14:41:27 UTC 2015 - hib@hiberis.nl From fe93f763f8e846c83e6a8edfd74cf9fc226c93285739fa6ae1c8c138691e0e97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Fri, 24 Jul 2015 09:23:11 +0000 Subject: [PATCH 02/18] Accepting request 317637 from home:bmwiedemann:branches:openSUSE:Tools - only require git-core to not pull in git-web and gitk OBS-URL: https://build.opensuse.org/request/show/317637 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-tar_scm?expand=0&rev=91 --- obs-service-tar_scm.changes | 5 +++++ obs-service-tar_scm.spec | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/obs-service-tar_scm.changes b/obs-service-tar_scm.changes index 079862e..90858c8 100644 --- a/obs-service-tar_scm.changes +++ b/obs-service-tar_scm.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jul 8 14:04:53 UTC 2015 - bwiedemann@suse.com + +- only require git-core to not pull in git-web and gitk + ------------------------------------------------------------------- Wed Jun 24 08:07:29 UTC 2015 - hib@hiberis.nl diff --git a/obs-service-tar_scm.spec b/obs-service-tar_scm.spec index b538b9f..f7062b3 100644 --- a/obs-service-tar_scm.spec +++ b/obs-service-tar_scm.spec @@ -27,13 +27,13 @@ Group: Development/Tools/Building Url: https://github.com/openSUSE/obs-service-%{service} Source: %{name}-%{version}.tar.gz BuildRequires: bzr -BuildRequires: git +BuildRequires: git-core BuildRequires: mercurial BuildRequires: python >= 2.6 BuildRequires: python-lxml BuildRequires: subversion Requires: bzr -Requires: git +Requires: git-core Requires: mercurial Requires: subversion BuildRoot: %{_tmppath}/%{name}-%{version}-build From b281f4406c2e0c78f8e1720d77a44a394354385f3ee89c8a74cd8e1bc95eb2fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Fri, 8 Apr 2016 07:10:41 +0000 Subject: [PATCH 03/18] osc copypac from project:home:adrianSuSE package:obs-service-tar_scm revision:24, using keep-link OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-tar_scm?expand=0&rev=92 --- _service | 4 +-- _servicedata | 8 ++--- ...ce-tar_scm-0.5.3.1434983686.0b4ce51.tar.gz | 3 -- ...ar_scm-0.6.0~pre.1460098798.dda5411.tar.gz | 3 ++ obs-service-tar_scm.changes | 20 +++++++++++++ obs-service-tar_scm.spec | 29 +++++++++++++++---- 6 files changed, 52 insertions(+), 15 deletions(-) delete mode 100644 obs-service-tar_scm-0.5.3.1434983686.0b4ce51.tar.gz create mode 100644 obs-service-tar_scm-0.6.0~pre.1460098798.dda5411.tar.gz diff --git a/_service b/_service index 9fec967..58692c6 100644 --- a/_service +++ b/_service @@ -1,10 +1,10 @@ - git://github.com/openSUSE/obs-service-tar_scm.git + git://github.com/adrianschroeter/obs-service-tar_scm.git git .git git-master - 0.5.3.%ct.%h + 0.6.0~pre.%ct.%h master enable diff --git a/_servicedata b/_servicedata index 518f85a..83da57b 100644 --- a/_servicedata +++ b/_servicedata @@ -1,6 +1,4 @@ - - git://github.com/openSUSE/obs-service-tar_scm.git - 0b4ce51db91837c27e69912a2e7ec56fb0c863e4 - - \ No newline at end of file + + git://github.com/adrianschroeter/obs-service-tar_scm.git + dda541172e20614678d199c737022c643c5e6d7f \ No newline at end of file diff --git a/obs-service-tar_scm-0.5.3.1434983686.0b4ce51.tar.gz b/obs-service-tar_scm-0.5.3.1434983686.0b4ce51.tar.gz deleted file mode 100644 index 7f2b078..0000000 --- a/obs-service-tar_scm-0.5.3.1434983686.0b4ce51.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:78e2a89a7f072169ca9eba47a56e86742273c3ed973defb127914845116f2690 -size 29882 diff --git a/obs-service-tar_scm-0.6.0~pre.1460098798.dda5411.tar.gz b/obs-service-tar_scm-0.6.0~pre.1460098798.dda5411.tar.gz new file mode 100644 index 0000000..4f55303 --- /dev/null +++ b/obs-service-tar_scm-0.6.0~pre.1460098798.dda5411.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5449718f61ef78ee2b1cb671f53c4282b7f7040da8c6f290849aace2956f4f5d +size 32887 diff --git a/obs-service-tar_scm.changes b/obs-service-tar_scm.changes index 90858c8..1c0612a 100644 --- a/obs-service-tar_scm.changes +++ b/obs-service-tar_scm.changes @@ -1,3 +1,23 @@ +------------------------------------------------------------------- +Fri Apr 08 07:00:48 UTC 2016 - adrian@suse.de + +- Update to version 0.6.0~pre.1460098798.dda5411: + + make obsinfo parameter for tar service optional + +------------------------------------------------------------------- +Thu Apr 07 09:21:55 UTC 2016 - adrian@suse.de + +- Update to version 0.6.0.1460017418.4e4b2d6: + + Correct error message about lack of git tags + + GNUmakefile: Use default python in $PATH unless it is a python 3. + + fix TESTING.md link in CONTRIBUTING.md + + Use correct level 2 bullet point (*) + + very first obs_scm implementation + + allow extracting of (spec) files + + allow to include local changes when using "obs_scm" service via local osc commands. +- building this pre-version currently from private branch + as discussed with Adam + ------------------------------------------------------------------- Wed Jul 8 14:04:53 UTC 2015 - bwiedemann@suse.com diff --git a/obs-service-tar_scm.spec b/obs-service-tar_scm.spec index f7062b3..6050930 100644 --- a/obs-service-tar_scm.spec +++ b/obs-service-tar_scm.spec @@ -1,7 +1,7 @@ # -# spec file for package obs-service-tar_scm +# spec file for package obs-service # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,15 +17,27 @@ %define service tar_scm +%define seperate_build 0 + +%if "%seperate_build" == "1" +%define version_unconverted 0.6.0~pre.1460098798.dda5411 + +Name: obs-service-obs_scm +%else +%define version_unconverted 0.6.0~pre.1460098798.dda5411 Name: obs-service-%{service} -Version: 0.5.3.1434983686.0b4ce51 +#Obsoletes: obs-service-obs_scm +Provides: obs-service-obs_scm = %version-%release +%endif +Provides: obs-service-tar = %version-%release +Version: 0.6.0~pre.1460098798.dda5411 Release: 0 Summary: An OBS source service: checkout or update a tar ball from svn/git/hg License: GPL-2.0+ Group: Development/Tools/Building Url: https://github.com/openSUSE/obs-service-%{service} -Source: %{name}-%{version}.tar.gz +Source: obs-service-tar_scm-%{version}.tar.gz BuildRequires: bzr BuildRequires: git-core BuildRequires: mercurial @@ -45,13 +57,20 @@ This is a source service for openSUSE Build Service. It supports downloading from svn, git, hg and bzr repositories. %prep -%setup -q +%setup -q -n obs-service-tar_scm-%version %build %install make install DESTDIR="%{buildroot}" PREFIX="%{_prefix}" SYSCFG="%{_sysconfdir}" +%if "%seperate_build" == "1" +rm %{buildroot}/%{_prefix}/lib/obs/service/tar_scm.service +rm %{buildroot}/%{_prefix}/lib/obs/service/obs_scm +mv %{buildroot}/%{_prefix}/lib/obs/service/{tar,obs}_scm +ln -sf obs_scm %{buildroot}/%{_prefix}/lib/obs/service/tar +%endif + %if 0%{?suse_version} >= 1220 %check # No need to run PEP8 tests here; that would require a potentially From cdfeacef108dbd5f0b373e762e1157a7e47ea97007bd0628a294a3d6e290061c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Mon, 11 Apr 2016 12:20:49 +0000 Subject: [PATCH 04/18] go OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-tar_scm?expand=0&rev=93 --- _servicedata | 2 +- obs-service-tar_scm-0.6.0~pre.1460098798.dda5411.tar.gz | 3 --- obs-service-tar_scm-0.6.0~pre.1460377105.35a4ea4.tar.gz | 3 +++ obs-service-tar_scm.changes | 6 ++++++ obs-service-tar_scm.spec | 6 +++--- 5 files changed, 13 insertions(+), 7 deletions(-) delete mode 100644 obs-service-tar_scm-0.6.0~pre.1460098798.dda5411.tar.gz create mode 100644 obs-service-tar_scm-0.6.0~pre.1460377105.35a4ea4.tar.gz diff --git a/_servicedata b/_servicedata index 83da57b..fc6b277 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ git://github.com/adrianschroeter/obs-service-tar_scm.git - dda541172e20614678d199c737022c643c5e6d7f \ No newline at end of file + 35a4ea4d5615f5fc0011249d25602f14149c2b16 \ No newline at end of file diff --git a/obs-service-tar_scm-0.6.0~pre.1460098798.dda5411.tar.gz b/obs-service-tar_scm-0.6.0~pre.1460098798.dda5411.tar.gz deleted file mode 100644 index 4f55303..0000000 --- a/obs-service-tar_scm-0.6.0~pre.1460098798.dda5411.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5449718f61ef78ee2b1cb671f53c4282b7f7040da8c6f290849aace2956f4f5d -size 32887 diff --git a/obs-service-tar_scm-0.6.0~pre.1460377105.35a4ea4.tar.gz b/obs-service-tar_scm-0.6.0~pre.1460377105.35a4ea4.tar.gz new file mode 100644 index 0000000..ee9da74 --- /dev/null +++ b/obs-service-tar_scm-0.6.0~pre.1460377105.35a4ea4.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d4d0ecffa464bfb8905f0631c94352581f96c24efccdb73401418cc5ae5dcb06 +size 32741 diff --git a/obs-service-tar_scm.changes b/obs-service-tar_scm.changes index 1c0612a..698905a 100644 --- a/obs-service-tar_scm.changes +++ b/obs-service-tar_scm.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Apr 11 12:19:54 UTC 2016 - adrian@suse.de + +- Update to version 0.6.0~pre.1460377105.35a4ea4: + * support filtering on creation of cpio archives + ------------------------------------------------------------------- Fri Apr 08 07:00:48 UTC 2016 - adrian@suse.de diff --git a/obs-service-tar_scm.spec b/obs-service-tar_scm.spec index 6050930..ebe9041 100644 --- a/obs-service-tar_scm.spec +++ b/obs-service-tar_scm.spec @@ -20,18 +20,18 @@ %define seperate_build 0 %if "%seperate_build" == "1" -%define version_unconverted 0.6.0~pre.1460098798.dda5411 +%define version_unconverted 0.6.0~pre.1460377105.35a4ea4 Name: obs-service-obs_scm %else -%define version_unconverted 0.6.0~pre.1460098798.dda5411 +%define version_unconverted 0.6.0~pre.1460377105.35a4ea4 Name: obs-service-%{service} #Obsoletes: obs-service-obs_scm Provides: obs-service-obs_scm = %version-%release %endif Provides: obs-service-tar = %version-%release -Version: 0.6.0~pre.1460098798.dda5411 +Version: 0.6.0~pre.1460377105.35a4ea4 Release: 0 Summary: An OBS source service: checkout or update a tar ball from svn/git/hg License: GPL-2.0+ From 829336f22aec643e30893fb85c8a1f781dac7fab457c391f74e4b5b10a54e2e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Mon, 11 Apr 2016 13:28:04 +0000 Subject: [PATCH 05/18] merge OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-tar_scm?expand=0&rev=94 --- _servicedata | 2 +- obs-service-tar_scm-0.6.0~pre.1460377105.35a4ea4.tar.gz | 3 --- obs-service-tar_scm-0.6.0~pre.1460381029.dfac505.tar.gz | 3 +++ obs-service-tar_scm.spec | 6 +++--- 4 files changed, 7 insertions(+), 7 deletions(-) delete mode 100644 obs-service-tar_scm-0.6.0~pre.1460377105.35a4ea4.tar.gz create mode 100644 obs-service-tar_scm-0.6.0~pre.1460381029.dfac505.tar.gz diff --git a/_servicedata b/_servicedata index fc6b277..d5b5900 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ git://github.com/adrianschroeter/obs-service-tar_scm.git - 35a4ea4d5615f5fc0011249d25602f14149c2b16 \ No newline at end of file + dfac5053fd8be9721dc4946f47e9ae720974e3b9 \ No newline at end of file diff --git a/obs-service-tar_scm-0.6.0~pre.1460377105.35a4ea4.tar.gz b/obs-service-tar_scm-0.6.0~pre.1460377105.35a4ea4.tar.gz deleted file mode 100644 index ee9da74..0000000 --- a/obs-service-tar_scm-0.6.0~pre.1460377105.35a4ea4.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d4d0ecffa464bfb8905f0631c94352581f96c24efccdb73401418cc5ae5dcb06 -size 32741 diff --git a/obs-service-tar_scm-0.6.0~pre.1460381029.dfac505.tar.gz b/obs-service-tar_scm-0.6.0~pre.1460381029.dfac505.tar.gz new file mode 100644 index 0000000..f1a6011 --- /dev/null +++ b/obs-service-tar_scm-0.6.0~pre.1460381029.dfac505.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ab4c5adea50e96deb9a1ec83266ff7aa09539d88c81bb02deb4c5dd20aa11cc4 +size 33004 diff --git a/obs-service-tar_scm.spec b/obs-service-tar_scm.spec index ebe9041..85b2b4c 100644 --- a/obs-service-tar_scm.spec +++ b/obs-service-tar_scm.spec @@ -20,18 +20,18 @@ %define seperate_build 0 %if "%seperate_build" == "1" -%define version_unconverted 0.6.0~pre.1460377105.35a4ea4 +%define version_unconverted 0.6.0~pre.1460381029.dfac505 Name: obs-service-obs_scm %else -%define version_unconverted 0.6.0~pre.1460377105.35a4ea4 +%define version_unconverted 0.6.0~pre.1460381029.dfac505 Name: obs-service-%{service} #Obsoletes: obs-service-obs_scm Provides: obs-service-obs_scm = %version-%release %endif Provides: obs-service-tar = %version-%release -Version: 0.6.0~pre.1460377105.35a4ea4 +Version: 0.6.0~pre.1460381029.dfac505 Release: 0 Summary: An OBS source service: checkout or update a tar ball from svn/git/hg License: GPL-2.0+ From fbfd1017f76a3edc09a841018580f1bf0a302bae35939948fb41382d68a3a4bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Tue, 12 Apr 2016 07:04:31 +0000 Subject: [PATCH 06/18] update OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-tar_scm?expand=0&rev=95 --- _servicedata | 2 +- obs-service-tar_scm-0.6.0~pre.1460381029.dfac505.tar.gz | 3 --- obs-service-tar_scm-0.6.0~pre.1460444532.e4babfe.tar.gz | 3 +++ obs-service-tar_scm.spec | 6 +++--- 4 files changed, 7 insertions(+), 7 deletions(-) delete mode 100644 obs-service-tar_scm-0.6.0~pre.1460381029.dfac505.tar.gz create mode 100644 obs-service-tar_scm-0.6.0~pre.1460444532.e4babfe.tar.gz diff --git a/_servicedata b/_servicedata index d5b5900..72b2c0a 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ git://github.com/adrianschroeter/obs-service-tar_scm.git - dfac5053fd8be9721dc4946f47e9ae720974e3b9 \ No newline at end of file + e4babfeb862d210a9aeec9cca1fa808c95b96f39 \ No newline at end of file diff --git a/obs-service-tar_scm-0.6.0~pre.1460381029.dfac505.tar.gz b/obs-service-tar_scm-0.6.0~pre.1460381029.dfac505.tar.gz deleted file mode 100644 index f1a6011..0000000 --- a/obs-service-tar_scm-0.6.0~pre.1460381029.dfac505.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ab4c5adea50e96deb9a1ec83266ff7aa09539d88c81bb02deb4c5dd20aa11cc4 -size 33004 diff --git a/obs-service-tar_scm-0.6.0~pre.1460444532.e4babfe.tar.gz b/obs-service-tar_scm-0.6.0~pre.1460444532.e4babfe.tar.gz new file mode 100644 index 0000000..cabc33f --- /dev/null +++ b/obs-service-tar_scm-0.6.0~pre.1460444532.e4babfe.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:00a153b333d4909210a2f6e38e54de7af41de7bf004ac6482e5fbb8a41aa75b0 +size 33069 diff --git a/obs-service-tar_scm.spec b/obs-service-tar_scm.spec index 85b2b4c..21a23ba 100644 --- a/obs-service-tar_scm.spec +++ b/obs-service-tar_scm.spec @@ -20,18 +20,18 @@ %define seperate_build 0 %if "%seperate_build" == "1" -%define version_unconverted 0.6.0~pre.1460381029.dfac505 +%define version_unconverted 0.6.0~pre.1460444532.e4babfe Name: obs-service-obs_scm %else -%define version_unconverted 0.6.0~pre.1460381029.dfac505 +%define version_unconverted 0.6.0~pre.1460444532.e4babfe Name: obs-service-%{service} #Obsoletes: obs-service-obs_scm Provides: obs-service-obs_scm = %version-%release %endif Provides: obs-service-tar = %version-%release -Version: 0.6.0~pre.1460381029.dfac505 +Version: 0.6.0~pre.1460444532.e4babfe Release: 0 Summary: An OBS source service: checkout or update a tar ball from svn/git/hg License: GPL-2.0+ From 605efc5e2998f7949da0368d1afcb2070d9de0abbfa38298d1e970b522165830 Mon Sep 17 00:00:00 2001 From: Lars Vogdt Date: Tue, 12 Apr 2016 09:46:34 +0000 Subject: [PATCH 07/18] Accepting request 387558 from home:pluskalm:branches:openSUSE:Tools - Correctly reference patch in previous entry * 0001-Debianization-disable-running-mercurial-tests.patch OBS-URL: https://build.opensuse.org/request/show/387558 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-tar_scm?expand=0&rev=96 --- obs-service-tar_scm.changes | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/obs-service-tar_scm.changes b/obs-service-tar_scm.changes index 698905a..2de25f8 100644 --- a/obs-service-tar_scm.changes +++ b/obs-service-tar_scm.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Apr 11 15:09:29 UTC 2016 - mpluskal@suse.com + +- Correctly reference patch in previous entry + ------------------------------------------------------------------- Mon Apr 11 12:19:54 UTC 2016 - adrian@suse.de @@ -33,6 +38,7 @@ Wed Jul 8 14:04:53 UTC 2015 - bwiedemann@suse.com Wed Jun 24 08:07:29 UTC 2015 - hib@hiberis.nl - Fix build on Ubuntu by disabling mercurial tests + * 0001-Debianization-disable-running-mercurial-tests.patch ------------------------------------------------------------------- Mon Jun 22 14:41:27 UTC 2015 - hib@hiberis.nl From d53bb3a6f55c1acb4d376c263cc88b1586953131d0d2dd4c04221e9c4c0e1ad6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Fri, 15 Apr 2016 08:17:23 +0000 Subject: [PATCH 08/18] fix OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-tar_scm?expand=0&rev=97 --- obs-service-tar_scm-0.6.0~pre.1460444532.e4babfe.tar.gz | 4 ++-- obs-service-tar_scm.changes | 5 +++++ obs-service-tar_scm.spec | 3 +++ 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/obs-service-tar_scm-0.6.0~pre.1460444532.e4babfe.tar.gz b/obs-service-tar_scm-0.6.0~pre.1460444532.e4babfe.tar.gz index cabc33f..d0f8bbe 100644 --- a/obs-service-tar_scm-0.6.0~pre.1460444532.e4babfe.tar.gz +++ b/obs-service-tar_scm-0.6.0~pre.1460444532.e4babfe.tar.gz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:00a153b333d4909210a2f6e38e54de7af41de7bf004ac6482e5fbb8a41aa75b0 -size 33069 +oid sha256:b5ff7e085776e5d58d3ad19bd42d821b52c253688e4c26e960e6dc689388a94a +size 33014 diff --git a/obs-service-tar_scm.changes b/obs-service-tar_scm.changes index 2de25f8..b89ba12 100644 --- a/obs-service-tar_scm.changes +++ b/obs-service-tar_scm.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Apr 15 08:16:32 UTC 2016 - adrian@suse.de + +- fix dependency on SLE 11 to python-argparse + ------------------------------------------------------------------- Mon Apr 11 15:09:29 UTC 2016 - mpluskal@suse.com diff --git a/obs-service-tar_scm.spec b/obs-service-tar_scm.spec index 21a23ba..8403275 100644 --- a/obs-service-tar_scm.spec +++ b/obs-service-tar_scm.spec @@ -48,6 +48,9 @@ Requires: bzr Requires: git-core Requires: mercurial Requires: subversion +%if 0%{?suse_version} < 1315 +Requires: python-argparse +%endif BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch From f9f061224b6518c5cecdf403079fab67aee7df9eb7b2a8e1fe4a5260ab467b99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Sun, 24 Apr 2016 11:27:11 +0000 Subject: [PATCH 09/18] fix debian naming OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-tar_scm?expand=0&rev=98 --- debian.dsc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian.dsc b/debian.dsc index 1c65e8f..f4e932d 100644 --- a/debian.dsc +++ b/debian.dsc @@ -1,7 +1,7 @@ Format: 1.0 -Source: obs-service-tar-scm +Source: obs-service-tar_scm Version: 0.5.0 -Binary: obs-service-tar-scm +Binary: obs-service-tar_scm Maintainer: Adrian Schroeter Architecture: all Standards-Version: 3.7.2 From 53800f05c324648dc705f8e88eb3a56db5facc4f8077696eafb2653faffa9cbf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Sun, 24 Apr 2016 11:35:11 +0000 Subject: [PATCH 10/18] add extra names OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-tar_scm?expand=0&rev=99 --- debian.dsc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/debian.dsc b/debian.dsc index f4e932d..6aa7057 100644 --- a/debian.dsc +++ b/debian.dsc @@ -1,6 +1,8 @@ Format: 1.0 Source: obs-service-tar_scm Version: 0.5.0 +Binary: obs-service-obs_scm +Binary: obs-service-tar Binary: obs-service-tar_scm Maintainer: Adrian Schroeter Architecture: all From 63a75df16ce7173cba311a678d440dad89a0a4dfd715e9c8118068bca5b2eef1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Tue, 26 Apr 2016 12:18:47 +0000 Subject: [PATCH 11/18] provides OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-tar_scm?expand=0&rev=100 --- debian.dsc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian.dsc b/debian.dsc index 6aa7057..3dcc70f 100644 --- a/debian.dsc +++ b/debian.dsc @@ -1,8 +1,8 @@ Format: 1.0 Source: obs-service-tar_scm Version: 0.5.0 -Binary: obs-service-obs_scm -Binary: obs-service-tar +Provides: obs-service-obs_scm +Provides: obs-service-tar Binary: obs-service-tar_scm Maintainer: Adrian Schroeter Architecture: all From 10ab85e1d74e892901db115323c65475e02e73e4db8aac8bb1a70d1fd59e443b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Tue, 26 Apr 2016 12:24:38 +0000 Subject: [PATCH 12/18] fix OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-tar_scm?expand=0&rev=101 --- debian.dsc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/debian.dsc b/debian.dsc index 3dcc70f..5a6a65c 100644 --- a/debian.dsc +++ b/debian.dsc @@ -1,8 +1,7 @@ Format: 1.0 Source: obs-service-tar_scm Version: 0.5.0 -Provides: obs-service-obs_scm -Provides: obs-service-tar +Provides: obs-service-obs_scm, obs-service-tar Binary: obs-service-tar_scm Maintainer: Adrian Schroeter Architecture: all From 430b9b31232bb42eeb3ae86b9ccb78dee296640144b3584c3db36d0c1821b839 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Tue, 26 Apr 2016 13:18:36 +0000 Subject: [PATCH 13/18] update OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-tar_scm?expand=0&rev=102 --- _servicedata | 2 +- obs-service-tar_scm-0.6.0~pre.1460444532.e4babfe.tar.gz | 3 --- obs-service-tar_scm-0.6.0~pre.1461676636.d4d3313.tar.gz | 3 +++ obs-service-tar_scm.changes | 5 +++++ obs-service-tar_scm.spec | 6 +++--- 5 files changed, 12 insertions(+), 7 deletions(-) delete mode 100644 obs-service-tar_scm-0.6.0~pre.1460444532.e4babfe.tar.gz create mode 100644 obs-service-tar_scm-0.6.0~pre.1461676636.d4d3313.tar.gz diff --git a/_servicedata b/_servicedata index 72b2c0a..51befaf 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ git://github.com/adrianschroeter/obs-service-tar_scm.git - e4babfeb862d210a9aeec9cca1fa808c95b96f39 \ No newline at end of file + d4d3313dc0b2c5de08422c7e92639d7a8c822458 \ No newline at end of file diff --git a/obs-service-tar_scm-0.6.0~pre.1460444532.e4babfe.tar.gz b/obs-service-tar_scm-0.6.0~pre.1460444532.e4babfe.tar.gz deleted file mode 100644 index d0f8bbe..0000000 --- a/obs-service-tar_scm-0.6.0~pre.1460444532.e4babfe.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b5ff7e085776e5d58d3ad19bd42d821b52c253688e4c26e960e6dc689388a94a -size 33014 diff --git a/obs-service-tar_scm-0.6.0~pre.1461676636.d4d3313.tar.gz b/obs-service-tar_scm-0.6.0~pre.1461676636.d4d3313.tar.gz new file mode 100644 index 0000000..017b04e --- /dev/null +++ b/obs-service-tar_scm-0.6.0~pre.1461676636.d4d3313.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:78075ece3982ea99943c19ac31ef55fd797cf5c78dbaf429401c41656581547b +size 32983 diff --git a/obs-service-tar_scm.changes b/obs-service-tar_scm.changes index b89ba12..9c316eb 100644 --- a/obs-service-tar_scm.changes +++ b/obs-service-tar_scm.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Apr 26 13:17:44 UTC 2016 - adrian@suse.de + +- add debian provides + ------------------------------------------------------------------- Fri Apr 15 08:16:32 UTC 2016 - adrian@suse.de diff --git a/obs-service-tar_scm.spec b/obs-service-tar_scm.spec index 8403275..eb5365b 100644 --- a/obs-service-tar_scm.spec +++ b/obs-service-tar_scm.spec @@ -20,18 +20,18 @@ %define seperate_build 0 %if "%seperate_build" == "1" -%define version_unconverted 0.6.0~pre.1460444532.e4babfe +%define version_unconverted 0.6.0~pre.1461676636.d4d3313 Name: obs-service-obs_scm %else -%define version_unconverted 0.6.0~pre.1460444532.e4babfe +%define version_unconverted 0.6.0~pre.1461676636.d4d3313 Name: obs-service-%{service} #Obsoletes: obs-service-obs_scm Provides: obs-service-obs_scm = %version-%release %endif Provides: obs-service-tar = %version-%release -Version: 0.6.0~pre.1460444532.e4babfe +Version: 0.6.0~pre.1461676636.d4d3313 Release: 0 Summary: An OBS source service: checkout or update a tar ball from svn/git/hg License: GPL-2.0+ From cb9d146cba283033d7d9a545d3f614492d73534a1b43223f9495b550f94973b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Tue, 26 Apr 2016 13:49:25 +0000 Subject: [PATCH 14/18] go OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-tar_scm?expand=0&rev=103 --- _servicedata | 2 +- ...vice-tar_scm-0.6.0~pre.1461676636.d4d3313.tar.gz | 3 --- ...vice-tar_scm-0.6.0~pre.1461678268.e8b5d73.tar.gz | 3 +++ obs-service-tar_scm.changes | 13 +++++++++++++ obs-service-tar_scm.spec | 6 +++--- 5 files changed, 20 insertions(+), 7 deletions(-) delete mode 100644 obs-service-tar_scm-0.6.0~pre.1461676636.d4d3313.tar.gz create mode 100644 obs-service-tar_scm-0.6.0~pre.1461678268.e8b5d73.tar.gz diff --git a/_servicedata b/_servicedata index 51befaf..0bdef7f 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ git://github.com/adrianschroeter/obs-service-tar_scm.git - d4d3313dc0b2c5de08422c7e92639d7a8c822458 \ No newline at end of file + e8b5d7354ae76c03e94dc4ad5bd9f8a17a959181 \ No newline at end of file diff --git a/obs-service-tar_scm-0.6.0~pre.1461676636.d4d3313.tar.gz b/obs-service-tar_scm-0.6.0~pre.1461676636.d4d3313.tar.gz deleted file mode 100644 index 017b04e..0000000 --- a/obs-service-tar_scm-0.6.0~pre.1461676636.d4d3313.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:78075ece3982ea99943c19ac31ef55fd797cf5c78dbaf429401c41656581547b -size 32983 diff --git a/obs-service-tar_scm-0.6.0~pre.1461678268.e8b5d73.tar.gz b/obs-service-tar_scm-0.6.0~pre.1461678268.e8b5d73.tar.gz new file mode 100644 index 0000000..71a9678 --- /dev/null +++ b/obs-service-tar_scm-0.6.0~pre.1461678268.e8b5d73.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:718ec8e21471920a59b640c71678ad7197319691697ee052b875747a41955860 +size 33093 diff --git a/obs-service-tar_scm.changes b/obs-service-tar_scm.changes index 9c316eb..1a7a728 100644 --- a/obs-service-tar_scm.changes +++ b/obs-service-tar_scm.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Tue Apr 26 13:44:48 UTC 2016 - adrian@suse.de + +- Update to version 0.6.0~pre.1461678268.e8b5d73: + * fix TESTING.md link in CONTRIBUTING.md + * Use correct level 2 bullet point (*) + * very first obs_scm implementation + * allow extracting of (spec) files + * allow to include local changes when using "obs_scm" service via local osc commands. + * make obsinfo parameter for tar service optional + * support filtering on creation of cpio archives + * - add debian provides + ------------------------------------------------------------------- Tue Apr 26 13:17:44 UTC 2016 - adrian@suse.de diff --git a/obs-service-tar_scm.spec b/obs-service-tar_scm.spec index eb5365b..b09040a 100644 --- a/obs-service-tar_scm.spec +++ b/obs-service-tar_scm.spec @@ -20,18 +20,18 @@ %define seperate_build 0 %if "%seperate_build" == "1" -%define version_unconverted 0.6.0~pre.1461676636.d4d3313 +%define version_unconverted 0.6.0~pre.1461678268.e8b5d73 Name: obs-service-obs_scm %else -%define version_unconverted 0.6.0~pre.1461676636.d4d3313 +%define version_unconverted 0.6.0~pre.1461678268.e8b5d73 Name: obs-service-%{service} #Obsoletes: obs-service-obs_scm Provides: obs-service-obs_scm = %version-%release %endif Provides: obs-service-tar = %version-%release -Version: 0.6.0~pre.1461676636.d4d3313 +Version: 0.6.0~pre.1461678268.e8b5d73 Release: 0 Summary: An OBS source service: checkout or update a tar ball from svn/git/hg License: GPL-2.0+ From c7b4a2055bd2d3f14faf6d575e1a6846c14cc835d21c020b6cacaded37642a49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Tue, 26 Apr 2016 14:32:40 +0000 Subject: [PATCH 15/18] update OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-tar_scm?expand=0&rev=104 --- _servicedata | 2 +- obs-service-tar_scm.changes | 13 +++++++++++++ obs-service-tar_scm.spec | 6 +++--- 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/_servicedata b/_servicedata index 0bdef7f..e4d2ce2 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ git://github.com/adrianschroeter/obs-service-tar_scm.git - e8b5d7354ae76c03e94dc4ad5bd9f8a17a959181 \ No newline at end of file + 57c0bab02cbb6090d85f05e2b06ba9b1471176d9 \ No newline at end of file diff --git a/obs-service-tar_scm.changes b/obs-service-tar_scm.changes index 1a7a728..bfcf051 100644 --- a/obs-service-tar_scm.changes +++ b/obs-service-tar_scm.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Tue Apr 26 14:32:07 UTC 2016 - adrian@suse.de + +- Update to version 0.6.0~pre.1461681073.57c0bab: + * fix TESTING.md link in CONTRIBUTING.md + * Use correct level 2 bullet point (*) + * very first obs_scm implementation + * allow extracting of (spec) files + * allow to include local changes when using "obs_scm" service via local osc commands. + * make obsinfo parameter for tar service optional + * support filtering on creation of cpio archives + * - add debian provides + ------------------------------------------------------------------- Tue Apr 26 13:44:48 UTC 2016 - adrian@suse.de diff --git a/obs-service-tar_scm.spec b/obs-service-tar_scm.spec index b09040a..521148f 100644 --- a/obs-service-tar_scm.spec +++ b/obs-service-tar_scm.spec @@ -20,18 +20,18 @@ %define seperate_build 0 %if "%seperate_build" == "1" -%define version_unconverted 0.6.0~pre.1461678268.e8b5d73 +%define version_unconverted 0.6.0~pre.1461681073.57c0bab Name: obs-service-obs_scm %else -%define version_unconverted 0.6.0~pre.1461678268.e8b5d73 +%define version_unconverted 0.6.0~pre.1461681073.57c0bab Name: obs-service-%{service} #Obsoletes: obs-service-obs_scm Provides: obs-service-obs_scm = %version-%release %endif Provides: obs-service-tar = %version-%release -Version: 0.6.0~pre.1461678268.e8b5d73 +Version: 0.6.0~pre.1461681073.57c0bab Release: 0 Summary: An OBS source service: checkout or update a tar ball from svn/git/hg License: GPL-2.0+ From fa23b62e517c0bd3f5cb3445c533e11a53c7252fcdc5f2e112e17006e8d328d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Tue, 26 Apr 2016 14:32:52 +0000 Subject: [PATCH 16/18] fix changes OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-tar_scm?expand=0&rev=105 --- obs-service-tar_scm.changes | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/obs-service-tar_scm.changes b/obs-service-tar_scm.changes index bfcf051..1a7a728 100644 --- a/obs-service-tar_scm.changes +++ b/obs-service-tar_scm.changes @@ -1,16 +1,3 @@ -------------------------------------------------------------------- -Tue Apr 26 14:32:07 UTC 2016 - adrian@suse.de - -- Update to version 0.6.0~pre.1461681073.57c0bab: - * fix TESTING.md link in CONTRIBUTING.md - * Use correct level 2 bullet point (*) - * very first obs_scm implementation - * allow extracting of (spec) files - * allow to include local changes when using "obs_scm" service via local osc commands. - * make obsinfo parameter for tar service optional - * support filtering on creation of cpio archives - * - add debian provides - ------------------------------------------------------------------- Tue Apr 26 13:44:48 UTC 2016 - adrian@suse.de From 170ac532d2dabaddcc1cb6afab8f7a979630307fcbf1f879248b3c11c8a6ccc3 Mon Sep 17 00:00:00 2001 From: Frank Schreiner Date: Wed, 27 Apr 2016 22:55:29 +0000 Subject: [PATCH 17/18] added new upstream sources OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-tar_scm?expand=0&rev=106 --- obs-service-tar_scm-0.6.0~pre.1461678268.e8b5d73.tar.gz | 3 --- obs-service-tar_scm-0.6.0~pre.1461681073.57c0bab.tar.gz | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-) delete mode 100644 obs-service-tar_scm-0.6.0~pre.1461678268.e8b5d73.tar.gz create mode 100644 obs-service-tar_scm-0.6.0~pre.1461681073.57c0bab.tar.gz diff --git a/obs-service-tar_scm-0.6.0~pre.1461678268.e8b5d73.tar.gz b/obs-service-tar_scm-0.6.0~pre.1461678268.e8b5d73.tar.gz deleted file mode 100644 index 71a9678..0000000 --- a/obs-service-tar_scm-0.6.0~pre.1461678268.e8b5d73.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:718ec8e21471920a59b640c71678ad7197319691697ee052b875747a41955860 -size 33093 diff --git a/obs-service-tar_scm-0.6.0~pre.1461681073.57c0bab.tar.gz b/obs-service-tar_scm-0.6.0~pre.1461681073.57c0bab.tar.gz new file mode 100644 index 0000000..56a028f --- /dev/null +++ b/obs-service-tar_scm-0.6.0~pre.1461681073.57c0bab.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:df1b479406f570bac0c1ca94b719856eae5caf15821dfb568b7c8c67a16ea04b +size 32819 From 90f9bf66a9cb10a0ea4cf8daa7933faf2811d50384ab7303d90d03dc1630fbb1 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Fri, 20 May 2016 05:52:54 +0000 Subject: [PATCH 18/18] Accepting request 388005 from home:pluskalm:branches:openSUSE:Tools Referenec patch in spec file as well, else we wont get to Tumbleweed OBS-URL: https://build.opensuse.org/request/show/388005 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-tar_scm?expand=0&rev=107 --- obs-service-tar_scm.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/obs-service-tar_scm.spec b/obs-service-tar_scm.spec index 521148f..342d2fc 100644 --- a/obs-service-tar_scm.spec +++ b/obs-service-tar_scm.spec @@ -38,6 +38,9 @@ License: GPL-2.0+ Group: Development/Tools/Building Url: https://github.com/openSUSE/obs-service-%{service} Source: obs-service-tar_scm-%{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 BuildRequires: bzr BuildRequires: git-core BuildRequires: mercurial