From 79dfc87e11e02aad40ec3dd8cab291ea2635b08f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Mon, 11 Dec 2017 08:40:27 +0000 Subject: [PATCH 1/4] simplify OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/osc?expand=0&rev=264 --- appimage.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/appimage.yml b/appimage.yml index 41eeafd..4d36cec 100644 --- a/appimage.yml +++ b/appimage.yml @@ -27,6 +27,5 @@ script: - echo "Icon=appimage" >> $BUILD_APPDIR/usr/share/applications/osc.desktop - echo "Type=Application" >> $BUILD_APPDIR/usr/share/applications/osc.desktop - linuxdeployqt $BUILD_APPDIR/usr/share/applications/*.desktop -bundle-non-qt-libs -verbose=2 - - linuxdeployqt $BUILD_APPDIR/usr/share/applications/*.desktop -bundle-non-qt-libs -verbose=2 From d031bf30bce6e14eeb1b36853e0451973fed3b95 Mon Sep 17 00:00:00 2001 From: Marco Strigl Date: Fri, 29 Jun 2018 07:28:51 +0000 Subject: [PATCH 2/4] - add Requires: python2 / python for Leap and Tumbleweed. Otherwise just python-base is installed which does not contain ssl.py [bnc#1097996] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/osc?expand=0&rev=265 --- osc.changes | 7 +++++++ osc.spec | 9 +++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/osc.changes b/osc.changes index bc6e76e..2980f8b 100644 --- a/osc.changes +++ b/osc.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Jun 29 07:23:57 UTC 2018 - marco.strigl@suse.com + +- add Requires: python2 / python for Leap and Tumbleweed. + Otherwise just python-base is installed which does not contain ssl.py + [bnc#1097996] + ------------------------------------------------------------------- Tue Dec 5 13:41:04 UTC 2017 - marco.strigl@suse.com diff --git a/osc.spec b/osc.spec index 6ad9334..d8fcb9a 100644 --- a/osc.spec +++ b/osc.spec @@ -1,7 +1,7 @@ # # spec file for package osc # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 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 @@ -24,7 +24,7 @@ Name: osc Version: 0.162.1 Release: 0 Summary: Open Build Service Commander -License: GPL-2.0+ +License: GPL-2.0-or-later Group: Development/Tools/Other Url: https://github.com/openSUSE/osc Source: %{name}-%{version}.tar.gz @@ -43,6 +43,11 @@ Requires: rpm-python %endif # %if 0%{?suse_version} +%if 0%{?suse_version} >= 1500 +Requires: python2 +%else +Requires: python +%endif %if 0%{?suse_version} < 1020 BuildRequires: python-elementtree Requires: python-elementtree From 8b4d3b0bc1afe4197bde117bd443f2229d4ea305 Mon Sep 17 00:00:00 2001 From: Marco Strigl Date: Fri, 29 Jun 2018 11:01:56 +0000 Subject: [PATCH 3/4] modified changelog entry to correct version OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/osc?expand=0&rev=266 --- osc.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osc.changes b/osc.changes index 2980f8b..bf14879 100644 --- a/osc.changes +++ b/osc.changes @@ -1,7 +1,7 @@ ------------------------------------------------------------------- Fri Jun 29 07:23:57 UTC 2018 - marco.strigl@suse.com -- add Requires: python2 / python for Leap and Tumbleweed. +- add Requires: python2 for Tumbleweed. Otherwise just python-base is installed which does not contain ssl.py [bnc#1097996] From dae7241a391482e544ba5292edec3e321ff015e4 Mon Sep 17 00:00:00 2001 From: Marco Strigl Date: Fri, 29 Jun 2018 13:03:02 +0000 Subject: [PATCH 4/4] added modification from adrian to changes file Diff for working copy: . Index: osc.changes =================================================================== --- osc.changes (revision 0c1c480d00eac42ba775cf43b25a0662) +++ osc.changes (working copy) @@ -3,7 +3,8 @@ - add Requires: python2 for Tumbleweed. Otherwise just python-base is installed which does not contain ssl.py - [bnc#1097996] + [bnc#1097996] +- removed duplicate entry in appimage.yml to prevent double builds ------------------------------------------------------------------- Tue Dec 5 13:41:04 UTC 2017 - marco.strigl@suse.com OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/osc?expand=0&rev=267 --- osc.changes | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/osc.changes b/osc.changes index bf14879..31501e3 100644 --- a/osc.changes +++ b/osc.changes @@ -3,7 +3,8 @@ Fri Jun 29 07:23:57 UTC 2018 - marco.strigl@suse.com - add Requires: python2 for Tumbleweed. Otherwise just python-base is installed which does not contain ssl.py - [bnc#1097996] + [bnc#1097996] +- removed duplicate entry in appimage.yml to prevent double builds ------------------------------------------------------------------- Tue Dec 5 13:41:04 UTC 2017 - marco.strigl@suse.com