rpms/kdeadmin/devel kdeadmin.spec,1.75,1.76

[Rex Dieter (rdieter)]

Author: rdieter

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

Modified Files:
	kdeadmin.spec 
Log Message:
* Mon Aug 20 2007 Rex Dieter <rdietr[AT]fedoraproject.org> - 7:3.5.7-3
- License: GPLv2
- (Build)Requires: kdelibs3(-devel)
- drop Requires: kdebase



Index: kdeadmin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeadmin/devel/kdeadmin.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- kdeadmin.spec	16 Jun 2007 23:18:20 -0000	1.75
+++ kdeadmin.spec	20 Aug 2007 19:32:56 -0000	1.76
@@ -1,18 +1,14 @@
 
 %define make_cvs 0 
-
-%define qt_version 3.3.8
-%define kdelibs_epoch 6
-%define kdebase_epoch 6
 %define console_helper 1
 
 Name:    kdeadmin
 Summary: Administrative tools for KDE
 Epoch:   7
 Version: 3.5.7
-Release: 2%{?dist}
+Release: 3%{?dist}
 
-License: GPL
+License: GPLv2
 URL:     http://www.kde.org/
 Group:   User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -28,15 +24,14 @@
 
 Patch0: kdeadmin-3.5.7-knetworkconf.patch
 
-Requires: kdebase >= %{kdebase_epoch}:%{version}
-Requires: kdelibs >= %{kdelibs_epoch}:%{version}
+Requires: kdelibs3 >= %{version}
 Requires: pkgconfig
 Requires: usermode
 
 %if %{make_cvs}
 BuildRequires: automake libtool
 %endif
-BuildRequires: kdelibs-devel >= %{kdelibs_epoch}:%{version}
+BuildRequires: kdelibs3-devel >= %{version}
 BuildRequires: rpm-devel
 
 %description
@@ -96,15 +91,15 @@
 install -p -m644 %{SOURCE5} %{SOURCE6} %{SOURCE7} %{buildroot}%{_datadir}/config/
 
 # Run kuser through consolehelper
-install -c -m 644 %{SOURCE1} %{buildroot}/etc/security/console.apps/kuser
-install -c -m 644 %{SOURCE2} %{buildroot}/etc/pam.d/kuser
+install -p -m644 %{SOURCE1} %{buildroot}/etc/security/console.apps/kuser
+install -p -m644 %{SOURCE2} %{buildroot}/etc/pam.d/kuser
 mv %{buildroot}%{_bindir}/kuser %{buildroot}%{_sbindir}
 ln -s consolehelper %{buildroot}%{_bindir}/kuser
 
 %if %{console_helper}
 # Run kpackage through consolehelper
-install -c -m 644 %{SOURCE3} %{buildroot}/etc/security/console.apps/kpackage
-install -m 0644 %{SOURCE4} %{buildroot}/etc/pam.d/kpackage
+install -p -m644 %{SOURCE3} %{buildroot}/etc/security/console.apps/kpackage
+install -p -m644 %{SOURCE4} %{buildroot}/etc/pam.d/kpackage
 mv %{buildroot}%{_bindir}/kpackage %{buildroot}%{_sbindir}
 ln -s consolehelper %{buildroot}%{_bindir}/kpackage
 %endif
@@ -167,7 +162,7 @@
 %endif
 %{_datadir}/apps/*
 %{_datadir}/applications/kde/*.desktop
-%config(noreplace) %{_datadir}/config*/*
+%{_datadir}/config*/*
 %{_datadir}/icons/crystalsvg/*/*/*
 %{_datadir}/icons/hicolor/*/*/*
 %{_datadir}/icons/locolor/*/*/*
@@ -178,6 +173,11 @@
 
 
 %changelog
+* Mon Aug 20 2007 Rex Dieter <rdietr[AT]fedoraproject.org> - 7:3.5.7-3
+- License: GPLv2
+- (Build)Requires: kdelibs3(-devel)
+- drop Requires: kdebase
+
 * Sat Jun 16 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 7:3.5.7-2
 - update knetworkconf patch
 - portability (rhel) bits