From 5e07b4fa7899bc70ed82c109fcc608ef2a2256d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Tue, 23 May 2023 07:00:14 +0000 Subject: [PATCH 1/2] Accepting request 1088528 from home:dmach:branches:openSUSE:Tools Fix building AppImage: - change shebang from /usr/bin/env python3 to /usr/bin/python3 to use the interpreter from the image - also update packages to list all obs services and scm-bridge OBS-URL: https://build.opensuse.org/request/show/1088528 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/osc?expand=0&rev=401 --- appimage.yml | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/appimage.yml b/appimage.yml index 6ecab88..38e4b19 100644 --- a/appimage.yml +++ b/appimage.yml @@ -8,15 +8,18 @@ ingredients: packages: - build - osc - - python-yaml + - obs-scm-bridge + - obs-service-download_files + - obs-service-format_spec_file - obs-service-obs_scm - - obs-service-tar_scm - - obs-service-set_version - obs-service-recompress + - obs-service-set_version + - obs-service-tar_scm + - obs-service-verify_file - openSUSE-release - openSUSE-release-ftp - rsync - + script: - mkdir -p $BUILD_APPDIR/usr/share/pixmaps - cp /usr/share/pixmaps/appimage.png $BUILD_APPDIR/usr/share/pixmaps @@ -27,7 +30,7 @@ script: - echo "Icon=appimage" >> $BUILD_APPDIR/usr/share/applications/osc.desktop - echo "Categories=Development" >> $BUILD_APPDIR/usr/share/applications/osc.desktop - echo "Type=Application" >> $BUILD_APPDIR/usr/share/applications/osc.desktop -# - sed -i -e 's,^#!/usr/bin/python,#!/usr/bin/env python,' $BUILD_APPDIR/usr/bin/osc + # /usr/bin/python3 would run system python3 with libs from the appimage + # while /usr/bin/env python3 uses the correct binary from the appimage + - sed -i -e 's,^#!/usr/bin/python3,#!/usr/bin/env python3,' $BUILD_APPDIR/usr/bin/osc - linuxdeployqt $BUILD_APPDIR/usr/share/applications/*.desktop -bundle-non-qt-libs -verbose=2 - - From 7ce9edb4de30428028a48a0686177a2d6879b0a7 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Thu, 25 May 2023 11:13:22 +0000 Subject: [PATCH 2/2] Accepting request 1088780 from home:dmach:branches:openSUSE:Tools - 1.1.4 - Command-line: - Change 'review list' command to display open requests (state: new, review, declined) - Fix running osc in an AppImage by switching to the correct working directory - Handle ProtocolError exception - Library: - Add 'req_states' parameter to osc.core.get_review_list() - Connection: - Fix grabber to work with old urllib3 versions that do not contain URLSchemeUnknown exception OBS-URL: https://build.opensuse.org/request/show/1088780 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/osc?expand=0&rev=402 --- PKGBUILD | 2 +- debian.changelog | 2 +- osc-1.1.3.tar.gz | 3 --- osc-1.1.4.tar.gz | 3 +++ osc.changes | 13 +++++++++++++ osc.dsc | 2 +- osc.spec | 2 +- 7 files changed, 20 insertions(+), 7 deletions(-) delete mode 100644 osc-1.1.3.tar.gz create mode 100644 osc-1.1.4.tar.gz diff --git a/PKGBUILD b/PKGBUILD index cff4208..1d30e97 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,5 +1,5 @@ pkgname=osc -pkgver=1.1.3 +pkgver=1.1.4 pkgrel=0 pkgdesc="Command-line client for the Open Build Service" arch=('x86_64') diff --git a/debian.changelog b/debian.changelog index 3c453ca..92fc65e 100644 --- a/debian.changelog +++ b/debian.changelog @@ -1,4 +1,4 @@ -osc (1.1.3-0) unstable; urgency=low +osc (1.1.4-0) unstable; urgency=low * Placeholder diff --git a/osc-1.1.3.tar.gz b/osc-1.1.3.tar.gz deleted file mode 100644 index f65e14c..0000000 --- a/osc-1.1.3.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bf390a6b6e532ce02bc009368f21212748fa64313d9caee3d3d3f2cbdc55b3c8 -size 330955 diff --git a/osc-1.1.4.tar.gz b/osc-1.1.4.tar.gz new file mode 100644 index 0000000..6c0a2fd --- /dev/null +++ b/osc-1.1.4.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8407ccdcaa6089601e3b9f42c03c015d938ba756b1553f65e2eb122ff00b83e5 +size 331686 diff --git a/osc.changes b/osc.changes index a671ce5..082890e 100644 --- a/osc.changes +++ b/osc.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Wed May 24 07:02:31 UTC 2023 - Daniel Mach + +- 1.1.4 + - Command-line: + - Change 'review list' command to display open requests (state: new, review, declined) + - Fix running osc in an AppImage by switching to the correct working directory + - Handle ProtocolError exception + - Library: + - Add 'req_states' parameter to osc.core.get_review_list() + - Connection: + - Fix grabber to work with old urllib3 versions that do not contain URLSchemeUnknown exception + ------------------------------------------------------------------- Wed May 10 07:12:59 UTC 2023 - Daniel Mach diff --git a/osc.dsc b/osc.dsc index 3a15cc4..830fd75 100644 --- a/osc.dsc +++ b/osc.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: osc -Version: 1.1.3-0 +Version: 1.1.4-0 Binary: osc Maintainer: Adrian Schroeter Architecture: any diff --git a/osc.spec b/osc.spec index 80840b8..02fc687 100644 --- a/osc.spec +++ b/osc.spec @@ -49,7 +49,7 @@ %endif Name: osc -Version: 1.1.3 +Version: 1.1.4 Release: 0 Summary: Command-line client for the Open Build Service License: GPL-2.0-or-later