rpms/kde-settings/devel kde-settings.spec,1.92,1.93

[Than Ngo]

Author: than

Update of /cvs/extras/rpms/kde-settings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14454

Modified Files:
	kde-settings.spec 
Log Message:
rhel cleanup



Index: kde-settings.spec
===================================================================
RCS file: /cvs/extras/rpms/kde-settings/devel/kde-settings.spec,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -p -r1.92 -r1.93
--- kde-settings.spec	23 Sep 2009 22:45:17 -0000	1.92
+++ kde-settings.spec	24 Sep 2009 14:03:00 -0000	1.93
@@ -5,7 +5,7 @@
 Summary: Config files for kde
 Name:    kde-settings
 Version: 4.3
-Release: %{rel}
+Release: %{rel}.1
 
 Group:   System Environment/Base
 License: Public Domain
@@ -85,6 +85,11 @@ ln -sf ../../../etc/kde/kdm %{buildroot}
 # own /var/run/kdm
 mkdir -p %{buildroot}%{_localstatedir}/run/kdm
 
+# rhel stuff
+%if 0%{?rhel}
+rm -f %{buildroot}%{_sysconfdir}/kde/env/fedora-bookmarks.sh \
+      %{buildroot}%{_sysconfdir}/kde/shutdown/gpg-agent*.sh
+%endif
 
 %clean
 rm -rf %{buildroot}
@@ -123,8 +128,10 @@ touch --no-create %{_datadir}/kde-settin
 %config(noreplace) %{_sysconfdir}/profile.d/kde.*
 %{_sysconfdir}/kde/env/env.sh
 %{_sysconfdir}/kde/env/gpg-agent*.sh
+%if 0%{?fedora}
 %{_sysconfdir}/kde/env/fedora-bookmarks.sh
 %{_sysconfdir}/kde/shutdown/gpg-agent*.sh
+%endif
 %config(noreplace) /etc/pam.d/kcheckpass
 %config(noreplace) /etc/pam.d/kscreensaver
 # drop noreplace, so we can be sure to get the new kiosk bits
@@ -158,6 +165,9 @@ touch --no-create %{_datadir}/kde-settin
 
 
 %changelog
+* Thu Sep 24 2009 Than Ngo <than at redhat.com> - 4.3-10.1
+- rhel cleanup
+
 * Wed Sep 23 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3-10
 - include /etc/profile.d/kde.(sh|csh) here, renable KDE_IS_PRELINKED