rpms/kdeutils/devel kdeutils.spec,1.166,1.167

Kevin Kofler kkofler at fedoraproject.org
Sat Mar 14 16:49:37 UTC 2009


Author: kkofler

Update of /cvs/pkgs/rpms/kdeutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8142/devel

Modified Files:
	kdeutils.spec 
Log Message:
* Sat Mar 14 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.1-3.1
- also build printer-applet on F9, but don't drag it in by default

(need to build only for F9)


Index: kdeutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeutils/devel/kdeutils.spec,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -r1.166 -r1.167
--- kdeutils.spec	6 Mar 2009 16:21:10 -0000	1.166
+++ kdeutils.spec	14 Mar 2009 16:49:06 -0000	1.167
@@ -1,8 +1,3 @@
-%if 0%{?fedora} > 9
-# include new PyKDE4 printer applet
-%define printer_applet 1
-%endif
-
 %if 0%{?fedora} == 9
 # continue including kjots here (as in 4.0) for F9 (we don't have kdepim 4.1 there)
 %define include_kjots 1
@@ -11,7 +6,7 @@
 Name:           kdeutils
 Epoch:          6
 Version:        4.2.1
-Release:        3%{?dist}
+Release:        3%{?dist}.1
 Summary:        K Desktop Environment - Utilities
 
 Group:          Applications/System
@@ -36,9 +31,11 @@
 Requires(post): /sbin/ldconfig xdg-utils
 Requires(postun): /sbin/ldconfig xdg-utils
 Requires: kdelibs4 >= %{version}
-%if 0%{?printer_applet}
+
+# printer applet
 BuildRequires:  PyKDE4-devel >= %{version}
 BuildRequires:  system-config-printer-libs
+%if 0%{?fedora} > 9
 # upgrade path so it doesn't get lost
 Requires: %{name}-printer-applet = %{epoch}:%{version}-%{release}
 %endif
@@ -184,16 +181,17 @@
 %endif
 %{_mandir}/man1/*
 
-%if 0%{?printer_applet}
 %files printer-applet
 %defattr(-,root,root,-)
 %{_kde4_bindir}/printer-applet
 %{_kde4_datadir}/autostart/printer-applet.desktop
 %{_kde4_appsdir}/printer-applet/
-%endif
 
 
 %changelog
+* Sat Mar 14 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.1-3.1
+- also build printer-applet on F9, but don't drag it in by default
+
 * Fri Mar 06 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.1-3
 - *really* make a -printer-applet subpkg
 




More information about the fedora-extras-commits mailing list