From f027d4cd9aa661379447bd4f2327187f050d7a099ab5e47e85ed8ce0e6469498 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Thu, 24 Oct 2019 09:14:08 +0000 Subject: [PATCH 1/2] fix build OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/osc?expand=0&rev=300 --- appimage.yml | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/appimage.yml b/appimage.yml index b43e07e..ad8a33e 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 @@ -21,12 +21,13 @@ script: - mkdir -p $BUILD_APPDIR/usr/share/pixmaps - cp /usr/share/pixmaps/appimage.png $BUILD_APPDIR/usr/share/pixmaps - mkdir -p $BUILD_APPDIR/usr/share/applications - - echo "[Desktop Entry]" > $BUILD_APPDIR/usr/share/applications/osc.desktop - - echo "Name=osc" >> $BUILD_APPDIR/usr/share/applications/osc.desktop - - 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 -i -e 's,^#!/usr/bin/python,#!/usr/bin/env python,' $BUILD_APPDIR/usr/bin/osc + - echo "[Desktop Entry]" > $BUILD_APPDIR/usr/share/applications/osc.desktop + - echo "Name=osc" >> $BUILD_APPDIR/usr/share/applications/osc.desktop + - echo "Exec=osc" >> $BUILD_APPDIR/usr/share/applications/osc.desktop + - 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 - linuxdeployqt $BUILD_APPDIR/usr/share/applications/*.desktop -bundle-non-qt-libs -verbose=2 From 955c50b282663847ef19a8595dca9b0d5d7d32bb8c3d80c788fec3c8360e96bb Mon Sep 17 00:00:00 2001 From: Marcus Rueckert Date: Mon, 28 Oct 2019 12:57:07 +0000 Subject: [PATCH 2/2] Accepting request 743489 from home:mstrigl:branches:openSUSE:Tools - 0.166.0 (boo#1154972) * New password handling backend. Supported password stores: - Plaintext password - Obfuscated password - python-keyring (kwallet, secret store) - gnome-keyring - no store at all (ask for the password every time * Refactor initial setup of osc (to select password store) * fix decoding on osc lbl (boo#1137477) * fix breakage of submitting complete branches back as an submit request that contain packages without a change. * fix error with plugins and osc -h * various decoding improvements * Transfer the name of the input file to vc instead of the content (obs-build/vc will do the rest and open the file). * support appimage builds * new command browse. (opens a browser opening the project or package) * new option --incoming for osc rq and osc review to only show only incoming reqeusts for a project. - new Recommends for xdg-utils. osc-browse uses xdg-open to open the url to the project/package in an internet browser OBS-URL: https://build.opensuse.org/request/show/743489 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/osc?expand=0&rev=301 --- PKGBUILD | 2 +- _service | 4 ++-- debian.changelog | 2 +- osc-0.165.4.tar.gz | 3 --- osc-0.166.0.tar.gz | 3 +++ osc.changes | 25 +++++++++++++++++++++++++ osc.dsc | 2 +- osc.spec | 5 +++-- 8 files changed, 36 insertions(+), 10 deletions(-) delete mode 100644 osc-0.165.4.tar.gz create mode 100644 osc-0.166.0.tar.gz diff --git a/PKGBUILD b/PKGBUILD index 324ef7d..641d2ea 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,5 +1,5 @@ pkgname=osc -pkgver=0.165.4 +pkgver=0.166.0 pkgrel=0 pkgdesc="Open Build Service client" arch=('i686' 'x86_64') diff --git a/_service b/_service index 471b32d..a8056e1 100644 --- a/_service +++ b/_service @@ -1,7 +1,7 @@ - 0.165.4 - 0.165.4 + 0.166.0 + 0.166.0 git://github.com/openSUSE/osc.git git diff --git a/debian.changelog b/debian.changelog index a165582..c33c7d2 100644 --- a/debian.changelog +++ b/debian.changelog @@ -1,4 +1,4 @@ -osc (0.165.4) unstable; urgency=low +osc (0.166.0) unstable; urgency=low - Update to 0.161.1 -- Marco Strigl Thu, 26 Oct 2017 14:42:00 +0200 diff --git a/osc-0.165.4.tar.gz b/osc-0.165.4.tar.gz deleted file mode 100644 index 23d565f..0000000 --- a/osc-0.165.4.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a05ea69877c95736b6925d0cf0a37f1ea76d195b00347c42b81ab4da1c3dfcbc -size 359042 diff --git a/osc-0.166.0.tar.gz b/osc-0.166.0.tar.gz new file mode 100644 index 0000000..5f1ee53 --- /dev/null +++ b/osc-0.166.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f94fb7fcd691316fe6e880d0c8f75efda2187e70b28d3e5acd17ab4797cf5f23 +size 361812 diff --git a/osc.changes b/osc.changes index 40b804e..7456d2e 100644 --- a/osc.changes +++ b/osc.changes @@ -1,3 +1,28 @@ +------------------------------------------------------------------- +Thu Oct 24 10:05:06 UTC 2019 - Marco Strigl + +- 0.166.0 (boo#1154972) + * New password handling backend. Supported password stores: + - Plaintext password + - Obfuscated password + - python-keyring (kwallet, secret store) + - gnome-keyring + - no store at all (ask for the password every time + * Refactor initial setup of osc (to select password store) + * fix decoding on osc lbl (boo#1137477) + * fix breakage of submitting complete branches back as an + submit request that contain packages without a change. + * fix error with plugins and osc -h + * various decoding improvements + * Transfer the name of the input file to vc instead of the content + (obs-build/vc will do the rest and open the file). + * support appimage builds + * new command browse. (opens a browser opening the project or package) + * new option --incoming for osc rq and osc review to only show only + incoming reqeusts for a project. +- new Recommends for xdg-utils. osc-browse uses xdg-open to open + the url to the project/package in an internet browser + ------------------------------------------------------------------- Mon Aug 5 06:51:32 UTC 2019 - Marco Strigl diff --git a/osc.dsc b/osc.dsc index 9523d1a..5b340a6 100644 --- a/osc.dsc +++ b/osc.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: osc -Version: 0.165.4 +Version: 0.166.0 Binary: osc Maintainer: Adrian Schroeter Architecture: any diff --git a/osc.spec b/osc.spec index 080cf95..26072a0 100644 --- a/osc.spec +++ b/osc.spec @@ -27,12 +27,12 @@ %define use_python python %endif -%define version_unconverted 0.165.4 +%define version_unconverted 0.166.0 %define osc_plugin_dir %{_prefix}/lib/osc-plugins %define macros_file macros.osc Name: osc -Version: 0.165.4 +Version: 0.166.0 Release: 0 Summary: Open Build Service Commander License: GPL-2.0-or-later @@ -82,6 +82,7 @@ Recommends: obs-service-verify_file Recommends: obs-service-download_files Recommends: obs-service-format_spec_file Recommends: obs-service-source_validator +Recommends: xdg-utils %endif %endif # needed for storing credentials in kwallet/gnome-keyring