diff --git a/.gitignore b/.gitignore index 5659427..ec1b5c2 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ /python-caja-1.19.0.tar.xz /python-caja-1.20.0.tar.xz /python-caja-1.20.1.tar.xz +/python-caja-1.20.2.tar.xz diff --git a/python-caja.spec b/python-caja.spec index ae91f8f..3291b87 100644 --- a/python-caja.spec +++ b/python-caja.spec @@ -6,17 +6,21 @@ Python bindings for Caja Name: python-caja -Version: 1.20.1 -Release: 3%{?dist} +Version: 1.20.2 +Release: 1%{?dist} Epoch: 1 Summary: Python bindings for Caja Group: Development/Libraries License: GPLv2+ and LGPLv2+ -URL: https://mate-desktop.org -Source0: https://pub.mate-desktop.org/releases/1.20/%{name}-%{version}.tar.xz +URL: http://mate-desktop.org +Source0: http://pub.mate-desktop.org/releases/1.20/%{name}-%{version}.tar.xz +%if 0%{?fedora} && 0%{?fedora} >= 29 BuildRequires: python3-devel +%else +BuildRequires: python2-devel +%endif BuildRequires: caja-devel BuildRequires: pygobject3-devel BuildRequires: mate-common @@ -25,17 +29,30 @@ BuildRequires: mate-common %description %_description +%if 0%{?fedora} && 0%{?fedora} >= 29 %package -n python3-caja Summary: %summary %{?python_provide:%python_provide python3-caja} %description -n python3-caja %_description +%else +%package -n python2-caja +Summary: %summary +%{?python_provide:%python_provide python2-caja} + +%description -n python2-caja +%_description +%endif %package devel Summary: Python bindings for Caja Group: Development/Libraries +%if 0%{?fedora} && 0%{?fedora} >= 29 Requires: python3-caja%{?_isa} = %{epoch}:%{version}-%{release} +%else +Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release} +%endif %description devel %_description @@ -43,9 +60,20 @@ Requires: python3-caja%{?_isa} = %{epoch}:%{version}-%{release} %prep %autosetup -p1 +%if 0%{?fedora} && 0%{?fedora} == 28 +sed -i -e 's~#!/usr/bin/python~#!%{__python2}~g' examples/background-image.py +sed -i -e 's~#!/usr/bin/python~#!%{__python2}~g' examples/block-size-column.py +sed -i -e 's~#!/usr/bin/python~#!%{__python2}~g' examples/location-widget-provider.py +sed -i -e 's~#!/usr/bin/python~#!%{__python2}~g' examples/md5sum-property-page.py +sed -i -e 's~#!/usr/bin/python~#!%{__python2}~g' examples/open-terminal.py +sed -i -e 's~#!/usr/bin/python~#!%{__python2}~g' examples/submenu.py +sed -i -e 's~#!/usr/bin/python~#!%{__python2}~g' examples/update-file-info-async.py +%endif %build +%if 0%{?fedora} && 0%{?fedora} >= 29 export PYTHON=python3 +%endif %configure \ --disable-static @@ -55,16 +83,20 @@ make %{?_smp_mflags} %install %{make_install} -mkdir -p %{buildroot}%{_datadir}/caja-python/extensions -find %{buildroot} -name '*.la' -delete +mkdir -p $RPM_BUILD_ROOT%{_datadir}/caja-python/extensions +find $RPM_BUILD_ROOT -name '*.la' -delete # We use %%doc instead -rm %{buildroot}%{_docdir}/python-caja/README +rm $RPM_BUILD_ROOT%{_docdir}/python-caja/README %find_lang %{name} --with-gnome --all-name +%if 0%{?fedora} && 0%{?fedora} >= 29 %files -n python3-caja -f %{name}.lang +%else +%files -n python2-caja -f %{name}.lang +%endif %license COPYING %doc README AUTHORS NEWS %{_libdir}/caja/extensions-2.0/libcaja-python.so @@ -78,7 +110,10 @@ rm %{buildroot}%{_docdir}/python-caja/README %changelog -* Thu Aug 16 2018 Wolfgang Ulbrich - 1:1.20.1-3 +* Wed Dec 26 2018 Wolfgang Ulbrich - 1:1.20.2-1 +- update to 1.20.2 release + +* Thu Aug 16 2018 Wolfgang Ulbrich - 1:1.20.1-3 - Switch to Python 3 - Move COPYING to /usr/share/licenses - drop obsolete rpm scriptlets @@ -86,21 +121,21 @@ rm %{buildroot}%{_docdir}/python-caja/README * Fri Jul 13 2018 Fedora Release Engineering - 1:1.20.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild -* Tue Jun 19 2018 Wolfgang Ulbrich - 1:1.20.1-1 +* Tue Jun 19 2018 Wolfgang Ulbrich - 1:1.20.1-1 - update to 1.20.1 release * Sun Feb 11 2018 Iryna Shcherbina - 1:1.20.0-2 - Update Python 2 dependency declarations to new packaging standards (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) -* Sun Feb 11 2018 Wolfgang Ulbrich - 1.20.0-1 +* Sun Feb 11 2018 Wolfgang Ulbrich - 1.20.0-1 - update to 1.20.0 release - switch to using autosetup * Fri Feb 09 2018 Fedora Release Engineering - 1:1.19.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild -* Fri Oct 13 2017 Wolfgang Ulbrich - 1.19.0-1 +* Fri Oct 13 2017 Wolfgang Ulbrich - 1.19.0-1 - update to 1.19.0 release * Thu Aug 10 2017 Zbigniew Jędrzejewski-Szmek - 1:1.18.1-4 @@ -116,7 +151,7 @@ rm %{buildroot}%{_docdir}/python-caja/README * Wed Jul 26 2017 Wolfgang Ulbrich - 1.18.1-1 - update to 1.18.1 -* Tue Mar 14 2017 Wolfgang Ulbrich - 1.18.0-1 +* Tue Mar 14 2017 Wolfgang Ulbrich - 1.18.0-1 - update to 1.18.0 release * Sat Feb 11 2017 Fedora Release Engineering - 1:1.17.0-2 diff --git a/sources b/sources index 32a16a9..63dbdec 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (python-caja-1.20.1.tar.xz) = 3b0c97b160f6af6552ab2bebb5a25b823a18aee241b512cebb24ab3089eb863714cbabeaaf722c8ffa8a6ed375b4d302f269e4b3d5d5b8ec329d1aa494a13f1f +SHA512 (python-caja-1.20.2.tar.xz) = 48dce3645ce78cb732be8d9e95074c25a1e1dfb4cad5bd9b517317d7a28a5928563a10621759380398b5c5d46a8d54584644dad24d57eada20d92897e62c22f0