rpms/kdeadmin/devel kdeadmin.spec,1.80,1.81

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/pkgs/rpms/kdeadmin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23475

Modified Files:
	kdeadmin.spec 
Log Message:
* Thu Dec 13 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.97.0-2
- cosmetics (drop extraneous BR's, touchup %description)



Index: kdeadmin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeadmin/devel/kdeadmin.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- kdeadmin.spec	11 Dec 2007 16:37:29 -0000	1.80
+++ kdeadmin.spec	13 Dec 2007 14:43:47 -0000	1.81
@@ -1,49 +1,39 @@
+
 Name:           kdeadmin
 Epoch:          7
 Version:        3.97.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        K Desktop Environment - Administrative tools
 
 Group:          User Interface/Desktops
 License:        GPLv2
 URL:            http://www.kde.org/
 Source0:        ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/%{name}-%{version}.tar.bz2
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
 Source1:        kuser.pam
 Source2:        kuser.pamd
 Source3:        kpackage.pam
 Source4:        kpackage.pamd
-# FIXME/TODO: Also include extra kuserrc and kpackagerc like in KDE 3.5?
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+BuildRequires:  cmake
 BuildRequires:  kde-filesystem >= 4
 %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
 BuildRequires:  kdelibs4-devel >= %{version}
 BuildRequires:  kdepimlibs-devel >= %{version}
-BuildRequires:  cmake
 BuildRequires:  openldap-devel
-# FIXME/TODO: These ones could be removed when they will be required by kdelibs4-devel (which happens soon)
-BuildRequires:  libXcomposite-devel
-BuildRequires:  libXdamage-devel
-BuildRequires:  libxkbfile-devel
-BuildRequires:  libXv-devel
-BuildRequires:  libXxf86misc-devel
-BuildRequires:  libXScrnSaver-devel
-BuildRequires:  libXpm-devel
-BuildRequires:  libXtst-devel
 
-
-# FIXME/TODO: are there other explicit Requires?
 Requires(post): /sbin/ldconfig xdg-utils
 Requires(postun): /sbin/ldconfig xdg-utils
 Requires: kdelibs4 >= %{version}
 Requires: kdepimlibs >= %{version}
-Requires: pkgconfig
+# pkgconfig bits omitted for now
+#Requires: pkgconfig
 Requires: usermode-gtk
 
 
 %description
-The kdeadmin package includes administrative tools for the K Desktop
-Environment (KDE) including:
+The %{name} package includes administrative tools including:
 * kcron (an editor for the cron command scheduler)
 * knetworkconf (a network configuration module for KDE's settings manager)
 * kuser (an user manager)
@@ -51,16 +41,16 @@
 
 
 %package kpackage
-Summary: A package manager
+Summary: An RPM package manager
 Group: Applications/System
 Requires: smart
 Requires: usermode-gtk
 %description kpackage
-This package contains a package manager for  the KDE Desktop Environment.
-It is used for displaying currently installed packages, uninstalling
-them and installing new ones.
+Kpackage is an RPM package manager, used for displaying currently installed
+packages, uninstalling them and installing new ones.
+
+It is based upon the "Smart Package Manager".
 
-kpackage is based upon the "Smart Package Manager".
 
 %prep
 %setup -q
@@ -78,7 +68,7 @@
 
 %install
 rm -rf %{buildroot}
-mkdir %{buildroot}
+
 make install DESTDIR=%{buildroot} -C %{_target_platform}
 
 # Run kuser through consolehelper
@@ -94,12 +84,14 @@
 mv %{buildroot}%{_kde4_bindir}/kpackage %{buildroot}%{_kde4_sbindir}
 ln -s consolehelper %{buildroot}%{_kde4_bindir}/kpackage
 
-# removed unused stuff
+# unpackaged files 
 rm -rf %{buildroot}%{_kde4_libdir}/pkgconfig
 
+
 %clean
 rm -rf %{buildroot}
 
+
 %post
 /sbin/ldconfig ||:
 %{_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
@@ -111,11 +103,11 @@
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING COPYING.LIB COPYING-DOCS README
+%doc AUTHORS COPYING README
 %{_kde4_bindir}/kcron
 %{_kde4_bindir}/kuser
 %{_kde4_bindir}/secpolicy
-%{_kde4_appsdir}/kcron
+%{_kde4_appsdir}/kcron/
 %{_kde4_appsdir}/knetworkconf/
 %{_kde4_appsdir}/kuser/
 %{_kde4_datadir}/applications/kde4/kcron.desktop
@@ -135,16 +127,20 @@
 %files kpackage
 %defattr(-,root,root,-)
 %{_kde4_bindir}/kpackage
+%{_kde4_sbindir}/kpackage
 %{_kde4_appsdir}/kpackage/
 %{_kde4_datadir}/applications/kde4/kpackage.desktop
 %{_kde4_datadir}/config.kcfg/kpackageSettings.kcfg
 %{_kde4_docdir}/HTML/en/kpackage/
 %{_kde4_iconsdir}/hicolor/*/*/kpackage.png
-%{_kde4_sbindir}/kpackage
 %config(noreplace) %{_kde4_sysconfdir}/security/console.apps/kpackage
 %config(noreplace) %{_kde4_sysconfdir}/pam.d/kpackage
 
+
 %changelog
+* Thu Dec 13 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.97.0-2
+- cosmetics (drop extraneous BR's, touchup %%description)
+
 * Thu Dec 06 2007 Than Ngo <than at redhat.com> 3.97.0-1
 - 3.97.0