rpms/kdeadmin/devel kdeadmin.spec,1.112,1.113

[Rex Dieter]

Author: rdieter

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

Modified Files:
	kdeadmin.spec 
Log Message:
* Mon Oct 20 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-4
- make %description for kcron, knetworkconf more clear (#467650)
- Requires: kdebase-workspace (for kcm modules)
- cleanup extraneous scriptlets



Index: kdeadmin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeadmin/devel/kdeadmin.spec,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -r1.112 -r1.113
--- kdeadmin.spec	29 Sep 2008 16:28:32 -0000	1.112
+++ kdeadmin.spec	20 Oct 2008 14:44:31 -0000	1.113
@@ -1,7 +1,7 @@
 Name:           kdeadmin
 Epoch:          7
 Version:        4.1.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        K Desktop Environment - Administrative tools
 
 Group:          User Interface/Desktops
@@ -20,18 +20,20 @@
 BuildRequires:  kdepimlibs-devel >= %{version}
 BuildRequires:  openldap-devel
 
-Requires(post): /sbin/ldconfig xdg-utils
-Requires(postun): /sbin/ldconfig xdg-utils
+Requires(post): xdg-utils
+Requires(postun): xdg-utils
 Requires: kdelibs4 >= %{version}
 Requires: kdepimlibs >= %{version}
+# kcron/knetworkconf kcm modules
+Requires: kdebase-workspace
 
 
 %description
 The %{name} package includes administrative tools including:
-* kcron (editor for the cron command scheduler)
-* knetworkconf (network configuration module for KDE's settings manager)
-* ksystemlog (system log viewer)
-* kuser (user manager)
+* kcron: systemsettings module for the cron task scheduler
+* knetworkconf: systemsettings module for network settings
+* ksystemlog: system log viewer
+* kuser: user manager
 
 %package kpackage
 Summary: An RPM package manager
@@ -74,18 +76,16 @@
 
 
 %post
-/sbin/ldconfig ||:
-%{_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
 
 %postun
-/sbin/ldconfig ||:
-%{_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
 
 %post kpackage
-%{_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
 
 %postun kpackage
-%{_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
 
 
 %files
@@ -102,7 +102,6 @@
 %{_kde4_datadir}/kde4/services/*
 %{_kde4_docdir}/HTML/en/kcontrol/
 %{_kde4_docdir}/HTML/en/kcron/
-#{_kde4_docdir}/HTML/en/knetworkconf/
 %{_kde4_docdir}/HTML/en/ksystemlog/
 %{_kde4_docdir}/HTML/en/kuser/
 %{_kde4_iconsdir}/hicolor/*/*/*
@@ -121,6 +120,11 @@
 
 
 %changelog
+* Mon Oct 20 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-4
+- make %%description for kcron, knetworkconf more clear (#467650)
+- Requires: kdebase-workspace (for kcm modules)
+- cleanup extraneous scriptlets
+
 * Mon Sep 29 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-3
 - make VERBOSE=1
 - respin against new(er) kde-filesystem