From 64c4e1bbdd4264d427ba52e133941ea38a71924c Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Fri, 6 Dec 2019 09:13:17 +0000 Subject: [PATCH] Updating link to change in openSUSE:Factory/osc revision 142.0 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/osc?expand=0&rev=b7e63ffe05508856fb63d605ea560f66 --- PKGBUILD | 2 +- _service | 4 ++-- debian.changelog | 2 +- osc-0.166.2.tar.gz | 3 +++ osc-0.167.0.tar.gz | 3 --- osc.changes | 23 ----------------------- osc.dsc | 2 +- osc.spec | 19 ++++++++----------- 8 files changed, 16 insertions(+), 42 deletions(-) create mode 100644 osc-0.166.2.tar.gz delete mode 100644 osc-0.167.0.tar.gz diff --git a/PKGBUILD b/PKGBUILD index 21390f9..1e89a08 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,5 +1,5 @@ pkgname=osc -pkgver=0.167.0 +pkgver=0.166.2 pkgrel=0 pkgdesc="Open Build Service client" arch=('i686' 'x86_64') diff --git a/_service b/_service index 580f9a3..b5b3a30 100644 --- a/_service +++ b/_service @@ -1,7 +1,7 @@ - 0.167.0 - 0.167.0 + 0.166.2 + 0.166.2 git://github.com/openSUSE/osc.git git diff --git a/debian.changelog b/debian.changelog index 07ac555..d9d4b3e 100644 --- a/debian.changelog +++ b/debian.changelog @@ -1,4 +1,4 @@ -osc (0.167.0) unstable; urgency=low +osc (0.166.2) unstable; urgency=low - Update to 0.161.1 -- Marco Strigl Thu, 26 Oct 2017 14:42:00 +0200 diff --git a/osc-0.166.2.tar.gz b/osc-0.166.2.tar.gz new file mode 100644 index 0000000..0e7071a --- /dev/null +++ b/osc-0.166.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0fcbdee12c9bb716cac3d10afea3f9de6b3c141463f9c8af7ae2d152398835da +size 362221 diff --git a/osc-0.167.0.tar.gz b/osc-0.167.0.tar.gz deleted file mode 100644 index a47864f..0000000 --- a/osc-0.167.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f965707290ae6090b7ec3ead5bc2cb73d0d7bdb9afffea43f0ddd848fe6ba79c -size 362265 diff --git a/osc.changes b/osc.changes index be6f86e..9c00198 100644 --- a/osc.changes +++ b/osc.changes @@ -1,26 +1,3 @@ -------------------------------------------------------------------- -Thu Dec 5 09:47:54 UTC 2019 - Marco Strigl - -- 0.167.0 - * Added --lastsucceeded option for logfile display (requires OBS 2.11) - * osc shell/chroot/wipe is now handled via build script (working for chroot and KVM only atm) - * osc build/shell features: - - --vm-type=qemu support for cross architecture builds - - additional debug packages are read from build config now - (extra-pkgs definition is therefore by default empty now) - - --vm-disk-size= switch supported (has only an effect on clean builds) - - repository, architecture and vm_type from last build is automatically - reused if not specified otherwise. - - support building for kiwi products using obsrepositories:/ - - support local building using RedHat rpm-md modules - * fix decoding for osc aggregatepac -- added Conflicts: build < 20191205. The new osc shell/chroot features might - not work with older build scripts -- removed version dpendency for Recommends: build. Does not work anyway. -- added 0%{?centos_version} >= 800 to some %if statemets to enable build of - python3 version on CentOS 8 and higer - - ------------------------------------------------------------------- Wed Nov 13 12:05:26 UTC 2019 - Marco Strigl diff --git a/osc.dsc b/osc.dsc index 952e6e9..5f48b5a 100644 --- a/osc.dsc +++ b/osc.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: osc -Version: 0.167.0 +Version: 0.166.2 Binary: osc Maintainer: Adrian Schroeter Architecture: any diff --git a/osc.spec b/osc.spec index 4302430..53d8c83 100644 --- a/osc.spec +++ b/osc.spec @@ -1,7 +1,7 @@ # # spec file for package osc # -# Copyright (c) 2019 SUSE LLC +# Copyright (c) 2019 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 @@ -16,7 +16,7 @@ # -%if 0%{?suse_version} >= 1500 || 0%{?fedora_version} >= 29 || 0%{?centos_version} >= 800 +%if 0%{?suse_version} >= 1500 || 0%{?fedora_version} >= 29 %bcond_without python3 %else %bcond_with python3 @@ -27,17 +27,17 @@ %define use_python python %endif -%define version_unconverted 0.167.0 +%define version_unconverted 0.166.2 %define osc_plugin_dir %{_prefix}/lib/osc-plugins %define macros_file macros.osc Name: osc -Version: 0.167.0 +Version: 0.166.2 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 BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: %{use_python}-devel @@ -47,7 +47,7 @@ BuildRequires: diffstat BuildRequires: python-rpm Requires: python-rpm %else -%if 0%{?suse_version} >= 1500 || 0%{?fedora_version} >= 32 || 0%{?centos_version} >= 800 +%if 0%{?suse_version} >= 1500 BuildRequires: %{use_python}-rpm Requires: %{use_python}-rpm %else @@ -69,7 +69,7 @@ Requires: python-elementtree %endif %if 0%{?suse_version} > 1000 Recommends: diffstat -Recommends: build +Recommends: build >= 2010.05.04 Recommends: sudo Recommends: powerpc32 Recommends: ca-certificates @@ -83,9 +83,6 @@ Recommends: obs-service-download_files Recommends: obs-service-format_spec_file 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 %endif %endif # needed for storing credentials in kwallet/gnome-keyring @@ -111,7 +108,7 @@ BuildRequires: python-m2crypto > 0.19 Requires: python-m2crypto > 0.19 %endif %else -%if 0%{?fedora_version} >= 29 || 0%{?centos_version} >= 800 +%if 0%{?fedora_version} >= 29 BuildRequires: python3-m2crypto Requires: python3-m2crypto %else