From 90cffab06b191a9700673917d701b81644b0c445 Mon Sep 17 00:00:00 2001 From: Marco Strigl Date: Fri, 7 Feb 2020 09:47:59 +0000 Subject: [PATCH 01/10] Accepting request 752964 from home:nickbrown:osc_debian_files Instead of storing the debian packaging as a tarball that's hard to version, generate and mange, store them separately. There is no net change, the files re exactly as they appeared in the tarball. This will make future improvements to the likes of the rules/control files easier, and hopefully kept in sync with the rpm spec. (I hope to move the debian package to python3 at some point). OBS-URL: https://build.opensuse.org/request/show/752964 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/osc?expand=0&rev=317 --- debian.compat | 1 + debian.control | 15 ++++++ debian.copyright | 17 +++++++ debian.dirs | 3 ++ debian.docs | 2 + debian.osc.dirs | 5 ++ debian.osc.install | 3 ++ debian.osc.links | 1 + debian.rules | 116 +++++++++++++++++++++++++++++++++++++++++++++ debian.tar.gz | 3 -- 10 files changed, 163 insertions(+), 3 deletions(-) create mode 100644 debian.compat create mode 100644 debian.control create mode 100644 debian.copyright create mode 100644 debian.dirs create mode 100644 debian.docs create mode 100644 debian.osc.dirs create mode 100644 debian.osc.install create mode 100644 debian.osc.links create mode 100644 debian.rules delete mode 100644 debian.tar.gz diff --git a/debian.compat b/debian.compat new file mode 100644 index 0000000..45a4fb7 --- /dev/null +++ b/debian.compat @@ -0,0 +1 @@ +8 diff --git a/debian.control b/debian.control new file mode 100644 index 0000000..8c685fd --- /dev/null +++ b/debian.control @@ -0,0 +1,15 @@ +Source: osc +Priority: extra +Maintainer: Adrian Schroeter , Rene Engelhard +Build-Depends: debhelper (>= 4.0.0), python-dev +Standards-Version: 3.7.1 +Section: devel + +Package: osc +Section: devel +Architecture: all +Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, python (>=2.5) | python-celementtree, python-m2crypto, python-rpm, build | obs-build +Recommends: python-progressbar +Suggests: python-keyring, sudo +Description: Open Build Service Commander + Commandline client for the Open Build Service. diff --git a/debian.copyright b/debian.copyright new file mode 100644 index 0000000..ab41165 --- /dev/null +++ b/debian.copyright @@ -0,0 +1,17 @@ +This package was debianized by J.H.M. Dassen (Ray) on +Fri, 12 May 2006 14:12:04 +0200. + +It was downloaded from www.opensuse.org + +Upstream Author: Peter Poeml + +Copyright Holder: Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. + +License: + +# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. +# This file and all modifications and additions to the pristine +# package are under the same license as the package itself. + +osc itself is GPL, for the full text of the GPL see /usr/share/common-licenses/GPL + diff --git a/debian.dirs b/debian.dirs new file mode 100644 index 0000000..1d53b63 --- /dev/null +++ b/debian.dirs @@ -0,0 +1,3 @@ +usr/bin +usr/sbin +usr/share/man diff --git a/debian.docs b/debian.docs new file mode 100644 index 0000000..724e084 --- /dev/null +++ b/debian.docs @@ -0,0 +1,2 @@ +README +TODO diff --git a/debian.osc.dirs b/debian.osc.dirs new file mode 100644 index 0000000..0b27127 --- /dev/null +++ b/debian.osc.dirs @@ -0,0 +1,5 @@ +usr/lib +usr/lib/osc +usr/include +etc/bash_completion.d +etc/profile.d diff --git a/debian.osc.install b/debian.osc.install new file mode 100644 index 0000000..ec92776 --- /dev/null +++ b/debian.osc.install @@ -0,0 +1,3 @@ +usr/lib/osc/complete +etc/profile.d/osc.csh +etc/bash_completion.d/osc.sh diff --git a/debian.osc.links b/debian.osc.links new file mode 100644 index 0000000..2792f5d --- /dev/null +++ b/debian.osc.links @@ -0,0 +1 @@ +usr/bin/osc-wrapper.py usr/bin/osc diff --git a/debian.rules b/debian.rules new file mode 100644 index 0000000..038e3e6 --- /dev/null +++ b/debian.rules @@ -0,0 +1,116 @@ +#!/usr/bin/make -f +# -*- makefile -*- +# Sample debian/rules that uses debhelper. +# This file was originally written by Joey Hess and Craig Small. +# As a special exception, when this file is copied by dh-make into a +# dh-make output file, you may use that output file without restriction. +# This special exception was added by Craig Small in version 0.37 of dh-make. + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + + + + +CFLAGS = -Wall -g + +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 +else + CFLAGS += -O2 +endif + +# shared library versions, option 1 +version=2.0.5 +major=2 +# option 2, assuming the library is created as src/.libs/libfoo.so.2.0.5 or so +#version=`ls src/.libs/lib*.so.* | \ +# awk '{if (match($$0,/[0-9]+\.[0-9]+\.[0-9]+$$/)) print substr($$0,RSTART)}'` +#major=`ls src/.libs/lib*.so.* | \ +# awk '{if (match($$0,/\.so\.[0-9]+$$/)) print substr($$0,RSTART+4)}'` + +configure: configure-stamp +configure-stamp: + dh_testdir + # Add here commands to configure the package. + + touch configure-stamp + + +build: build-stamp +build-stamp: configure-stamp + dh_testdir + + # Add here commands to compile the package. + #$(MAKE) + python setup.py build + + touch build-stamp + +clean: + dh_testdir + dh_testroot + rm -f build-stamp configure-stamp + + # Add here commands to clean up after the build process. + -$(MAKE) clean + rm -rf build + + dh_clean + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + + # Add here commands to install the package into debian/tmp + #$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp + #python setup.py install --install-layout=deb + # --prefix=$(CURDIR)/debian/tmp/usr + # try also without --install-layout=deb for older distros + python setup.py install --root=debian/tmp --no-compile --install-layout=deb || \ + python setup.py install --root=debian/tmp --no-compile + install -Dm0644 dist/complete.csh debian/tmp/etc/profile.d/osc.csh + install -Dm0644 dist/complete.sh debian/tmp/etc/bash_completion.d/osc.sh + install -Dm0755 dist/osc.complete debian/tmp/usr/lib/osc/complete + + +# Build architecture-independent files here. +binary-indep: build install +# We have nothing to do by default. + +# Build architecture-dependent files here. +binary-arch: build install + dh_testdir + dh_testroot + dh_installchangelogs + dh_installdocs + dh_installexamples + dh_auto_install + dh_install +# dh_installmenu +# dh_installdebconf +# dh_installlogrotate +# dh_installemacsen +# dh_installpam +# dh_installmime +# dh_installinit +# dh_installcron +# dh_installinfo + dh_installman + dh_link + dh_strip + dh_compress + dh_fixperms +# dh_perl +# dh_python +# dh_makeshlibs + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install configure diff --git a/debian.tar.gz b/debian.tar.gz deleted file mode 100644 index 0c42706..0000000 --- a/debian.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:14f061d4c11db825452064043bafec42b8c5fe8c4a76b8df46e866211f32058d -size 2232 From bbd80c3346f72d0b42b8684a7d0ca1b9fb612ca7 Mon Sep 17 00:00:00 2001 From: Marco Strigl Date: Fri, 7 Feb 2020 12:37:52 +0000 Subject: [PATCH 02/10] Accepting request 771059 from home:nickbrown:osc_debian_files Updated this Debian package to package osc for python3. This means support for Debian 7 and older, Ubuntu 13.04 and older are dropped, but these are all EOL (Ubuntu 14.04 is the oldest LTS release). But it adds supports for Ubuntu Next and Debian Test which both remove python2 support by default. This should resolve https://github.com/openSUSE/osc/issues/575 OBS-URL: https://build.opensuse.org/request/show/771059 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/osc?expand=0&rev=318 --- debian.changelog | 4 +- debian.compat | 2 +- debian.control | 8 ++-- debian.rules | 112 +++-------------------------------------------- osc.dsc | 2 +- osc.spec | 2 +- 6 files changed, 14 insertions(+), 116 deletions(-) diff --git a/debian.changelog b/debian.changelog index d649a35..d2d0ae5 100644 --- a/debian.changelog +++ b/debian.changelog @@ -1,7 +1,7 @@ osc (0.167.2) unstable; urgency=low - - Update to 0.161.1 + - Package for Python3 - -- Marco Strigl Thu, 26 Oct 2017 14:42:00 +0200 + -- Nick Brown Wed, 30 Jan 2020 14:49:30 +0000 osc (0.161.0-0) unstable; urgency=low - Install bash completion diff --git a/debian.compat b/debian.compat index 45a4fb7..ec63514 100644 --- a/debian.compat +++ b/debian.compat @@ -1 +1 @@ -8 +9 diff --git a/debian.control b/debian.control index 8c685fd..69de6d9 100644 --- a/debian.control +++ b/debian.control @@ -1,15 +1,15 @@ Source: osc Priority: extra Maintainer: Adrian Schroeter , Rene Engelhard -Build-Depends: debhelper (>= 4.0.0), python-dev +Build-Depends: debhelper (>= 9), dh-python, python3-all, python3-setuptools Standards-Version: 3.7.1 Section: devel Package: osc Section: devel Architecture: all -Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, python (>=2.5) | python-celementtree, python-m2crypto, python-rpm, build | obs-build -Recommends: python-progressbar -Suggests: python-keyring, sudo +Depends: ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends}, python3, build | obs-build +Recommends: python3-progressbar +Suggests: python3-keyring, sudo Description: Open Build Service Commander Commandline client for the Open Build Service. diff --git a/debian.rules b/debian.rules index 038e3e6..507c9c3 100644 --- a/debian.rules +++ b/debian.rules @@ -1,116 +1,14 @@ #!/usr/bin/make -f -# -*- makefile -*- -# Sample debian/rules that uses debhelper. -# This file was originally written by Joey Hess and Craig Small. -# As a special exception, when this file is copied by dh-make into a -# dh-make output file, you may use that output file without restriction. -# This special exception was added by Craig Small in version 0.37 of dh-make. - # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 +export PYBUILD_NAME=osc +%: + dh $@ --with python3 --buildsystem=pybuild - -CFLAGS = -Wall -g - -ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) - CFLAGS += -O0 -else - CFLAGS += -O2 -endif - -# shared library versions, option 1 -version=2.0.5 -major=2 -# option 2, assuming the library is created as src/.libs/libfoo.so.2.0.5 or so -#version=`ls src/.libs/lib*.so.* | \ -# awk '{if (match($$0,/[0-9]+\.[0-9]+\.[0-9]+$$/)) print substr($$0,RSTART)}'` -#major=`ls src/.libs/lib*.so.* | \ -# awk '{if (match($$0,/\.so\.[0-9]+$$/)) print substr($$0,RSTART+4)}'` - -configure: configure-stamp -configure-stamp: - dh_testdir - # Add here commands to configure the package. - - touch configure-stamp - - -build: build-stamp -build-stamp: configure-stamp - dh_testdir - - # Add here commands to compile the package. - #$(MAKE) - python setup.py build - - touch build-stamp - -clean: - dh_testdir - dh_testroot - rm -f build-stamp configure-stamp - - # Add here commands to clean up after the build process. - -$(MAKE) clean - rm -rf build - - dh_clean - -install: build - dh_testdir - dh_testroot - dh_clean -k - dh_installdirs - - # Add here commands to install the package into debian/tmp - #$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp - #python setup.py install --install-layout=deb - # --prefix=$(CURDIR)/debian/tmp/usr - # try also without --install-layout=deb for older distros - python setup.py install --root=debian/tmp --no-compile --install-layout=deb || \ - python setup.py install --root=debian/tmp --no-compile +override_dh_auto_install: + dh_auto_install install -Dm0644 dist/complete.csh debian/tmp/etc/profile.d/osc.csh install -Dm0644 dist/complete.sh debian/tmp/etc/bash_completion.d/osc.sh install -Dm0755 dist/osc.complete debian/tmp/usr/lib/osc/complete - - -# Build architecture-independent files here. -binary-indep: build install -# We have nothing to do by default. - -# Build architecture-dependent files here. -binary-arch: build install - dh_testdir - dh_testroot - dh_installchangelogs - dh_installdocs - dh_installexamples - dh_auto_install - dh_install -# dh_installmenu -# dh_installdebconf -# dh_installlogrotate -# dh_installemacsen -# dh_installpam -# dh_installmime -# dh_installinit -# dh_installcron -# dh_installinfo - dh_installman - dh_link - dh_strip - dh_compress - dh_fixperms -# dh_perl -# dh_python -# dh_makeshlibs - dh_installdeb - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb - -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install configure diff --git a/osc.dsc b/osc.dsc index ecf7e26..1148734 100644 --- a/osc.dsc +++ b/osc.dsc @@ -5,4 +5,4 @@ Binary: osc Maintainer: Adrian Schroeter Architecture: any Standards-Version: 3.7.1 -Build-Depends: debhelper (>= 4.0.0), python-dev, python-setuptools +Build-Depends: debhelper (>= 9), dh-python, python3-all, python3-setuptools diff --git a/osc.spec b/osc.spec index 0d0f7ea..88192e1 100644 --- a/osc.spec +++ b/osc.spec @@ -1,7 +1,7 @@ # # spec file for package osc # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2020 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 From 204189b3374a5ee206a588ccc8346597e0e06e48 Mon Sep 17 00:00:00 2001 From: Marco Strigl Date: Fri, 7 Feb 2020 13:55:53 +0000 Subject: [PATCH 03/10] Accepting request 771917 from home:nickbrown:osc_debian_files Add python3-m2crypto to debian dependencies, and reformat all depends/recommends to be easier to mange. OBS-URL: https://build.opensuse.org/request/show/771917 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/osc?expand=0&rev=319 --- debian.control | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/debian.control b/debian.control index 69de6d9..7205135 100644 --- a/debian.control +++ b/debian.control @@ -8,8 +8,16 @@ Section: devel Package: osc Section: devel Architecture: all -Depends: ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends}, python3, build | obs-build -Recommends: python3-progressbar -Suggests: python3-keyring, sudo +Depends: ${shlibs:Depends}, + ${misc:Depends}, + ${python3:Depends}, + python3, + python3-m2crypto, + build | obs-build +Recommends: python3-progressbar, + python3-rpm, + python3-keyring, + bash-completion +Suggests: sudo Description: Open Build Service Commander Commandline client for the Open Build Service. From 39e39908c2d037e03adac1edfac928165fb95ca0 Mon Sep 17 00:00:00 2001 From: Marco Strigl Date: Thu, 13 Feb 2020 11:02:34 +0000 Subject: [PATCH 04/10] Accepting request 773494 from home:favogt:branches:openSUSE:Tools - Spec: * Recommend python3-keyring when using python3 OBS-URL: https://build.opensuse.org/request/show/773494 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/osc?expand=0&rev=320 --- osc.changes | 6 ++++++ osc.spec | 4 ++++ 2 files changed, 10 insertions(+) diff --git a/osc.changes b/osc.changes index 6b83ed5..632b7cf 100644 --- a/osc.changes +++ b/osc.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Feb 11 16:39:17 UTC 2020 - Fabian Vogt + +- Spec: + * Recommend python3-keyring when using python3 + ------------------------------------------------------------------- Tue Jan 7 10:54:25 UTC 2020 - Marco Strigl diff --git a/osc.spec b/osc.spec index 88192e1..4f74c38 100644 --- a/osc.spec +++ b/osc.spec @@ -90,8 +90,12 @@ Conflicts: build < 20200106 %endif # needed for storing credentials in kwallet/gnome-keyring %if 0%{?suse_version} > 1000 || 0%{?mandriva_version} || 0%{?mdkversion} +%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 From f112be7b3a778265808e5596fa10fe733d706b6e Mon Sep 17 00:00:00 2001 From: Marco Strigl Date: Fri, 14 Feb 2020 09:58:49 +0000 Subject: [PATCH 05/10] Accepting request 772679 from home:nickbrown:osc_debian_files python3-m2crypto debian dependency needs to be optional so that the package installs on older debian/ubuntu releases where is is not available. OBS-URL: https://build.opensuse.org/request/show/772679 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/osc?expand=0&rev=321 --- debian.control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian.control b/debian.control index 7205135..2fbe306 100644 --- a/debian.control +++ b/debian.control @@ -12,11 +12,11 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends}, python3, - python3-m2crypto, build | obs-build Recommends: python3-progressbar, python3-rpm, python3-keyring, + python3-m2crypto, bash-completion Suggests: sudo Description: Open Build Service Commander From f625d7c977563140bbd05db41f2d05295906699d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Tue, 18 Feb 2020 08:49:23 +0000 Subject: [PATCH 06/10] Accepting request 763989 from home:metakcahura:branches:openSUSE:Tools Update arch PKGBUILD file for python-3.8. OBS-URL: https://build.opensuse.org/request/show/763989 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/osc?expand=0&rev=322 --- PKGBUILD | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/PKGBUILD b/PKGBUILD index cb606ee..ec87b85 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -2,18 +2,23 @@ pkgname=osc pkgver=0.167.2 pkgrel=0 pkgdesc="Open Build Service client" -arch=('i686' 'x86_64') +arch=('x86_64') url="https://www.github.com/openSUSE/osc" license=('GPL-2.0+' 'GPL-2.0') groups=('base-devel') -depends=('python2' 'python2-m2crypto' 'urlgrabber') +depends=('python-m2crypto') +makedepends=('python-setuptools') source=(osc-${pkgver}.tar.gz) md5sums=('SKIP') +build() { + cd "${srcdir}"/osc-${pkgver} + python setup.py build +} + package() { msg "Installing osc ..." cd "${srcdir}"/osc-${pkgver} - python2 setup.py build - python2 setup.py install --prefix=/usr --root=${pkgdir} + python setup.py install --root="${pkgdir}/" --optimize=1 --prefix=/usr ln -s osc-wrapper.py ${pkgdir}/usr/bin/osc } From 1ef258746d34e852eaef2605c2f5953182fa3c76 Mon Sep 17 00:00:00 2001 From: Marco Strigl Date: Wed, 4 Mar 2020 08:38:57 +0000 Subject: [PATCH 07/10] Accepting request 780271 from home:fcrozat:branches:openSUSE:Tools - Ship fish completion file. OBS-URL: https://build.opensuse.org/request/show/780271 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/osc?expand=0&rev=323 --- osc.changes | 5 +++++ osc.spec | 5 ++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/osc.changes b/osc.changes index 632b7cf..f244753 100644 --- a/osc.changes +++ b/osc.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Feb 28 12:27:27 UTC 2020 - Frederic Crozat + +- Ship fish completion file. + ------------------------------------------------------------------- Tue Feb 11 16:39:17 UTC 2020 - Fabian Vogt diff --git a/osc.spec b/osc.spec index 4f74c38..4979f03 100644 --- a/osc.spec +++ b/osc.spec @@ -1,7 +1,7 @@ # # spec file for package osc # -# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany. +# 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 @@ -171,6 +171,8 @@ install -Dm0755 dist/osc.complete %{buildroot}%{_prefix}/lib/osc/complete install -Dm0755 dist/osc.complete %{buildroot}%{_libdir}/osc/complete %endif +install -Dm0755 osc.fish %{buildroot}%{_datadir}/fish/completions + install -m644 %{macros_file} -D %{buildroot}%{_sysconfdir}/rpm/%{macros_file} %if 0%{?suse_version} >= 1500 @@ -206,6 +208,7 @@ rm -rf %{buildroot} %else %{_libdir}/osc %endif +%{_datadir}/fish %dir %{osc_plugin_dir} %changelog From b183d163f813f575429b64a6707a73c8617db759 Mon Sep 17 00:00:00 2001 From: Marco Strigl Date: Wed, 4 Mar 2020 15:03:14 +0000 Subject: [PATCH 08/10] - 0.168.0 * MR creation honors orev now (bsc#1160446) * allow "osc r --vertical" for projects * several typo fixes * cleanup old functions and remove python2.6 compat code * support zstd arch linux files in local build * fix deleterequest for repositories * append --norootforbuild as default to build command * fix decoding in interactive request mode * use signdummy for product builds * print release project when creating MR * improve SSLError message for TLSv1 validation * osc maintained --version prints the version of each maintained package * print web url links after creating requests (New general bool option 'print_web_links' must be set in oscrc) * fix checkout_no_colon on project level * handle empty release number of rpm packages in build.py * handle bytes vs. str error when parsing meta * custom exception if importing m2crypto fails * fix missing oscerr import in util.helper * several fixes for keyring handling * fix arch zst magic in util.packagequery OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/osc?expand=0&rev=324 --- PKGBUILD | 2 +- _service | 4 ++-- debian.changelog | 2 +- osc-0.167.2.tar.gz | 3 --- osc-0.168.0.tar.gz | 3 +++ osc.changes | 25 +++++++++++++++++++++++++ osc.dsc | 2 +- osc.spec | 4 ++-- 8 files changed, 35 insertions(+), 10 deletions(-) delete mode 100644 osc-0.167.2.tar.gz create mode 100644 osc-0.168.0.tar.gz diff --git a/PKGBUILD b/PKGBUILD index ec87b85..06ccae4 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,5 +1,5 @@ pkgname=osc -pkgver=0.167.2 +pkgver=0.168.0 pkgrel=0 pkgdesc="Open Build Service client" arch=('x86_64') diff --git a/_service b/_service index 4ae7b0c..5fcba37 100644 --- a/_service +++ b/_service @@ -1,7 +1,7 @@ - 0.167.2 - 0.167.2 + 0.168.0 + 0.168.0 git://github.com/openSUSE/osc.git git diff --git a/debian.changelog b/debian.changelog index d2d0ae5..c292ecc 100644 --- a/debian.changelog +++ b/debian.changelog @@ -1,4 +1,4 @@ -osc (0.167.2) unstable; urgency=low +osc (0.168.0) unstable; urgency=low - Package for Python3 -- Nick Brown Wed, 30 Jan 2020 14:49:30 +0000 diff --git a/osc-0.167.2.tar.gz b/osc-0.167.2.tar.gz deleted file mode 100644 index 902494b..0000000 --- a/osc-0.167.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b25c7866ac5be116b7ca43fac7dbcad18a4f1ca697199ac98ba8718a4e6ffac2 -size 362856 diff --git a/osc-0.168.0.tar.gz b/osc-0.168.0.tar.gz new file mode 100644 index 0000000..9f94ca7 --- /dev/null +++ b/osc-0.168.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:017c16c9d83a1440582d0a6698979c8993fe99a1477d7306623a7453dfe13a54 +size 364555 diff --git a/osc.changes b/osc.changes index f244753..8fee180 100644 --- a/osc.changes +++ b/osc.changes @@ -1,3 +1,28 @@ +------------------------------------------------------------------- +Wed Mar 4 09:27:41 UTC 2020 - Marco Strigl + +- 0.168.0 + * MR creation honors orev now (bsc#1160446) + * allow "osc r --vertical" for projects + * several typo fixes + * cleanup old functions and remove python2.6 compat code + * support zstd arch linux files in local build + * fix deleterequest for repositories + * append --norootforbuild as default to build command + * fix decoding in interactive request mode + * use signdummy for product builds + * print release project when creating MR + * improve SSLError message for TLSv1 validation + * osc maintained --version prints the version of each maintained package + * print web url links after creating requests (New general bool option 'print_web_links' must be set in oscrc) + * fix checkout_no_colon on project level + * handle empty release number of rpm packages in build.py + * handle bytes vs. str error when parsing meta + * custom exception if importing m2crypto fails + * fix missing oscerr import in util.helper + * several fixes for keyring handling + * fix arch zst magic in util.packagequery + ------------------------------------------------------------------- Fri Feb 28 12:27:27 UTC 2020 - Frederic Crozat diff --git a/osc.dsc b/osc.dsc index 1148734..d0d26e9 100644 --- a/osc.dsc +++ b/osc.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: osc -Version: 0.167.2 +Version: 0.168.0 Binary: osc Maintainer: Adrian Schroeter Architecture: any diff --git a/osc.spec b/osc.spec index 4979f03..c1f70bf 100644 --- a/osc.spec +++ b/osc.spec @@ -27,12 +27,12 @@ %define use_python python %endif -%define version_unconverted 0.167.2 +%define version_unconverted 0.168.0 %define osc_plugin_dir %{_prefix}/lib/osc-plugins %define macros_file macros.osc Name: osc -Version: 0.167.2 +Version: 0.168.0 Release: 0 Summary: Open Build Service Commander License: GPL-2.0-or-later From 0dabe50d6fff3265355c5895d7153e62fdb6027e Mon Sep 17 00:00:00 2001 From: Marco Strigl Date: Thu, 5 Mar 2020 07:43:09 +0000 Subject: [PATCH 09/10] added debian specific files as Source: to satisfy factory-auto bot OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/osc?expand=0&rev=325 --- osc.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/osc.spec b/osc.spec index c1f70bf..745fef3 100644 --- a/osc.spec +++ b/osc.spec @@ -39,6 +39,9 @@ License: GPL-2.0-or-later Group: Development/Tools/Other URL: https://github.com/openSUSE/osc Source: %{name}-%{version}.tar.gz +Source1: debian.dirs +Source2: debian.docs +Source3: debian.osc.links BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: %{use_python}-devel BuildRequires: %{use_python}-setuptools From 063edd506f44e1c203b98ca5e3489e913a0627d4 Mon Sep 17 00:00:00 2001 From: Marco Strigl Date: Thu, 5 Mar 2020 08:34:32 +0000 Subject: [PATCH 10/10] - Spec: * fix destination of fish completion file to /usr/share/fish/vendor_completions.d OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/osc?expand=0&rev=326 --- osc.changes | 6 ++++++ osc.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/osc.changes b/osc.changes index 8fee180..b0f3b9e 100644 --- a/osc.changes +++ b/osc.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Mar 5 08:30:46 UTC 2020 - Marco Strigl + +- Spec: + * fix destination of fish completion file to /usr/share/fish/vendor_completions.d + ------------------------------------------------------------------- Wed Mar 4 09:27:41 UTC 2020 - Marco Strigl diff --git a/osc.spec b/osc.spec index 745fef3..887c366 100644 --- a/osc.spec +++ b/osc.spec @@ -174,7 +174,7 @@ install -Dm0755 dist/osc.complete %{buildroot}%{_prefix}/lib/osc/complete install -Dm0755 dist/osc.complete %{buildroot}%{_libdir}/osc/complete %endif -install -Dm0755 osc.fish %{buildroot}%{_datadir}/fish/completions +install -Dm0755 osc.fish %{buildroot}%{_datadir}/fish/completions/vendor_completions.d/osc.fish install -m644 %{macros_file} -D %{buildroot}%{_sysconfdir}/rpm/%{macros_file}