rpms/kdeadmin/devel .cvsignore, 1.39, 1.40 kdeadmin.spec, 1.84, 1.85 sources, 1.41, 1.42 kpackagerc, 1.1, NONE ksysvrc, 1.1, NONE kuserrc, 1.1, NONE

[Rex Dieter (rdieter)]

Author: rdieter

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

Modified Files:
	.cvsignore kdeadmin.spec sources 
Removed Files:
	kpackagerc ksysvrc kuserrc 
Log Message:
* Thu Jan 31 2008 Rex Dieter <rdieter at fedoraproject.org> 7:4.0.1-1
- 4.0.1
- don't use consolehelper for kuser (for now anyway, didn't work anyway)
- -kpackage scriptlet fixes



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdeadmin/devel/.cvsignore,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- .cvsignore	8 Jan 2008 07:06:30 -0000	1.39
+++ .cvsignore	31 Jan 2008 17:51:10 -0000	1.40
@@ -1 +1,2 @@
 kdeadmin-4.0.0.tar.bz2
+kdeadmin-4.0.1.tar.bz2


Index: kdeadmin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeadmin/devel/kdeadmin.spec,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- kdeadmin.spec	8 Jan 2008 07:07:46 -0000	1.84
+++ kdeadmin.spec	31 Jan 2008 17:51:10 -0000	1.85
@@ -1,7 +1,7 @@
 
 Name:           kdeadmin
 Epoch:          7
-Version:        4.0.0
+Version:        4.0.1
 Release:        1%{?dist}
 Summary:        K Desktop Environment - Administrative tools
 
@@ -25,23 +25,24 @@
 Requires(postun): /sbin/ldconfig xdg-utils
 Requires: kdelibs4 >= %{version}
 Requires: kdepimlibs >= %{version}
-# pkgconfig bits omitted for now
-#Requires: pkgconfig
-Requires: usermode-gtk
+Requires: pkgconfig
+%{?consolehelper:Requires: usermode-gtk}
 
 
 %description
 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)
-* secpolicy (a program to display PAM security policies)
+* kcron (editor for the cron command scheduler)
+* knetworkconf (network configuration module for KDE's settings manager)
+* kuser (user manager)
+* secpolicy (displays PAM security policies)
 
 
 %package kpackage
 Summary: An RPM package manager
 Group: Applications/System
 Requires: smart
+Requires(post): xdg-utils
+Requires(postun): xdg-utils
 %description kpackage
 Kpackage is an RPM package manager, used for displaying currently installed
 packages, uninstalling them and installing new ones.
@@ -68,15 +69,17 @@
 
 make install DESTDIR=%{buildroot} -C %{_target_platform}
 
+%if 0%{?consolehelper}
 # Run kuser through consolehelper
 install -D -p -m644 %{SOURCE1} %{buildroot}%{_kde4_sysconfdir}/security/console.apps/kuser
 install -D -p -m644 %{SOURCE2} %{buildroot}%{_kde4_sysconfdir}/pam.d/kuser
 mkdir -p %{buildroot}%{_kde4_sbindir}
 mv %{buildroot}%{_kde4_bindir}/kuser %{buildroot}%{_kde4_sbindir}
 ln -s consolehelper %{buildroot}%{_kde4_bindir}/kuser
+%endif
 
 # unpackaged files 
-rm -rf %{buildroot}%{_kde4_libdir}/pkgconfig
+#rm -rf %{buildroot}%{_libdir}/pkgconfig
 
 
 %clean
@@ -91,6 +94,13 @@
 /sbin/ldconfig ||:
 %{_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
 
+%post kpackage
+%{_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+
+%postun kpackage
+%{_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+
+
 
 %files
 %defattr(-,root,root,-)
@@ -109,11 +119,14 @@
 %{_kde4_docdir}/HTML/en/knetworkconf/
 %{_kde4_docdir}/HTML/en/kuser/
 %{_kde4_iconsdir}/hicolor/*/*/*
-%exclude %{_kde4_iconsdir}/hicolor/*/*/kpackage.png
+%exclude %{_kde4_iconsdir}/hicolor/*/*/kpackage*
 %{_kde4_libdir}/kde4/kcm_knetworkconfmodule.so
+%{_libdir}/pkgconfig/*.pc
+%if 0%{?consolehelper} 
 %{_kde4_sbindir}/kuser
 %config(noreplace) %{_kde4_sysconfdir}/security/console.apps/kuser
 %config(noreplace) %{_kde4_sysconfdir}/pam.d/kuser
+%endif
 
 %files kpackage
 %defattr(-,root,root,-)
@@ -122,10 +135,15 @@
 %{_kde4_datadir}/applications/kde4/kpackage.desktop
 %{_kde4_datadir}/config.kcfg/kpackageSettings.kcfg
 %{_kde4_docdir}/HTML/en/kpackage/
-%{_kde4_iconsdir}/hicolor/*/*/kpackage.png
+%{_kde4_iconsdir}/hicolor/*/*/kpackage*
 
 
 %changelog
+* Thu Jan 31 2008 Rex Dieter <rdieter at fedoraproject.org> 7:4.0.1-1
+- 4.0.1
+- don't use consolehelper for kuser (for now anyway, didn't work anyway)
+- -kpackage scriptlet fixes
+
 * Tue Jan 08 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 7:4.0.0-1
 - update to 4.0.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdeadmin/devel/sources,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- sources	8 Jan 2008 07:06:30 -0000	1.41
+++ sources	31 Jan 2008 17:51:10 -0000	1.42
@@ -1 +1 @@
-4ee63cb1ab7550868ccd8b2a1cfcb1f4  kdeadmin-4.0.0.tar.bz2
+615d85577b84a3304ef12582af19b730  kdeadmin-4.0.1.tar.bz2


--- kpackagerc DELETED ---


--- ksysvrc DELETED ---


--- kuserrc DELETED ---