From 75205763b960a8f00647883017b3d3d50451ac21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Mon, 15 Oct 2018 14:03:17 +0000 Subject: [PATCH 1/5] fix OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/osc?expand=0&rev=272 --- appimage.yml | 1 + osc.spec | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/appimage.yml b/appimage.yml index 4d36cec..1854844 100644 --- a/appimage.yml +++ b/appimage.yml @@ -26,6 +26,7 @@ script: - echo "Exec=osc" >> $BUILD_APPDIR/usr/share/applications/osc.desktop - echo "Icon=appimage" >> $BUILD_APPDIR/usr/share/applications/osc.desktop - echo "Type=Application" >> $BUILD_APPDIR/usr/share/applications/osc.desktop + - sed -e -i 's,^#!/usr/bin/python,#!/usr/bin/env python,' $BUILD_APPDIR/usr/bin/osc - linuxdeployqt $BUILD_APPDIR/usr/share/applications/*.desktop -bundle-non-qt-libs -verbose=2 diff --git a/osc.spec b/osc.spec index 00c467d..013186c 100644 --- a/osc.spec +++ b/osc.spec @@ -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/ # From 697ba26d5727a7d59118d7d1de5706ffeef775bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Mon, 15 Oct 2018 14:11:24 +0000 Subject: [PATCH 2/5] ups OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/osc?expand=0&rev=273 --- appimage.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appimage.yml b/appimage.yml index 1854844..ba43783 100644 --- a/appimage.yml +++ b/appimage.yml @@ -26,7 +26,7 @@ script: - echo "Exec=osc" >> $BUILD_APPDIR/usr/share/applications/osc.desktop - echo "Icon=appimage" >> $BUILD_APPDIR/usr/share/applications/osc.desktop - echo "Type=Application" >> $BUILD_APPDIR/usr/share/applications/osc.desktop - - sed -e -i 's,^#!/usr/bin/python,#!/usr/bin/env python,' $BUILD_APPDIR/usr/bin/osc + - sed -i -e 's,^#!/usr/bin/python,#!/usr/bin/env python,' $BUILD_APPDIR/usr/bin/osc - linuxdeployqt $BUILD_APPDIR/usr/share/applications/*.desktop -bundle-non-qt-libs -verbose=2 From d38fa712a906d7174b3262c1ee42c1820be5011c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Mon, 15 Oct 2018 14:16:09 +0000 Subject: [PATCH 3/5] size down OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/osc?expand=0&rev=274 --- appimage.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/appimage.yml b/appimage.yml index ba43783..cd13725 100644 --- a/appimage.yml +++ b/appimage.yml @@ -9,10 +9,10 @@ ingredients: - build - osc - python-yaml - - obs-service-obs_scm - - obs-service-tar_scm - - obs-service-set_version - - obs-service-recompress +# - obs-service-obs_scm +# - obs-service-tar_scm +# - obs-service-set_version +# - obs-service-recompress - openSUSE-release - openSUSE-release-ftp - rsync From 56da657c00770745498ce3748f22719eabba0426 Mon Sep 17 00:00:00 2001 From: Lars Vogdt Date: Fri, 11 Jan 2019 16:53:07 +0000 Subject: [PATCH 4/5] Accepting request 664116 from home:mstrigl:branches:openSUSE:Tools - 0.164.0 - add support for approved requests (requires OBS 2.10) - fix various multibuild problems - improved and fixed various help texts - check constraints without local checkout - check out deleted sources (osc co -D) - replace urlgrabber module with own module - use progressbar module instead of urlgrabber to draw progress bars - show buildinfo for alternative projects (--alternative-project) - run release job immediately (osc release --no-delay) - build results on project level can now be watched (osc prjresults --watch) - removed python-urlgrabber requieres. (Not used with 0.164.0) - added recommends for python[2]-progressbar OBS-URL: https://build.opensuse.org/request/show/664116 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/osc?expand=0&rev=275 --- PKGBUILD | 2 +- _service | 4 ++-- debian.changelog | 2 +- osc-0.163.0.tar.gz | 3 --- osc-0.164.0.tar.gz | 3 +++ osc.changes | 18 ++++++++++++++++++ osc.dsc | 2 +- osc.spec | 14 ++++++-------- 8 files changed, 32 insertions(+), 16 deletions(-) delete mode 100644 osc-0.163.0.tar.gz create mode 100644 osc-0.164.0.tar.gz diff --git a/PKGBUILD b/PKGBUILD index 74c67d3..0472393 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,5 +1,5 @@ pkgname=osc -pkgver=0.163.0 +pkgver=0.164.0 pkgrel=0 pkgdesc="Open Build Service client" arch=('i686' 'x86_64') diff --git a/_service b/_service index fd6bcd2..90a50d3 100644 --- a/_service +++ b/_service @@ -1,7 +1,7 @@ - 0.163.0 - 0.163.0 + 0.164.0 + 0.164.0 git://github.com/openSUSE/osc.git git diff --git a/debian.changelog b/debian.changelog index 9aec2a7..e6643a7 100644 --- a/debian.changelog +++ b/debian.changelog @@ -1,4 +1,4 @@ -osc (0.163.0) unstable; urgency=low +osc (0.164.0) unstable; urgency=low - Update to 0.161.1 -- Marco Strigl Thu, 26 Oct 2017 14:42:00 +0200 diff --git a/osc-0.163.0.tar.gz b/osc-0.163.0.tar.gz deleted file mode 100644 index 4ad7342..0000000 --- a/osc-0.163.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ce76272cb6359c2bcfa94c9990621bf717adfb5357137ceb43268ea123bafd91 -size 354455 diff --git a/osc-0.164.0.tar.gz b/osc-0.164.0.tar.gz new file mode 100644 index 0000000..3ae8d9b --- /dev/null +++ b/osc-0.164.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1d722b40b145a5791d1d00bbf510dba63b29d51a777a13fae7cc4724493a88e0 +size 355348 diff --git a/osc.changes b/osc.changes index 4d70884..0985ab9 100644 --- a/osc.changes +++ b/osc.changes @@ -1,3 +1,21 @@ +------------------------------------------------------------------- +Wed Jan 9 12:44:29 UTC 2019 - marco.strigl@suse.com + +- 0.164.0 + - add support for approved requests (requires OBS 2.10) + - fix various multibuild problems + - improved and fixed various help texts + - check constraints without local checkout + - check out deleted sources (osc co -D) + - replace urlgrabber module with own module + - use progressbar module instead of urlgrabber to draw + progress bars + - show buildinfo for alternative projects (--alternative-project) + - run release job immediately (osc release --no-delay) + - build results on project level can now be watched (osc prjresults --watch) +- removed python-urlgrabber requieres. (Not used with 0.164.0) +- added recommends for python[2]-progressbar + ------------------------------------------------------------------- Mon Aug 20 11:24:25 UTC 2018 - Adrian Schröter diff --git a/osc.dsc b/osc.dsc index fdc336e..548fbff 100644 --- a/osc.dsc +++ b/osc.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: osc -Version: 0.163.0 +Version: 0.164.0 Binary: osc Maintainer: Adrian Schroeter Architecture: any diff --git a/osc.spec b/osc.spec index 013186c..cc61602 100644 --- a/osc.spec +++ b/osc.spec @@ -1,7 +1,7 @@ # # spec file for package osc # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# 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 @@ -12,16 +12,16 @@ # 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/ # -%define version_unconverted 0.163.0 +%define version_unconverted 0.164.0 %define osc_plugin_dir %{_prefix}/lib/osc-plugins %define macros_file macros.osc Name: osc -Version: 0.163.0 +Version: 0.164.0 Release: 0 Summary: Open Build Service Commander License: GPL-2.0-or-later @@ -29,10 +29,6 @@ Group: Development/Tools/Other Url: https://github.com/openSUSE/osc Source: %{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build -%if 0%{?mandriva_version} < 02010 -BuildRequires: python-urlgrabber -Requires: python-urlgrabber -%endif BuildRequires: python-devel %if 0%{?mandriva_version} || 0%{?mageia} BuildRequires: python-rpm @@ -45,8 +41,10 @@ Requires: rpm-python %if 0%{?suse_version} %if 0%{?suse_version} >= 1500 Requires: python2 +Recommends: python2-progressbar %else Requires: python +Recommends: python-progressbar %endif %if 0%{?suse_version} < 1020 BuildRequires: python-elementtree From d9d8f8ecf9d8dd41916cd41eb612ecac985901b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcus=20H=C3=BCwe?= Date: Wed, 16 Jan 2019 14:44:18 +0000 Subject: [PATCH 5/5] Accepting request 666488 from home:mstrigl:branches:openSUSE:Tools - 0.164.1 - rewrite cpio handling to support python3 - rewrite ar module to support python3 - enable fetch module to support python3 - rework progressbar hanlding (if module is not present) - improve os_path_samefile in core.py OBS-URL: https://build.opensuse.org/request/show/666488 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/osc?expand=0&rev=276 --- PKGBUILD | 2 +- _service | 4 ++-- debian.changelog | 2 +- osc-0.164.0.tar.gz | 3 --- osc-0.164.1.tar.gz | 3 +++ osc.changes | 10 ++++++++++ osc.dsc | 2 +- osc.spec | 4 ++-- 8 files changed, 20 insertions(+), 10 deletions(-) delete mode 100644 osc-0.164.0.tar.gz create mode 100644 osc-0.164.1.tar.gz diff --git a/PKGBUILD b/PKGBUILD index 0472393..1c77d6a 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,5 +1,5 @@ pkgname=osc -pkgver=0.164.0 +pkgver=0.164.1 pkgrel=0 pkgdesc="Open Build Service client" arch=('i686' 'x86_64') diff --git a/_service b/_service index 90a50d3..7dffff5 100644 --- a/_service +++ b/_service @@ -1,7 +1,7 @@ - 0.164.0 - 0.164.0 + 0.164.1 + 0.164.1 git://github.com/openSUSE/osc.git git diff --git a/debian.changelog b/debian.changelog index e6643a7..3b513a8 100644 --- a/debian.changelog +++ b/debian.changelog @@ -1,4 +1,4 @@ -osc (0.164.0) unstable; urgency=low +osc (0.164.1) unstable; urgency=low - Update to 0.161.1 -- Marco Strigl Thu, 26 Oct 2017 14:42:00 +0200 diff --git a/osc-0.164.0.tar.gz b/osc-0.164.0.tar.gz deleted file mode 100644 index 3ae8d9b..0000000 --- a/osc-0.164.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1d722b40b145a5791d1d00bbf510dba63b29d51a777a13fae7cc4724493a88e0 -size 355348 diff --git a/osc-0.164.1.tar.gz b/osc-0.164.1.tar.gz new file mode 100644 index 0000000..d546b7a --- /dev/null +++ b/osc-0.164.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d47682ac9a5ed45ea34f69e357845c5f06899a674d53eafd3938efd81bd647ec +size 354855 diff --git a/osc.changes b/osc.changes index 0985ab9..8e13899 100644 --- a/osc.changes +++ b/osc.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Wed Jan 16 13:11:41 UTC 2019 - marco.strigl@suse.com + +- 0.164.1 + - rewrite cpio handling to support python3 + - rewrite ar module to support python3 + - enable fetch module to support python3 + - rework progressbar hanlding (if module is not present) + - improve os_path_samefile in core.py + ------------------------------------------------------------------- Wed Jan 9 12:44:29 UTC 2019 - marco.strigl@suse.com diff --git a/osc.dsc b/osc.dsc index 548fbff..b754639 100644 --- a/osc.dsc +++ b/osc.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: osc -Version: 0.164.0 +Version: 0.164.1 Binary: osc Maintainer: Adrian Schroeter Architecture: any diff --git a/osc.spec b/osc.spec index cc61602..8fdcc9d 100644 --- a/osc.spec +++ b/osc.spec @@ -16,12 +16,12 @@ # -%define version_unconverted 0.164.0 +%define version_unconverted 0.164.1 %define osc_plugin_dir %{_prefix}/lib/osc-plugins %define macros_file macros.osc Name: osc -Version: 0.164.0 +Version: 0.164.1 Release: 0 Summary: Open Build Service Commander License: GPL-2.0-or-later