From 9b7a2aaa0f08c910efee10024bf25dccdf23f9a7dd43d785dfaf18f362914c1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Fri, 24 Jul 2015 06:29:26 +0000 Subject: [PATCH 1/7] updaet OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-set_version?expand=0&rev=37 --- PKGBUILD | 2 +- _servicedata | 2 +- debian.dsc | 2 +- obs-service-set_version-0.4.2.tar.gz | 3 --- obs-service-set_version-0.5.0.tar.gz | 3 +++ obs-service-set_version.changes | 32 ++++++++++++++++++++++++++++ obs-service-set_version.spec | 4 ++-- 7 files changed, 40 insertions(+), 8 deletions(-) delete mode 100644 obs-service-set_version-0.4.2.tar.gz create mode 100644 obs-service-set_version-0.5.0.tar.gz diff --git a/PKGBUILD b/PKGBUILD index e5496f1..4af5195 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,4 +1,4 @@ asd=yxc pkgrel=0 -md5sums=('df5a1fdf5313a841afcbd82dd1ab593d') +md5sums=('801b31dd37c1db8fd7164e4c91dc0eaf') diff --git a/_servicedata b/_servicedata index 3d55661..3206d36 100644 --- a/_servicedata +++ b/_servicedata @@ -1,5 +1,5 @@ git@github.com:openSUSE/obs-service-set_version.git - 310b9a0efc + 7ee0a9a99cee2a7f56c9e74cc66834166ebffffe \ No newline at end of file diff --git a/debian.dsc b/debian.dsc index dddaac3..8df3d94 100644 --- a/debian.dsc +++ b/debian.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: obs-service-set-version -Version: 0.4.2 +Version: 0.5.0 Binary: obs-service-set-version Maintainer: Adrian Schroeter Architecture: all diff --git a/obs-service-set_version-0.4.2.tar.gz b/obs-service-set_version-0.4.2.tar.gz deleted file mode 100644 index 7d9e205..0000000 --- a/obs-service-set_version-0.4.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2756b9dfa4a10d3d550267fb36eba48311a03f9a193f6ebe0aeabbad83918ec2 -size 4384 diff --git a/obs-service-set_version-0.5.0.tar.gz b/obs-service-set_version-0.5.0.tar.gz new file mode 100644 index 0000000..03e2c6f --- /dev/null +++ b/obs-service-set_version-0.5.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6ff5ed084613235c85ad89d9c34a5a1be0da0a6e463ad29f16c3ff9fc5cd17af +size 11456 diff --git a/obs-service-set_version.changes b/obs-service-set_version.changes index a3e2f5a..4177929 100644 --- a/obs-service-set_version.changes +++ b/obs-service-set_version.changes @@ -1,3 +1,35 @@ +------------------------------------------------------------------- +Fri Jul 24 06:27:51 UTC 2015 - adrian@suse.de + +- Update to version 0.5.0: + + Add Makefile with install target + + Change debian source format to 'native' + + Fix tar file detection for PKGBUILD + + Add Testsuite and README.md + + - empty dummy commit to test travis hook + + Disable py26, enable py{33,34} for tests + + Add basic test for debian changelogs + + Add travis build status image to README + + Also do negative test for debian/changelog + + Move testdata to .json files + + Move _write_tarfile() to base test class + + Remove python 2.6 compat import + + Reuse test data for debian changelog tests + + Rewrite set_version in python + + Install devscripts in travis-ci test env + + Restructure version detection code + + Allow files in test tarballs + + Add package type detection for python + + Add version converter for python packages + + Run python version converter tests with dpkg + + Add function to add or replace a %define + + Fix problem with replacing tags in spec files + + Add function to replace %{version} in %setup + + Add custom line support for _write_specfile func + + Finally use version conversion for python packages + + Skip some tests if zypper or dpkg are unavailable + + Use python binary from virtualenv + ------------------------------------------------------------------- Thu Sep 11 12:44:10 UTC 2014 - jblunck@infradead.org diff --git a/obs-service-set_version.spec b/obs-service-set_version.spec index a1fc9ee..7138445 100644 --- a/obs-service-set_version.spec +++ b/obs-service-set_version.spec @@ -1,7 +1,7 @@ # # spec file for package obs-service-set_version # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 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 @@ -19,7 +19,7 @@ %define service set_version Name: obs-service-%{service} -Version: 0.4.2 +Version: 0.5.0 Release: 0 Summary: An OBS source service: Update spec file version License: GPL-2.0+ From 553409fac967dbd1dcaa06c625cf51c358a949455a2f93b5ac68cbf3cbed581b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Fri, 24 Jul 2015 08:45:23 +0000 Subject: [PATCH 2/7] Accepting request 318367 from home:tbechtold:branches:openSUSE:Tools - Require python-packaging OBS-URL: https://build.opensuse.org/request/show/318367 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-set_version?expand=0&rev=38 --- obs-service-set_version.changes | 5 +++++ obs-service-set_version.spec | 1 + 2 files changed, 6 insertions(+) diff --git a/obs-service-set_version.changes b/obs-service-set_version.changes index 4177929..f18c375 100644 --- a/obs-service-set_version.changes +++ b/obs-service-set_version.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Jul 24 08:12:15 UTC 2015 - tbechtold@suse.com + +- Require python-packaging + ------------------------------------------------------------------- Fri Jul 24 06:27:51 UTC 2015 - adrian@suse.de diff --git a/obs-service-set_version.spec b/obs-service-set_version.spec index 7138445..24ee0f7 100644 --- a/obs-service-set_version.spec +++ b/obs-service-set_version.spec @@ -26,6 +26,7 @@ License: GPL-2.0+ Group: Development/Tools/Building Url: https://github.com/openSUSE/obs-service-%{service} Source: %{name}-%{version}.tar.gz +Requires: python-packaging Requires: sed BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch From 99defeff87a535219797747244ce93c8d608c172b06785ba77da7b8c9467d1f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Mon, 27 Jul 2015 05:33:48 +0000 Subject: [PATCH 3/7] fix requires OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-set_version?expand=0&rev=39 --- obs-service-set_version.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/obs-service-set_version.spec b/obs-service-set_version.spec index 24ee0f7..d2b377a 100644 --- a/obs-service-set_version.spec +++ b/obs-service-set_version.spec @@ -26,7 +26,7 @@ License: GPL-2.0+ Group: Development/Tools/Building Url: https://github.com/openSUSE/obs-service-%{service} Source: %{name}-%{version}.tar.gz -Requires: python-packaging +BuildRequires: python-packaging Requires: sed BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch From 68f4df8b6dba52a8856d543adf1649e3d0d4c288a01f2c866d9286d8073e0d1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Mon, 27 Jul 2015 05:53:59 +0000 Subject: [PATCH 4/7] drop buildreq OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-set_version?expand=0&rev=40 --- obs-service-set_version.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/obs-service-set_version.spec b/obs-service-set_version.spec index d2b377a..7138445 100644 --- a/obs-service-set_version.spec +++ b/obs-service-set_version.spec @@ -26,7 +26,6 @@ License: GPL-2.0+ Group: Development/Tools/Building Url: https://github.com/openSUSE/obs-service-%{service} Source: %{name}-%{version}.tar.gz -BuildRequires: python-packaging Requires: sed BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch From 509414b1e1a2792a27d426c9c2a2ee7ce3f1ffbdef7c89acf57535d00ee1b40c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Mon, 27 Jul 2015 08:23:56 +0000 Subject: [PATCH 5/7] Accepting request 318409 from home:hiberis:branches:openSUSE:Tools OBS-URL: https://build.opensuse.org/request/show/318409 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-set_version?expand=0&rev=41 --- PKGBUILD | 2 +- _service | 2 +- debian.dsc | 2 +- obs-service-set_version-0.5.0+git20150724.7ee0a9a.tar.gz | 3 +++ obs-service-set_version-0.5.0.tar.gz | 3 --- obs-service-set_version.changes | 6 ++++++ obs-service-set_version.spec | 7 +++---- 7 files changed, 15 insertions(+), 10 deletions(-) create mode 100644 obs-service-set_version-0.5.0+git20150724.7ee0a9a.tar.gz delete mode 100644 obs-service-set_version-0.5.0.tar.gz diff --git a/PKGBUILD b/PKGBUILD index 4af5195..8416db1 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,4 +1,4 @@ asd=yxc pkgrel=0 -md5sums=('801b31dd37c1db8fd7164e4c91dc0eaf') +md5sums=('6c56205dc76539e518f940aebd7eaafb') diff --git a/_service b/_service index 83d978d..82074d5 100644 --- a/_service +++ b/_service @@ -4,7 +4,7 @@ git .git git-master - @PARENT_TAG@ + @PARENT_TAG@+git%cd.%h master enable diff --git a/debian.dsc b/debian.dsc index 8df3d94..c77accc 100644 --- a/debian.dsc +++ b/debian.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: obs-service-set-version -Version: 0.5.0 +Version: 0.5.0+git20150724.7ee0a9a Binary: obs-service-set-version Maintainer: Adrian Schroeter Architecture: all diff --git a/obs-service-set_version-0.5.0+git20150724.7ee0a9a.tar.gz b/obs-service-set_version-0.5.0+git20150724.7ee0a9a.tar.gz new file mode 100644 index 0000000..9dafa47 --- /dev/null +++ b/obs-service-set_version-0.5.0+git20150724.7ee0a9a.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6672a703705d1c0fa8f8aa2bc88f9c6ec67216b30af2372945023a8bdc82c237 +size 11667 diff --git a/obs-service-set_version-0.5.0.tar.gz b/obs-service-set_version-0.5.0.tar.gz deleted file mode 100644 index 03e2c6f..0000000 --- a/obs-service-set_version-0.5.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6ff5ed084613235c85ad89d9c34a5a1be0da0a6e463ad29f16c3ff9fc5cd17af -size 11456 diff --git a/obs-service-set_version.changes b/obs-service-set_version.changes index f18c375..3e054d2 100644 --- a/obs-service-set_version.changes +++ b/obs-service-set_version.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Jul 24 09:26:53 UTC 2015 - hib@hiberis.nl + +- Use install target from Makefile +- Include git revision in version number + ------------------------------------------------------------------- Fri Jul 24 08:12:15 UTC 2015 - tbechtold@suse.com diff --git a/obs-service-set_version.spec b/obs-service-set_version.spec index 7138445..e8c0d47 100644 --- a/obs-service-set_version.spec +++ b/obs-service-set_version.spec @@ -19,13 +19,14 @@ %define service set_version Name: obs-service-%{service} -Version: 0.5.0 +Version: 0.5.0+git20150724.7ee0a9a Release: 0 Summary: An OBS source service: Update spec file version License: GPL-2.0+ Group: Development/Tools/Building Url: https://github.com/openSUSE/obs-service-%{service} Source: %{name}-%{version}.tar.gz +Requires: python-packaging Requires: sed BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch @@ -42,9 +43,7 @@ a given version or to the existing files. %build %install -mkdir -p %{buildroot}%{_prefix}/lib/obs/service -install -m 0755 set_version %{buildroot}%{_prefix}/lib/obs/service -install -m 0644 set_version.service %{buildroot}%{_prefix}/lib/obs/service +%makeinstall %files %defattr(-,root,root) From c9b4650b1bd7d9a8c66091c5b46fc7bae3ee08e10971a1ba817f95c238a0d09b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Mon, 27 Jul 2015 08:48:18 +0000 Subject: [PATCH 6/7] osc copypac from project:openSUSE:Tools package:obs-service-set_version revision:38 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-set_version?expand=0&rev=42 --- PKGBUILD | 2 +- _service | 2 +- debian.dsc | 2 +- obs-service-set_version-0.5.0+git20150724.7ee0a9a.tar.gz | 3 --- obs-service-set_version-0.5.0.tar.gz | 3 +++ obs-service-set_version.changes | 6 ------ obs-service-set_version.spec | 6 ++++-- 7 files changed, 10 insertions(+), 14 deletions(-) delete mode 100644 obs-service-set_version-0.5.0+git20150724.7ee0a9a.tar.gz create mode 100644 obs-service-set_version-0.5.0.tar.gz diff --git a/PKGBUILD b/PKGBUILD index 8416db1..4af5195 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,4 +1,4 @@ asd=yxc pkgrel=0 -md5sums=('6c56205dc76539e518f940aebd7eaafb') +md5sums=('801b31dd37c1db8fd7164e4c91dc0eaf') diff --git a/_service b/_service index 82074d5..83d978d 100644 --- a/_service +++ b/_service @@ -4,7 +4,7 @@ git .git git-master - @PARENT_TAG@+git%cd.%h + @PARENT_TAG@ master enable diff --git a/debian.dsc b/debian.dsc index c77accc..8df3d94 100644 --- a/debian.dsc +++ b/debian.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: obs-service-set-version -Version: 0.5.0+git20150724.7ee0a9a +Version: 0.5.0 Binary: obs-service-set-version Maintainer: Adrian Schroeter Architecture: all diff --git a/obs-service-set_version-0.5.0+git20150724.7ee0a9a.tar.gz b/obs-service-set_version-0.5.0+git20150724.7ee0a9a.tar.gz deleted file mode 100644 index 9dafa47..0000000 --- a/obs-service-set_version-0.5.0+git20150724.7ee0a9a.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6672a703705d1c0fa8f8aa2bc88f9c6ec67216b30af2372945023a8bdc82c237 -size 11667 diff --git a/obs-service-set_version-0.5.0.tar.gz b/obs-service-set_version-0.5.0.tar.gz new file mode 100644 index 0000000..03e2c6f --- /dev/null +++ b/obs-service-set_version-0.5.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6ff5ed084613235c85ad89d9c34a5a1be0da0a6e463ad29f16c3ff9fc5cd17af +size 11456 diff --git a/obs-service-set_version.changes b/obs-service-set_version.changes index 3e054d2..f18c375 100644 --- a/obs-service-set_version.changes +++ b/obs-service-set_version.changes @@ -1,9 +1,3 @@ -------------------------------------------------------------------- -Fri Jul 24 09:26:53 UTC 2015 - hib@hiberis.nl - -- Use install target from Makefile -- Include git revision in version number - ------------------------------------------------------------------- Fri Jul 24 08:12:15 UTC 2015 - tbechtold@suse.com diff --git a/obs-service-set_version.spec b/obs-service-set_version.spec index e8c0d47..24ee0f7 100644 --- a/obs-service-set_version.spec +++ b/obs-service-set_version.spec @@ -19,7 +19,7 @@ %define service set_version Name: obs-service-%{service} -Version: 0.5.0+git20150724.7ee0a9a +Version: 0.5.0 Release: 0 Summary: An OBS source service: Update spec file version License: GPL-2.0+ @@ -43,7 +43,9 @@ a given version or to the existing files. %build %install -%makeinstall +mkdir -p %{buildroot}%{_prefix}/lib/obs/service +install -m 0755 set_version %{buildroot}%{_prefix}/lib/obs/service +install -m 0644 set_version.service %{buildroot}%{_prefix}/lib/obs/service %files %defattr(-,root,root) From 03c97bc7b6cbd9841dc6417864436f7a09d3a10ee7689bdcd651c01d8d183876 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Tue, 28 Jul 2015 06:18:59 +0000 Subject: [PATCH 7/7] update OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-set_version?expand=0&rev=43 --- _servicedata | 2 +- debian.dsc | 2 +- obs-service-set_version-0.5.0.tar.gz | 3 --- obs-service-set_version-0.5.1.tar.gz | 3 +++ obs-service-set_version.changes | 12 ++++++++++++ obs-service-set_version.spec | 4 ++-- 6 files changed, 19 insertions(+), 7 deletions(-) delete mode 100644 obs-service-set_version-0.5.0.tar.gz create mode 100644 obs-service-set_version-0.5.1.tar.gz diff --git a/_servicedata b/_servicedata index 3206d36..627c332 100644 --- a/_servicedata +++ b/_servicedata @@ -1,5 +1,5 @@ git@github.com:openSUSE/obs-service-set_version.git - 7ee0a9a99cee2a7f56c9e74cc66834166ebffffe + c8e7ae6db4619249d226b3cad8151471da6b6de0 \ No newline at end of file diff --git a/debian.dsc b/debian.dsc index 8df3d94..d3f6b8f 100644 --- a/debian.dsc +++ b/debian.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: obs-service-set-version -Version: 0.5.0 +Version: 0.5.1 Binary: obs-service-set-version Maintainer: Adrian Schroeter Architecture: all diff --git a/obs-service-set_version-0.5.0.tar.gz b/obs-service-set_version-0.5.0.tar.gz deleted file mode 100644 index 03e2c6f..0000000 --- a/obs-service-set_version-0.5.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6ff5ed084613235c85ad89d9c34a5a1be0da0a6e463ad29f16c3ff9fc5cd17af -size 11456 diff --git a/obs-service-set_version-0.5.1.tar.gz b/obs-service-set_version-0.5.1.tar.gz new file mode 100644 index 0000000..4fc04b2 --- /dev/null +++ b/obs-service-set_version-0.5.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0803990d4fc28e087dae412195865d7b05f7e11403470fdeaea8c45ff42d254a +size 11884 diff --git a/obs-service-set_version.changes b/obs-service-set_version.changes index f18c375..a81bc43 100644 --- a/obs-service-set_version.changes +++ b/obs-service-set_version.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Tue Jul 28 06:17:48 UTC 2015 - adrian@suse.de + +- Update to version 0.5.1: + + Make python-packaging runtime dep optional + + Fix %setup handling for python spec files + +------------------------------------------------------------------- +Mon Jul 27 08:50:38 UTC 2015 - adrian@suse.de + +- Recommends python-packaging + ------------------------------------------------------------------- Fri Jul 24 08:12:15 UTC 2015 - tbechtold@suse.com diff --git a/obs-service-set_version.spec b/obs-service-set_version.spec index 24ee0f7..a745257 100644 --- a/obs-service-set_version.spec +++ b/obs-service-set_version.spec @@ -19,14 +19,14 @@ %define service set_version Name: obs-service-%{service} -Version: 0.5.0 +Version: 0.5.1 Release: 0 Summary: An OBS source service: Update spec file version License: GPL-2.0+ Group: Development/Tools/Building Url: https://github.com/openSUSE/obs-service-%{service} Source: %{name}-%{version}.tar.gz -Requires: python-packaging +Recommends: python-packaging Requires: sed BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch