From 93b03ae3353f9d6b622a3d6686a8a6fdf4f9526e Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Jan 31 2008 17:51:10 +0000 Subject: - 4.0.1 - don't use consolehelper for kuser (for now anyway, didn't work anyway) - -kpackage scriptlet fixes --- diff --git a/.cvsignore b/.cvsignore index d7de8aa..9ccf249 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1,2 @@ kdeadmin-4.0.0.tar.bz2 +kdeadmin-4.0.1.tar.bz2 diff --git a/kdeadmin.spec b/kdeadmin.spec index 3b01ed3..b86faaf 100644 --- a/kdeadmin.spec +++ b/kdeadmin.spec @@ -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(post): /sbin/ldconfig xdg-utils 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 @@ rm -rf %{buildroot} 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 @@ rm -rf %{buildroot} /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 @@ rm -rf %{buildroot} %{_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 @@ rm -rf %{buildroot} %{_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 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 7:4.0.0-1 - update to 4.0.0 diff --git a/kpackagerc b/kpackagerc deleted file mode 100644 index 72be06d..0000000 --- a/kpackagerc +++ /dev/null @@ -1,33 +0,0 @@ -[Kpackage] -BSD=false -DEBAPT=false -DEBDPKG=false -KISS=false -RPM=true -SLACK=false - -[Rpm] -Package_L_0_0=/mnt/cdrom/RedHat/RPMS -Package_L_0_1=/mnt/cdrom/SRPMS -Package_L_0_2=/usr/src/redhat/RPMS -Package_L_0_3=/usr/src/redhat/SRPMS -Package_L_0_4=ftp://ftp.redhat.com/pub/redhat/linux/updates/7.2/en -Package_L_1_0=ftp://rhcontrib.bero.org/pub/rh-contrib/7.2/i386 -Package_L_1_1=ftp://rhcontrib.bero.org/pub/rh-contrib/7.2/noarch -Package_L_1_2=ftp://rhcontrib.bero.org/pub/rh-contrib/7.2/SRPMS -Package_S_0_0=0 -Package_S_0_1=0 -Package_S_0_2=1 -Package_S_0_3=0 -Package_S_0_4=1 -Package_S_1_0=0 -Package_S_1_1=0 -Package_S_1_2=0 -Package_U_0_0=1 -Pacakge_U_0_1=1 -Package_U_0_2=1 -Pacakge_U_0_3=1 -Package_U_0_4=0 -Package_U_1_0=0 -Package_U_1_1=0 -Package_U_1_2=0 diff --git a/ksysvrc b/ksysvrc deleted file mode 100644 index 4875464..0000000 --- a/ksysvrc +++ /dev/null @@ -1,8 +0,0 @@ -[Other Settings] -Configured=true -[Path Settings] -RunlevelPath=/etc/rc.d -ScriptPath=/etc/rc.d/init.d -[Runlevels] -Show Runlevels=0,1,2,3,4,5,6 - diff --git a/kuserrc b/kuserrc deleted file mode 100644 index baeb5a5..0000000 --- a/kuserrc +++ /dev/null @@ -1,6 +0,0 @@ -[template] -copySkel=true -createHomeDir=true -homeBase=/home -shell=/bin/bash -userPrivateGroup=true diff --git a/sources b/sources index 7d286a1..b5d0dcc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4ee63cb1ab7550868ccd8b2a1cfcb1f4 kdeadmin-4.0.0.tar.bz2 +615d85577b84a3304ef12582af19b730 kdeadmin-4.0.1.tar.bz2