From 5ce647bc60858a41910a60af6392b2d941efc2e1736480aa04ca5d53fc6da9bd Mon Sep 17 00:00:00 2001 From: Marco Strigl Date: Tue, 7 Jan 2020 13:06:27 +0000 Subject: [PATCH] - 0.167.2 * fix regression in osc chroot * fix broken importsrcpkg OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/osc?expand=0&rev=315 --- PKGBUILD | 2 +- _service | 4 ++-- debian.changelog | 2 +- osc-0.167.1.tar.gz | 3 --- osc-0.167.2.tar.gz | 3 +++ osc.changes | 7 +++++++ osc.dsc | 2 +- osc.spec | 8 ++++---- 8 files changed, 19 insertions(+), 12 deletions(-) delete mode 100644 osc-0.167.1.tar.gz create mode 100644 osc-0.167.2.tar.gz diff --git a/PKGBUILD b/PKGBUILD index 3e0ee49..35616e4 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,5 +1,5 @@ pkgname=osc -pkgver=0.167.1 +pkgver=0.167.2 pkgrel=0 pkgdesc="Open Build Service client" arch=('i686' 'x86_64') diff --git a/_service b/_service index 7c85227..b91f4a0 100644 --- a/_service +++ b/_service @@ -1,7 +1,7 @@ - 0.167.1 - 0.167.1 + 0.167.2 + 0.167.2 git://github.com/openSUSE/osc.git git diff --git a/debian.changelog b/debian.changelog index 39db101..58adfe8 100644 --- a/debian.changelog +++ b/debian.changelog @@ -1,4 +1,4 @@ -osc (0.167.1) unstable; urgency=low +osc (0.167.2) unstable; urgency=low - Update to 0.161.1 -- Marco Strigl Thu, 26 Oct 2017 14:42:00 +0200 diff --git a/osc-0.167.1.tar.gz b/osc-0.167.1.tar.gz deleted file mode 100644 index 39a7665..0000000 --- a/osc-0.167.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:874bf6c6eef9d9d230f655e2f29c0df0e9b4f9292aa76257d34b43ebd7dad063 -size 362041 diff --git a/osc-0.167.2.tar.gz b/osc-0.167.2.tar.gz new file mode 100644 index 0000000..0d93fcf --- /dev/null +++ b/osc-0.167.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b25c7866ac5be116b7ca43fac7dbcad18a4f1ca697199ac98ba8718a4e6ffac2 +size 362856 diff --git a/osc.changes b/osc.changes index df40c3e..43d5de8 100644 --- a/osc.changes +++ b/osc.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Jan 7 10:54:25 UTC 2020 - Marco Strigl + +- 0.167.2 + * fix regression in osc chroot + * fix broken importsrcpkg + ------------------------------------------------------------------- Tue Dec 10 12:44:18 UTC 2019 - Marco Strigl diff --git a/osc.dsc b/osc.dsc index 473b2d9..1ecf88c 100644 --- a/osc.dsc +++ b/osc.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: osc -Version: 0.167.1 +Version: 0.167.2 Binary: osc Maintainer: Adrian Schroeter Architecture: any diff --git a/osc.spec b/osc.spec index 0b86f27..50294db 100644 --- a/osc.spec +++ b/osc.spec @@ -1,7 +1,7 @@ # # spec file for package osc # -# Copyright (c) 2019 SUSE LLC +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -27,12 +27,12 @@ %define use_python python %endif -%define version_unconverted 0.167.1 +%define version_unconverted 0.167.2 %define osc_plugin_dir %{_prefix}/lib/osc-plugins %define macros_file macros.osc Name: osc -Version: 0.167.1 +Version: 0.167.2 Release: 0 Summary: Open Build Service Commander License: GPL-2.0-or-later @@ -85,7 +85,7 @@ Recommends: obs-service-source_validator Recommends: xdg-utils # for osc >= 0.167.0 the newest build version is needed. # Otherwise osc chroot might not work correctly. -Conflicts: build < 20191205 +Conflicts: build < 20200106 %endif %endif # needed for storing credentials in kwallet/gnome-keyring