diff --git a/PKGBUILD b/PKGBUILD index b71545e..3c5c5b2 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,5 +1,5 @@ pkgname=osc -pkgver=0.175.0 +pkgver=0.176.0 pkgrel=0 pkgdesc="Open Build Service client" arch=('x86_64') diff --git a/_service b/_service index 45c0bc3..a0bb099 100644 --- a/_service +++ b/_service @@ -1,8 +1,8 @@ - 0.175.0 - 0.175.0 - git://github.com/openSUSE/osc.git + 0.176.0 + 0.176.0 + https://github.com/openSUSE/osc.git git diff --git a/debian.changelog b/debian.changelog index 9fab3fe..21e04b4 100644 --- a/debian.changelog +++ b/debian.changelog @@ -1,4 +1,4 @@ -osc (0.175.0-0) unstable; urgency=low +osc (0.176.0-0) unstable; urgency=low - Update to 0.174.0: - fix password deletion via "osc config -d pass" - support changing the password store via "osc config diff --git a/osc-0.175.0.tar.gz b/osc-0.175.0.tar.gz deleted file mode 100644 index de07d4b..0000000 --- a/osc-0.175.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:03547ab9b16806373b4f7030959c923d1449a4f14bfe067419a6bbe29867112d -size 373432 diff --git a/osc-0.176.0.tar.gz b/osc-0.176.0.tar.gz new file mode 100644 index 0000000..f2dde48 --- /dev/null +++ b/osc-0.176.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ad691dee3249f5cc6c8e3601a3cec8aefc2d0666c648383ae8a44a32fb1f744a +size 374915 diff --git a/osc.changes b/osc.changes index 4df0c8e..10a0f84 100644 --- a/osc.changes +++ b/osc.changes @@ -1,3 +1,34 @@ +------------------------------------------------------------------- +Mon Feb 28 17:34:00 UTC 2022 - Daniel Mach + +- 0.176.0 + * add -F option to osc submitreq + * add --verbose option to build command + * fix getbinaries command to fetch also multibuild packages + * fix getbinaries -M/--multibuild-package option usage + * skip fetching metadata and logs in the getbinaries command + * do not download a bdep with a hdrmd5 from the api by default + * re-download file from API when hdrmd5 doesn't match + * honor --download-api-only option + * remove Windows from the supported operating systems + * fix license in setup.py + * add py3.10 and py3.11 to the classifiers in setup.py + * use the latest version of COPYING file from gnu.org + * fix crash on terminal resize during download + * do not fail with a traceback in case of a config error + * preserve oscrc symlink when writing conf file + * escape % character in binary download URLs + * fix printing paths to built debian packages + +------------------------------------------------------------------- +Tue Feb 22 01:21:11 UTC 2022 - Matthew Davis + +- 0.175.1: + * Modified SPEC file to be more compatible with KOJI and COPR. + ** Modified SPEC file to use python3 for CentOS/RHEL 7 + ** Modified SPEC file use fedora/rhel version macros. + ** Changed perl to sed in %install section of SPEC file. + ------------------------------------------------------------------- Thu Dec 2 08:18:20 UTC 2021 - Marco Strigl diff --git a/osc.dsc b/osc.dsc index b5afbbb..f4534e8 100644 --- a/osc.dsc +++ b/osc.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: osc -Version: 0.175.0-0 +Version: 0.176.0-0 Binary: osc Maintainer: Adrian Schroeter Architecture: any diff --git a/osc.spec b/osc.spec index f2ebfac..ae30616 100644 --- a/osc.spec +++ b/osc.spec @@ -1,7 +1,7 @@ # # spec file for package osc # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # 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 || 0%{?mageia} >= 8 +%if 0%{?suse_version} >= 1500 || 0%{?fedora} >= 29 || 0%{?rhel} >= 7 || 0%{?mageia} >= 8 %bcond_without python3 %else %bcond_with python3 @@ -27,7 +27,7 @@ %define use_python python %endif -%define version_unconverted 0.175.0 +%define version_unconverted 0.176.0 %define osc_plugin_dir %{_prefix}/lib/osc-plugins %define macros_file macros.osc %if ! %{defined _rpmmacrodir} @@ -35,7 +35,7 @@ %endif Name: osc -Version: 0.175.0 +Version: 0.176.0 Release: 0 Summary: Open Build Service Commander License: GPL-2.0-or-later @@ -53,7 +53,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 || 0%{?fedora} >= 32 || 0%{?rhel} >= 7 BuildRequires: %{use_python}-rpm Requires: %{use_python}-rpm %else @@ -95,18 +95,14 @@ Conflicts: build < 20200106 %endif %endif # needed for storing credentials in kwallet/gnome-keyring -%if 0%{?suse_version} > 1000 || 0%{?mandriva_version} || 0%{?mdkversion} +%if 0%{?suse_version} > 1000 || 0%{?mandriva_version} || 0%{?mdkversion} || 0%{?fedora} >= 29 || 0%{?rhel} >= 8 %if %{with python3} Recommends: python3-keyring %else Recommends: python-keyring %endif %endif -%if 0%{?rhel_version} && 0%{?rhel_version} < 600 -BuildRequires: python-elementtree -Requires: python-elementtree -%endif -%if 0%{?centos_version} && 0%{?centos_version} < 600 +%if 0%{?rhel} && 0%{?rhel} < 6 BuildRequires: python-elementtree Requires: python-elementtree %endif @@ -121,7 +117,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} >= 29 || 0%{?rhel} >= 7 BuildRequires: python3-m2crypto Requires: python3-m2crypto %else @@ -162,7 +158,7 @@ echo >> %{macros_file} %install %{use_python} setup.py install --prefix=%{_prefix} --root=%{buildroot} -perl -p -i -e 's{#!.*python}{#!%{_bindir}/%{use_python}}' osc-wrapper.py +sed -i -E 's|#!.*python|#!%{_bindir}/%{use_python}|' osc-wrapper.py ln -s osc-wrapper.py %{buildroot}/%{_bindir}/osc mkdir -p %{buildroot}%{osc_plugin_dir} mkdir -p %{buildroot}%{_localstatedir}/lib/osc-plugins