#1 Do not depend on both Python2/Python3
Merged 2 years ago by besser82. Opened 2 years ago by troycurtisjr.
https://gitlab.com/troycurtisjr/fedora-pkg-xapps.git python-requires  into  master

Remove unnecessary python2 dependency.
Troy Curtis Jr • 2 years ago  
xapps.spec
file modified
+8 -3

@@ -1,6 +1,6 @@

  Name:           xapps

  Version:        1.0.4

- Release:        3%{?dist}

+ Release:        4%{?dist}

  Summary:        Common files for XApp desktop apps

  

  License:        LGPLv2+

@@ -27,7 +27,6 @@

  Requires:       inxi

  Requires:       xdg-utils

  Requires:       fpaste

- Requires:       python2-xapps-overrides%{?_isa} = %{version}-%{release}

  Provides:       python3-xapps-overrides%{?_isa} = %{version}-%{release}

  

  %description

@@ -37,6 +36,7 @@

  %package     -n python2-xapps-overrides

  Summary:        Python2 files for %{name}

  Requires:       python2-gobject-base

+ Requires:       %{name}%{?_isa} = %{version}-%{release}

  

  %description -n python2-xapps-overrides

  Python2 files for XApp apps.

@@ -71,13 +71,14 @@

  mkdir -p build-py2 build-py3

  cp -Rp files/ build-py2/

  pushd build-py2 

+ export PYTHON=%{__python2}

  %configure

  sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool

  %make_build V=1

  popd

  

  pushd build-py3

- export PYTHON=python3

+ export PYTHON=%{__python3}

  %configure

  popd

  

@@ -137,6 +138,10 @@

  

  

  %changelog

+ * Mon Nov 13 2017 Troy Curtis, Jr <troycurtisjr@gmail.com> - 1.0.4-4

+ - Have python2-xapps-overrides require xapps instead of the other way around.

+ - Use python macros

+ 

  * Sat Nov 11 2017 Leigh Scott <leigh123linux@googlemail.com> - 1.0.4-3

  - Add requires python2-gobject-base

  

no initial comment

Here is my suggested resolution of https://bugzilla.redhat.com/show_bug.cgi?id=1509706

Note that this split requires an update to the cinnamon package requires as well, in a PR to be submitted shortly. No other packages with an 'xapps require' appear to have python xapps introspection requirements.

Pull-Request has been merged by besser82

2 years ago
Metadata