dmach/osc-fork
1
0
Fork 0
forked from pool/osc
Code Pull Requests Activity

Accepting request 619777 from openSUSE:Tools

Browse Source 
- 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
This commit is contained in:
Dominique Leuenberger 2018-06-29 20:37:10 +00:00 committed by Git OBS Bridge
commit 6afef9b980
3 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
appimage.yml
View File

@ -27,6 +27,5 @@ script:
- echo "Icon=appimage" >> $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 - 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
- linuxdeployqt $BUILD_APPDIR/usr/share/applications/*.desktop -bundle-non-qt-libs -verbose=2

8
osc.changes
View File

@ -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 Tue Dec 5 13:41:04 UTC 2017 - marco.strigl@suse.com

9
osc.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package osc # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -24,7 +24,7 @@ Name: osc
Version: 0.162.1 Version: 0.162.1
Release: 0 Release: 0
Summary: Open Build Service Commander Summary: Open Build Service Commander
License: GPL-2.0+ License: GPL-2.0-or-later
Group: Development/Tools/Other Group: Development/Tools/Other
Url: https://github.com/openSUSE/osc Url: https://github.com/openSUSE/osc
Source: %{name}-%{version}.tar.gz Source: %{name}-%{version}.tar.gz
@ -43,6 +43,11 @@ Requires: rpm-python
%endif %endif
# #
%if 0%{?suse_version} %if 0%{?suse_version}
%if 0%{?suse_version} >= 1500
Requires: python2
%else
Requires: python
%endif
%if 0%{?suse_version} < 1020 %if 0%{?suse_version} < 1020
BuildRequires: python-elementtree BuildRequires: python-elementtree
Requires: python-elementtree Requires: python-elementtree