diff --git a/nautilus-python.spec b/nautilus-python.spec index 184f0ad..4e54629 100644 --- a/nautilus-python.spec +++ b/nautilus-python.spec @@ -13,16 +13,19 @@ Name: nautilus-python Version: 1.2.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Python bindings for Nautilus -Group: Development/Libraries License: GPLv2+ URL: http://www.gnome.org/ Source0: http://ftp.gnome.org/pub/GNOME/sources/%{name}/%(v=%{version}; echo ${v:0:3}; )/%{name}-%{version}.tar.xz +%if %{with python2} BuildRequires: python2-devel +%endif +%if %{with python3} BuildRequires: python3-devel +%endif BuildRequires: nautilus-devel BuildRequires: pygobject3-devel BuildRequires: gtk-doc @@ -41,9 +44,9 @@ Summary: %summary Requires: nautilus >= 3.0 %{?python_provide:%python_provide python2-nautilus} # Remove before F30 -Provides: nautilus-python = %{version}-%{release} -Provides: nautilus-python%{?_isa} = %{version}-%{release} -Obsoletes: nautilus-python < %{version}-%{release} +Provides: %{name} = %{version}-%{release} +Provides: %{name}%{?_isa} = %{version}-%{release} +Obsoletes: %{name} < %{version}-%{release} %description -n python2-nautilus %_description @@ -103,11 +106,25 @@ popd %install -%if %{with python2} -%make_install DESTDIR=$RPM_BUILD_ROOT -%endif +# need to install build with python3 first because it could overwrite default build %if %{with python3} %make_install DESTDIR=$RPM_BUILD_ROOT -C python3 +mv $RPM_BUILD_ROOT%{_libdir}/nautilus/extensions-3.0/lib%{name}.so \ + $RPM_BUILD_ROOT%{_libdir}/nautilus/extensions-3.0/lib%{name}3.so +# install symlink for backwards compatibility +%if 0 +# TODO enable symlink when nautilus ported to support python3 ยด +ln -fs lib%{name}3.so \ + $RPM_BUILD_ROOT%{_libdir}/nautilus/extensions-3.0/lib%{name}.so +%endif +%endif +%if %{with python2} +%make_install DESTDIR=$RPM_BUILD_ROOT +mv $RPM_BUILD_ROOT%{_libdir}/nautilus/extensions-3.0/lib%{name}.so \ + $RPM_BUILD_ROOT%{_libdir}/nautilus/extensions-3.0/lib%{name}2.so +# install symlink for backwards compatibility +ln -fs lib%{name}2.so \ + $RPM_BUILD_ROOT%{_libdir}/nautilus/extensions-3.0/lib%{name}.so %endif mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/extensions find $RPM_BUILD_ROOT -name '*.la' -delete @@ -116,20 +133,20 @@ rm -rfv $RPM_BUILD_ROOT%{_docdir} %check %if %{with test_examples} -install -m0755 -d ~/.local/share/nautilus-python/extensions +install -m0755 -d ~/.local/share/%{name}/extensions %if %{with python2} -install -m0644 -p -t ~/.local/share/nautilus-python/extensions python3/examples/*.py* +install -m0644 -p -t ~/.local/share/%{name}/extensions examples/*.py* export TMPDIR=$(pwd)/examples # FIXME dbus service, rhbz#1623781 xvfb-run -a -d dbus-launch --exit-with-x11 nautilus -c -rm -v ~/.local/share/nautilus-python/extensions/*.py* +rm -v ~/.local/share/%{name}/extensions/*.py* %endif %if %{with python3} -install -m0644 -p -t ~/.local/share/nautilus-python/extensions python3/examples/*.py* +install -m0644 -p -t ~/.local/share/%{name}/extensions python3/examples/*.py* export TMPDIR=$(pwd)/python3/examples # TODO does nautilus work with python3? #xvfb-run -a -d dbus-launch --exit-with-x11 nautilus -c -rm -v ~/.local/share/nautilus-python/extensions/*.py* +rm -v ~/.local/share/%{name}/extensions/*.py* %endif %endif @@ -138,7 +155,8 @@ rm -v ~/.local/share/nautilus-python/extensions/*.py* %files -n python2-nautilus %license COPYING %doc README AUTHORS NEWS -%{_libdir}/nautilus/extensions-%{NAUTILUS_MAYOR_VER}/lib%{name}.so +%{_libdir}/nautilus/extensions-%{NAUTILUS_MAYOR_VER}/lib%{name}*.so +%exclude %{_libdir}/nautilus/extensions-%{NAUTILUS_MAYOR_VER}/lib%{name}3.so %dir %{_datadir}/%{name}/extensions %files -n python2-nautilus-devel @@ -151,7 +169,9 @@ rm -v ~/.local/share/nautilus-python/extensions/*.py* %files -n python3-nautilus %license COPYING %doc README AUTHORS NEWS -%{_libdir}/nautilus/extensions-%{NAUTILUS_MAYOR_VER}/lib%{name}.so +%{_libdir}/nautilus/extensions-%{NAUTILUS_MAYOR_VER}/lib%{name}3.so +%exclude %{_libdir}/nautilus/extensions-%{NAUTILUS_MAYOR_VER}/lib%{name}2.so +%exclude %{_libdir}/nautilus/extensions-%{NAUTILUS_MAYOR_VER}/lib%{name}.so %dir %{_datadir}/%{name}/extensions %files -n python3-nautilus-devel @@ -162,6 +182,11 @@ rm -v ~/.local/share/nautilus-python/extensions/*.py* %changelog +* Tue Oct 30 2018 Raphael Groner - 1.2.1-4 +- separate properly builds of python2 and python3, rhbz#1636626 +- drop obsolete Group tag +- use name macro + * Wed Sep 12 2018 Raphael Groner - 1.2.1-3 - use just python3 prefix for subpackage name - because unknown how to procee with epel branches