[kde-settings/f16] Cleanup specfile.

Kevin Kofler kkofler at fedoraproject.org
Mon Jan 16 21:17:29 UTC 2012


commit 0ac53ba731b40c00ec9f7eb8bd940bc6296ef96c
Author: Kevin Kofler <Kevin at tigcc.ticalc.org>
Date:   Mon Jan 16 22:15:26 2012 +0100

    Cleanup specfile.
    
    Remove the F17+ conditionals now that Rawhide has a separate kde-settings.

 kde-settings.spec |   14 ++------------
 1 files changed, 2 insertions(+), 12 deletions(-)
---
diff --git a/kde-settings.spec b/kde-settings.spec
index e4dfa58..309a2a3 100644
--- a/kde-settings.spec
+++ b/kde-settings.spec
@@ -1,9 +1,4 @@
-# THIS SPECFILE IS FOR F16+ ONLY!
-
-# ship the Plasma RPM dependency generators only on F17+
-%if 0%{?fedora} > 16
-%global plasma_rpm 1
-%endif
+# THIS SPECFILE IS FOR F16 ONLY!
 
 %global rel 14
 %global system_kde_theme_ver 15.90
@@ -79,7 +74,7 @@ Requires: alsa-plugins-pulseaudio
 
 
 %prep
-%setup -q -n %{name}-%{version}-%{rel} %{?plasma_rpm:-a 1}
+%setup -q -n %{name}-%{version}-%{rel}
 
 
 %build
@@ -138,11 +133,6 @@ rm -rf %{buildroot}
 %config %{_sysconfdir}/kderc
 %config %{_sysconfdir}/kde4rc
 %{_datadir}/kde-settings/
-%if 0%{?plasma_rpm}
-%{_prefix}/lib/rpm/plasma4.prov
-%{_prefix}/lib/rpm/plasma4.req
-%{_prefix}/lib/rpm/fileattrs/plasma4.attr
-%endif
 
 %files kdm
 %defattr(-,root,root,-)


More information about the scm-commits mailing list