diff --git a/exo.spec b/exo.spec index b9d2e48..b5f159e 100644 --- a/exo.spec +++ b/exo.spec @@ -1,12 +1,9 @@ -%if ! (0%{?fedora} > 12 || 0%{?rhel} > 5) -%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} -%endif %global minorversion 0.12 %global xfceversion 4.12 Name: exo Version: 0.12.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Application library for the Xfce desktop environment Group: System Environment/Libraries @@ -14,11 +11,12 @@ Group: System Environment/Libraries # everything else is LGPLv2+ License: LGPLv2+ and GPLv2+ URL: http://xfce.org/ -#VCS git:git://git.xfce.org/xfce/libxfce4ui Source0: http://archive.xfce.org/src/xfce/%{name}/%{minorversion}/%{name}-%{version}.tar.bz2 + # internet-mail icon taken from GNOME, license is LGPLv3 Source1: internet-mail-24.png Source2: internet-mail-48.png + # replace mailto handler with python version # https://bugzilla.xfce.org/show_bug.cgi?id=9964 Source3: mailtoparse.py @@ -28,9 +26,6 @@ Patch2: exo-0.10.2-default-apps.patch BuildRequires: gtk-doc BuildRequires: gettext -%if ! (0%{?fedora} > 12 || 0%{?rhel} > 5) -BuildRequires: python-devel -%endif BuildRequires: perl-URI BuildRequires: pkgconfig(glib-2.0) >= 2.24.0 BuildRequires: pkgconfig(gtk+-2.0) >= 2.20.0 @@ -54,16 +49,6 @@ Requires: pkgconfig %description devel Development tools and static libraries and header files for the exo library. -%if ! (0%{?fedora} > 12 || 0%{?rhel} > 5) -%package -n python-exo -Summary: Python tools for exo library -Group: Development/Libraries -Requires: %{name} = %{version}-%{release} - -%description -n python-exo -Python libraries and header files for the exo library. -%endif - %prep %setup -q @@ -102,30 +87,11 @@ install -Dpm 0644 %{SOURCE2} %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/in rm -f %{buildroot}%{_libdir}/xfce4/exo-1/exo-compose-mail-1 install -Dpm 0755 %{SOURCE3} %{buildroot}%{_libdir}/xfce4/exo-1/exo-compose-mail-1 -%post -/sbin/ldconfig -%if 0%{?fc13}%{?fc14} -if [ $1 -eq 1 ] ; then - # For upgrades, the cache will be regenerated by the new package's %postun - gio-querymodules-%{__isa_bits} %{_libdir}/gio/modules || : -fi -%endif -touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : - - -%postun -/sbin/ldconfig -if [ $1 -eq 0 ] ; then - touch --no-create %{_datadir}/icons/hicolor &>/dev/null - gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : -fi - - -%posttrans -gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : +%ldconfig_scriptlets %files -f exo-1.lang -%doc AUTHORS ChangeLog NEWS README THANKS COPYING +%license COPYING +%doc AUTHORS ChangeLog NEWS README THANKS %dir %{_sysconfdir}/xdg/xfce4 %config(noreplace) %{_sysconfdir}/xdg/xfce4/helpers.rc %{_bindir}/exo-desktop-item-edit @@ -148,13 +114,12 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_libdir}/pkgconfig/*.pc %{_mandir}/man1/exo-csource.1.* -%if ! (0%{?fedora} > 12 || 0%{?rhel} > 5) -%files -n python-exo -%{python_sitearch}/exo-*/ -%{python_sitearch}/pyexo.* -%endif %changelog +* Sun Feb 25 2018 Mukundan Ragavan - 0.12.0-2 +- Drop everything python-exo +- use ldconfig_scriptlets + * Fri Feb 16 2018 Mukundan Ragavan - 0.12.0-1 - Update to 0.12.0 - Spec cleanup