From 582853f2d619a6244c1b0fcb17dca638f55f608c Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Oct 07 2018 13:37:36 +0000 Subject: Drop EPEL/RHEL support --- diff --git a/cinnamon-screensaver.spec b/cinnamon-screensaver.spec index 7861b75..4116ecc 100644 --- a/cinnamon-screensaver.spec +++ b/cinnamon-screensaver.spec @@ -1,7 +1,7 @@ Summary: Cinnamon Screensaver Name: cinnamon-screensaver Version: 3.8.2 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2+ and LGPLv2+ URL: https://github.com/linuxmint/%{name} Source0: %{url}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz @@ -14,7 +14,7 @@ BuildRequires: glib2-devel BuildRequires: libtool BuildRequires: gobject-introspection-devel BuildRequires: pam-devel -BuildRequires: python%{python3_pkgversion}-devel +BuildRequires: python3-devel BuildRequires: gtk3-devel BuildRequires: libXext-devel BuildRequires: desktop-file-utils @@ -23,10 +23,10 @@ Requires: cinnamon-desktop%{?_isa} >= 3.8.0 Requires: cinnamon-translations >= 3.6.0 Requires: accountsservice-libs%{?_isa} Requires: libgnomekbd%{?_isa} -Requires: python%{python3_pkgversion}-gobject%{?_isa} -Requires: python%{python3_pkgversion}-setproctitle%{?_isa} -Requires: python%{python3_pkgversion}-xapp -Requires: python%{python3_pkgversion}-xapps-overrides%{?_isa} +Requires: python3-gobject%{?_isa} +Requires: python3-setproctitle%{?_isa} +Requires: python3-xapp +Requires: python3-xapps-overrides%{?_isa} Requires: xapps%{?_isa} # since we use it, and pam spams the log if a module is missing @@ -90,23 +90,7 @@ rm %{buildroot}%{_datadir}/gir-1.0/CScreensaver-1.0.gir rm %{buildroot}%{_includedir}/cinnamon-screensaver/libcscreensaver/*.h -%if 0%{?rhel} && 0%{?rhel} <= 7 -%post -/sbin/ldconfig -/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : - -%postun -/sbin/ldconfig -if [ $1 -eq 0 ] ; then - /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null - /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : -fi - -%posttrans -/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : -%else %ldconfig_scriptlets -%endif %files @@ -128,6 +112,9 @@ fi %changelog +* Sun Oct 07 2018 Leigh Scott - 3.8.2-4 +- Drop EPEL/RHEL support + * Thu Jul 12 2018 Fedora Release Engineering - 3.8.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild