Accepting request 619777 from openSUSE:Tools

- add Requires: python2 for Tumbleweed. 
  Otherwise just python-base is installed which does not contain ssl.py
  [bnc#1097996]
- removed duplicate entry in appimage.yml to prevent double builds

OBS-URL: https://build.opensuse.org/request/show/619777
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/osc?expand=0&rev=126

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
 
 

osc.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+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]
+- removed duplicate entry in appimage.yml to prevent double builds 
+
 -------------------------------------------------------------------
 Tue Dec  5 13:41:04 UTC 2017 - marco.strigl@suse.com
 

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