rpms/kdeutils/F-9 kdeutils.spec,1.137,1.138

[Kevin Kofler]

Author: kkofler

Update of /cvs/pkgs/rpms/kdeutils/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8444/F-9

Modified Files:
	kdeutils.spec 
Log Message:
Sync from devel:

* 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

* Fri Mar 06 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.1-2
- -printer-applet subpkg
- cleanup unused -libs/-devel crud


Index: kdeutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeutils/F-9/kdeutils.spec,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -r1.137 -r1.138
--- kdeutils.spec	27 Feb 2009 18:53:35 -0000	1.137
+++ kdeutils.spec	14 Mar 2009 16:51:23 -0000	1.138
@@ -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:        1%{?dist}
+Release:        3%{?dist}.1
 Summary:        K Desktop Environment - Utilities
 
 Group:          Applications/System
@@ -36,20 +31,21 @@
 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
-Requires: PyKDE4 >= %{version}
-Requires: hal-cups-utils
-Requires: system-config-printer-libs
+%if 0%{?fedora} > 9
+# upgrade path so it doesn't get lost
+Requires: %{name}-printer-applet = %{epoch}:%{version}-%{release}
 %endif
 
 Provides:       okteta = 0.1.0-1
 Obsoletes:      okteta < 0.1.0-1
 
-Obsoletes: %{name}-extras < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes: %{name}-libs < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes: %{name}-devel < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: kdeutils-extras < 6:4.0.0
+Obsoletes: kdeutils-libs < 6:4.0.0
+Obsoletes: kdeutils-devel < 6:4.0.0
 
 %description
 Utilities for the K Desktop Environment.
@@ -72,18 +68,13 @@
   * superkaramba
   * sweeper (clean unwanted traces the user leaves on the system)
 
-%package libs
-Summary: Runtime libraries for %{name}
-Group:   System Environment/Libraries
-%description libs
-%{summary}.
-
-%package devel
-Group:    Development/Libraries
-Summary:  Development files for %{name}
-Requires: %{name}-libs = %{epoch}:%{version}-%{release}
-Requires: kdepimlibs4-devel kdebase-workspace-devel
-%description devel
+%package printer-applet
+Summary:  KDE printer applet
+Group:    Applications/System
+Requires: PyKDE4 >= %{version}
+Requires: hal-cups-utils
+Requires: system-config-printer-libs
+%description printer-applet
 %{summary}.
 
 
@@ -102,6 +93,7 @@
 %patch0 -p1 -b .kjots
 %endif
 
+
 %build
 
 mkdir -p %{_target_platform}
@@ -109,7 +101,7 @@
 %{cmake_kde4} ..
 popd
 
-make %{?_smp_mflags} -C %{_target_platform} VERBOSE=1
+make %{?_smp_mflags} -C %{_target_platform}
 
 
 %install
@@ -131,21 +123,33 @@
 
 %post
 /sbin/ldconfig ||:
-%{_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-%{_bindir}/xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
-%{_bindir}/xdg-desktop-menu forceupdate 2> /dev/null || :
+xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
+xdg-desktop-menu forceupdate 2> /dev/null || :
 
 %postun
 /sbin/ldconfig ||:
-%{_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-%{_bindir}/xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
-%{_bindir}/xdg-desktop-menu forceupdate 2> /dev/null || :
+xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
+xdg-desktop-menu forceupdate 2> /dev/null || :
 
 
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README
-%{_kde4_bindir}/*
+%{_kde4_bindir}/ark
+%{_kde4_bindir}/kcalc
+%{_kde4_bindir}/kcharselect
+%{_kde4_bindir}/kdessh
+%{_kde4_bindir}/kdf
+%{_kde4_bindir}/kfloppy
+%{_kde4_bindir}/kgpg
+%{_kde4_bindir}/ktimer
+%{_kde4_bindir}/kwalletmanager
+%{_kde4_bindir}/kwikdisk
+%{_kde4_bindir}/okteta
+%{_kde4_bindir}/superkaramba
+%{_kde4_bindir}/sweeper
 %{_kde4_appsdir}/ark/
 %{_kde4_appsdir}/kcalc/
 %{_kde4_appsdir}/kcharselect/
@@ -155,9 +159,6 @@
 %{_kde4_appsdir}/kwalletmanager/
 %{_kde4_appsdir}/okteta/
 %{_kde4_appsdir}/oktetapart/
-%if 0%{?printer_applet}
-%{_kde4_appsdir}/printer-applet/
-%endif
 %{_kde4_appsdir}/superkaramba/
 %{_kde4_appsdir}/sweeper/
 %{_kde4_datadir}/kde4/services/*
@@ -168,35 +169,42 @@
 %{_kde4_iconsdir}/oxygen/*/*/*
 %{_datadir}/dbus-1/interfaces/*
 %{_kde4_datadir}/config.kcfg/*
-%{_kde4_datadir}/autostart/*
+%{_kde4_datadir}/autostart/kgpg.desktop
 %{_kde4_configdir}/*
+%{_kde4_libdir}/lib*.so.*
 %{_kde4_libdir}/libkdeinit*.so
 %{_kde4_libdir}/kde4/*
 %if 0%{?include_kjots}
+%{_kde4_bindir}/kjots
 %{_kde4_appsdir}/kjots/
 %{_kde4_docdir}/HTML/en/kjots/
 %endif
 %{_mandir}/man1/*
 
-%if 0
-%files libs
-%defattr(-,root,root,-)
-%endif
-%{_kde4_libdir}/lib*.so.*
-
-%if 0
-%files devel
+%files printer-applet
 %defattr(-,root,root,-)
-%{_kde4_includedir}/*
-%exclude %{_kde4_libdir}/libkdeinit*.so
-%{_kde4_libdir}/lib*.so
-%endif
+%{_kde4_bindir}/printer-applet
+%{_kde4_datadir}/autostart/printer-applet.desktop
+%{_kde4_appsdir}/printer-applet/
 
 
 %changelog
-* Fri Feb 27 2009 Lukáš Tinkl <ltinkl at redhat.com> - 4.2.1-1
+* 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
+
+* Fri Mar 06 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.1-2
+- -printer-applet subpkg
+- cleanup unused -libs/-devel crud
+
+* Fri Feb 27 2009 Than Ngo <than at redhat.com> - 4.2.1-1
 - 4.2.1
 
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 6:4.2.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Thu Jan 22 2009 Than Ngo <than at redhat.com> - 4.2.0-1
 - 4.2.0