From c6872948f3948b41e5a759f3f7db0834eafcf820 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Wed, 20 Jan 2021 09:00:34 +0000 Subject: [PATCH 1/3] Accepting request 861420 from home:nickbrown:branches:openSUSE:Tools Fixes https://github.com/openSUSE/osc/issues/888 Ultimately debtransform needs updated to cope requirements more recent versions of dpkg. (It's weird that .dsc files is needed as well as debian.control, from which is it's generated. It would be far better if OBS could do it dependencies/build using debian.control and .dsc could be omitted. But that's a separate issue) OBS-URL: https://build.opensuse.org/request/show/861420 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/osc?expand=0&rev=344 --- debian.changelog | 2 +- debian.compat | 2 +- debian.control | 2 +- osc.dsc | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/debian.changelog b/debian.changelog index f9fa667..defa4c2 100644 --- a/debian.changelog +++ b/debian.changelog @@ -1,4 +1,4 @@ -osc (0.171.0) unstable; urgency=low +osc (0.171.0-1) unstable; urgency=low - Package for Python3 -- Nick Brown Wed, 30 Jan 2020 14:49:30 +0000 diff --git a/debian.compat b/debian.compat index ec63514..f599e28 100644 --- a/debian.compat +++ b/debian.compat @@ -1 +1 @@ -9 +10 diff --git a/debian.control b/debian.control index 2fbe306..69b96b2 100644 --- a/debian.control +++ b/debian.control @@ -1,7 +1,7 @@ Source: osc Priority: extra Maintainer: Adrian Schroeter , Rene Engelhard -Build-Depends: debhelper (>= 9), dh-python, python3-all, python3-setuptools +Build-Depends: debhelper (>= 10), dh-python, python3-all, python3-setuptools Standards-Version: 3.7.1 Section: devel diff --git a/osc.dsc b/osc.dsc index db3494f..dbfdfe9 100644 --- a/osc.dsc +++ b/osc.dsc @@ -1,8 +1,8 @@ Format: 1.0 Source: osc -Version: 0.171.0 +Version: 0.171.0-1 Binary: osc Maintainer: Adrian Schroeter Architecture: any Standards-Version: 3.7.1 -Build-Depends: debhelper (>= 9), dh-python, python3-all, python3-setuptools +Build-Depends: debhelper (>= 10), dh-python, python3-all, python3-setuptools From aff970d7cab74faaf3566db17cfbe58db75e7545 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcus=20H=C3=BCwe?= Date: Wed, 27 Jan 2021 13:36:56 +0000 Subject: [PATCH 2/3] - 0.172.0: * support --lastsucceeded/--last-succeeded in "osc buildlog", "osc remotebuildlog" + friends (perform the corresponding operation on the build log of the last successful build) * fix pypi deployment via Travis CI * several fixes in request related code paths (no double html_escape of a request's description etc.) * support local builds in a systemd-nspawn container * fix potential TypeErrors+UnicodeEncodeErrors in the util.cpio and util.ar modules * support local flatpak builds (requires a recent build version) * "osc init " works for a non-existent (server-side) project * .old dir support for source services so that some services have access to the results of a previous service run OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/osc?expand=0&rev=345 --- PKGBUILD | 2 +- _service | 4 ++-- debian.changelog | 18 ++++++++++++++++++ osc-0.171.0.tar.gz | 3 --- osc-0.172.0.tar.gz | 3 +++ osc.changes | 18 ++++++++++++++++++ osc.dsc | 2 +- osc.spec | 10 +++++----- 8 files changed, 48 insertions(+), 12 deletions(-) delete mode 100644 osc-0.171.0.tar.gz create mode 100644 osc-0.172.0.tar.gz diff --git a/PKGBUILD b/PKGBUILD index c5f4821..4cfc87a 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,5 +1,5 @@ pkgname=osc -pkgver=0.171.0 +pkgver=0.172.0 pkgrel=0 pkgdesc="Open Build Service client" arch=('x86_64') diff --git a/_service b/_service index 68d3cbe..fb1836f 100644 --- a/_service +++ b/_service @@ -1,7 +1,7 @@ - 0.171.0 - 0.171.0 + 0.172.0 + 0.172.0 git://github.com/openSUSE/osc.git git diff --git a/debian.changelog b/debian.changelog index defa4c2..cc510f9 100644 --- a/debian.changelog +++ b/debian.changelog @@ -1,3 +1,21 @@ +osc (0.172.0-0) unstable; urgency=low + - Update to 0.172.0: + - support --lastsucceeded/--last-succeeded in "osc buildlog", "osc + remotebuildlog" + friends (perform the corresponding operation on + the build log of the last successful build) + - fix pypi deployment via Travis CI + - several fixes in request related code paths (no double html_escape + of a request's description etc.) + - support local builds in a systemd-nspawn container + - fix potential TypeErrors+UnicodeEncodeErrors in the util.cpio and + util.ar modules + - support local flatpak builds (requires a recent build version) + - "osc init " works for a non-existent (server-side) project + - .old dir support for source services so that some services have access + to the results of a previous service run + + -- Marcus Huewe Wed, 27 Jan 2021 14:28:11 +0100 + osc (0.171.0-1) unstable; urgency=low - Package for Python3 diff --git a/osc-0.171.0.tar.gz b/osc-0.171.0.tar.gz deleted file mode 100644 index 6f6499f..0000000 --- a/osc-0.171.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3be294b30d11abe3530a63c774f0634e30b4c7790a8288d4f8eadfbd8869d73b -size 369056 diff --git a/osc-0.172.0.tar.gz b/osc-0.172.0.tar.gz new file mode 100644 index 0000000..76db244 --- /dev/null +++ b/osc-0.172.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b498537157a6b0153d3b80c908b6bbec0119e4d71e0ad48d39e12f02d55517c9 +size 369620 diff --git a/osc.changes b/osc.changes index b1d640b..e5e0280 100644 --- a/osc.changes +++ b/osc.changes @@ -1,3 +1,21 @@ +------------------------------------------------------------------- +Wed Jan 27 13:31:51 UTC 2021 - Marcus Hüwe + +- 0.172.0: + * support --lastsucceeded/--last-succeeded in "osc buildlog", "osc + remotebuildlog" + friends (perform the corresponding operation on + the build log of the last successful build) + * fix pypi deployment via Travis CI + * several fixes in request related code paths (no double html_escape + of a request's description etc.) + * support local builds in a systemd-nspawn container + * fix potential TypeErrors+UnicodeEncodeErrors in the util.cpio and + util.ar modules + * support local flatpak builds (requires a recent build version) + * "osc init " works for a non-existent (server-side) project + * .old dir support for source services so that some services have access + to the results of a previous service run + ------------------------------------------------------------------- Tue Nov 10 13:42:55 UTC 2020 - Marco Strigl diff --git a/osc.dsc b/osc.dsc index dbfdfe9..c6247ab 100644 --- a/osc.dsc +++ b/osc.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: osc -Version: 0.171.0-1 +Version: 0.172.0-0 Binary: osc Maintainer: Adrian Schroeter Architecture: any diff --git a/osc.spec b/osc.spec index dfe5b24..9482920 100644 --- a/osc.spec +++ b/osc.spec @@ -1,7 +1,7 @@ # # spec file for package osc # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 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 @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -27,17 +27,17 @@ %define use_python python %endif -%define version_unconverted 0.171.0 +%define version_unconverted 0.172.0 %define osc_plugin_dir %{_prefix}/lib/osc-plugins %define macros_file macros.osc Name: osc -Version: 0.171.0 +Version: 0.172.0 Release: 0 Summary: Open Build Service Commander License: GPL-2.0-or-later Group: Development/Tools/Other -URL: https://github.com/openSUSE/osc +Url: https://github.com/openSUSE/osc Source: %{name}-%{version}.tar.gz Source1: debian.dirs Source2: debian.docs From 9781a257bc0ea9f2b1c3f2c66d5ee9d689a63065 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcus=20H=C3=BCwe?= Date: Wed, 27 Jan 2021 16:42:25 +0000 Subject: [PATCH 3/3] - reformat spec with a recent version of the obs-service-format_spec_file service OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/osc?expand=0&rev=346 --- osc.changes | 6 ++++++ osc.spec | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/osc.changes b/osc.changes index e5e0280..dd4d5ed 100644 --- a/osc.changes +++ b/osc.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Jan 27 16:40:47 UTC 2021 - Marcus Hüwe + +- reformat spec with a recent version of the obs-service-format_spec_file + service + ------------------------------------------------------------------- Wed Jan 27 13:31:51 UTC 2021 - Marcus Hüwe diff --git a/osc.spec b/osc.spec index 9482920..6bb609c 100644 --- a/osc.spec +++ b/osc.spec @@ -1,7 +1,7 @@ # # spec file for package osc # -# Copyright (c) 2021 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -37,7 +37,7 @@ Release: 0 Summary: Open Build Service Commander License: GPL-2.0-or-later Group: Development/Tools/Other -Url: https://github.com/openSUSE/osc +URL: https://github.com/openSUSE/osc Source: %{name}-%{version}.tar.gz Source1: debian.dirs Source2: debian.docs