[gnome-applet-timer] fix conditionals for EL6

Christoph Wickert cwickert at fedoraproject.org
Sun Sep 19 09:42:00 UTC 2010


commit 51d0e49103d1eaa6d651d438a2907272e6f91931
Author: Christoph Wickert <cwickert at fedoraproject.org>
Date:   Sun Sep 19 11:41:55 2010 +0200

    fix conditionals for EL6

 gnome-applet-timer.spec |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)
---
diff --git a/gnome-applet-timer.spec b/gnome-applet-timer.spec
index a7b450d..9187700 100644
--- a/gnome-applet-timer.spec
+++ b/gnome-applet-timer.spec
@@ -42,7 +42,9 @@ Provides:       %{srcname} = %{version}
 Requires(pre):  GConf2
 Requires(post): GConf2
 Requires(preun): GConf2
+%if 0%{?rhel} <= 5
 Requires(postun): scrollkeeper
+%endif
 
 %description
 Timer Applet is a countdown timer applet for the GNOME panel. Highlights:
@@ -58,7 +60,7 @@ Timer Applet is a countdown timer applet for the GNOME panel. Highlights:
 %if 0%{?fedora} == 11
 %patch1 -p1 -b .freedesktop-0.2
 %endif
-%if 0%{?fedora} >= 12
+%if 0%{?fedora} >= 12 || 0%{?rhel} >= 6
 %patch2 -p1 -b .freedesktop-0.7
 %endif
 %patch3 -b .gtk-runtimeerror
@@ -86,7 +88,7 @@ rm -rf $RPM_BUILD_ROOT
 %post
 %gconf_schema_upgrade %{srcname}
 
-%if 0%{?rhel}
+%if 0%{?rhel} <= 5
 scrollkeeper-update -q -o %{_datadir}/omf/timer-applet || :
 %endif
 
@@ -94,7 +96,7 @@ scrollkeeper-update -q -o %{_datadir}/omf/timer-applet || :
 %preun
 %gconf_schema_remove %{srcname}
 
-%if 0%{?rhel}
+%if 0%{?rhel} <= 5
 %postun
 scrollkeeper-update -q || :
 %endif


More information about the scm-commits mailing list