maj kdeadmin3#3.5.10-2

4 files changed, 30 insertions, 11 deletions

diff --git a/kde3/kdeadmin3/.footprint b/kde3/kdeadmin3/.footprint
index d9e69af5b..bd7681d93 100644
--- a/kde3/kdeadmin3/.footprint
+++ b/kde3/kdeadmin3/.footprint
@@ -3,6 +3,7 @@ drwxr-xr-x	root/root	opt/kde/
 drwxr-xr-x	root/root	opt/kde/bin/
 -rwxr-xr-x	root/root	opt/kde/bin/kcron
 -rwxr-xr-x	root/root	opt/kde/bin/kdat
+-rwxr-xr-x	root/root	opt/kde/bin/ksysv
 -rwxr-xr-x	root/root	opt/kde/bin/kuser
 -rwxr-xr-x	root/root	opt/kde/bin/secpolicy
 drwxr-xr-x	root/root	opt/kde/lib/
@@ -21,6 +22,7 @@ drwxr-xr-x	root/root	opt/kde/share/applications/kde/
 -rw-r--r--	root/root	opt/kde/share/applications/kde/kcm_knetworkconfmodule.desktop
 -rw-r--r--	root/root	opt/kde/share/applications/kde/kcron.desktop
 -rw-r--r--	root/root	opt/kde/share/applications/kde/kdat.desktop
+-rw-r--r--	root/root	opt/kde/share/applications/kde/ksysv.desktop
 -rw-r--r--	root/root	opt/kde/share/applications/kde/kuser.desktop
 drwxr-xr-x	root/root	opt/kde/share/apps/
 drwxr-xr-x	root/root	opt/kde/share/apps/kcron/
@@ -110,6 +112,14 @@ drwxr-xr-x	root/root	opt/kde/share/apps/knetworkconf/pixmaps/
 -rw-r--r--	root/root	opt/kde/share/apps/knetworkconf/pixmaps/turbolinux.png
 -rw-r--r--	root/root	opt/kde/share/apps/knetworkconf/pixmaps/vine.png
 -rw-r--r--	root/root	opt/kde/share/apps/knetworkconf/pixmaps/yoper.png
+drwxr-xr-x	root/root	opt/kde/share/apps/ksysv/
+-rw-r--r--	root/root	opt/kde/share/apps/ksysv/ksysvui.rc
+drwxr-xr-x	root/root	opt/kde/share/apps/ksysv/pics/
+-rw-r--r--	root/root	opt/kde/share/apps/ksysv/pics/ksysv_locked.png
+-rw-r--r--	root/root	opt/kde/share/apps/ksysv/pics/ksysv_restart.png
+-rw-r--r--	root/root	opt/kde/share/apps/ksysv/pics/ksysv_start.png
+-rw-r--r--	root/root	opt/kde/share/apps/ksysv/pics/ksysv_stop.png
+-rw-r--r--	root/root	opt/kde/share/apps/ksysv/pics/ksysv_unlocked.png
 drwxr-xr-x	root/root	opt/kde/share/apps/kuser/
 drwxr-xr-x	root/root	opt/kde/share/apps/kuser/icons/
 drwxr-xr-x	root/root	opt/kde/share/apps/kuser/icons/crystalsvg/
@@ -192,6 +202,10 @@ lrwxrwxrwx	root/root	opt/kde/share/doc/HTML/en/lilo-config/common -> /opt/kde/sh
 -rw-r--r--	root/root	opt/kde/share/doc/HTML/en/lilo-config/index.cache.bz2
 -rw-r--r--	root/root	opt/kde/share/doc/HTML/en/lilo-config/index.docbook
 drwxr-xr-x	root/root	opt/kde/share/icons/
+drwxr-xr-x	root/root	opt/kde/share/icons/crystalsvg/
+drwxr-xr-x	root/root	opt/kde/share/icons/crystalsvg/16x16/
+drwxr-xr-x	root/root	opt/kde/share/icons/crystalsvg/16x16/actions/
+-rw-r--r--	root/root	opt/kde/share/icons/crystalsvg/16x16/actions/toggle_log.png
 drwxr-xr-x	root/root	opt/kde/share/icons/hicolor/
 drwxr-xr-x	root/root	opt/kde/share/icons/hicolor/128x128/
 drwxr-xr-x	root/root	opt/kde/share/icons/hicolor/128x128/apps/
@@ -201,6 +215,7 @@ drwxr-xr-x	root/root	opt/kde/share/icons/hicolor/16x16/apps/
 -rw-r--r--	root/root	opt/kde/share/icons/hicolor/16x16/apps/kcron.png
 -rw-r--r--	root/root	opt/kde/share/icons/hicolor/16x16/apps/kdat.png
 -rw-r--r--	root/root	opt/kde/share/icons/hicolor/16x16/apps/knetworkconf.png
+-rw-r--r--	root/root	opt/kde/share/icons/hicolor/16x16/apps/ksysv.png
 -rw-r--r--	root/root	opt/kde/share/icons/hicolor/16x16/apps/kuser.png
 drwxr-xr-x	root/root	opt/kde/share/icons/hicolor/22x22/
 drwxr-xr-x	root/root	opt/kde/share/icons/hicolor/22x22/actions/
@@ -212,16 +227,19 @@ drwxr-xr-x	root/root	opt/kde/share/icons/hicolor/22x22/apps/
 -rw-r--r--	root/root	opt/kde/share/icons/hicolor/22x22/apps/kcron.png
 -rw-r--r--	root/root	opt/kde/share/icons/hicolor/22x22/apps/kdat.png
 -rw-r--r--	root/root	opt/kde/share/icons/hicolor/22x22/apps/knetworkconf.png
+-rw-r--r--	root/root	opt/kde/share/icons/hicolor/22x22/apps/ksysv.png
 -rw-r--r--	root/root	opt/kde/share/icons/hicolor/22x22/apps/kuser.png
 drwxr-xr-x	root/root	opt/kde/share/icons/hicolor/32x32/
 drwxr-xr-x	root/root	opt/kde/share/icons/hicolor/32x32/apps/
 -rw-r--r--	root/root	opt/kde/share/icons/hicolor/32x32/apps/kcron.png
 -rw-r--r--	root/root	opt/kde/share/icons/hicolor/32x32/apps/kdat.png
 -rw-r--r--	root/root	opt/kde/share/icons/hicolor/32x32/apps/knetworkconf.png
+-rw-r--r--	root/root	opt/kde/share/icons/hicolor/32x32/apps/ksysv.png
 -rw-r--r--	root/root	opt/kde/share/icons/hicolor/32x32/apps/kuser.png
 drwxr-xr-x	root/root	opt/kde/share/icons/hicolor/48x48/
 drwxr-xr-x	root/root	opt/kde/share/icons/hicolor/48x48/apps/
 -rw-r--r--	root/root	opt/kde/share/icons/hicolor/48x48/apps/kdat.png
+-rw-r--r--	root/root	opt/kde/share/icons/hicolor/48x48/apps/ksysv.png
 -rw-r--r--	root/root	opt/kde/share/icons/hicolor/48x48/apps/kuser.png
 drwxr-xr-x	root/root	opt/kde/share/icons/hicolor/64x64/
 drwxr-xr-x	root/root	opt/kde/share/icons/hicolor/64x64/apps/
@@ -233,6 +251,11 @@ drwxr-xr-x	root/root	opt/kde/share/icons/locolor/16x16/apps/
 drwxr-xr-x	root/root	opt/kde/share/icons/locolor/32x32/
 drwxr-xr-x	root/root	opt/kde/share/icons/locolor/32x32/apps/
 -rw-r--r--	root/root	opt/kde/share/icons/locolor/32x32/apps/kdat.png
+drwxr-xr-x	root/root	opt/kde/share/mimelnk/
+drwxr-xr-x	root/root	opt/kde/share/mimelnk/application/
+-rw-r--r--	root/root	opt/kde/share/mimelnk/application/x-ksysv.desktop
+drwxr-xr-x	root/root	opt/kde/share/mimelnk/text/
+-rw-r--r--	root/root	opt/kde/share/mimelnk/text/x-ksysv-log.desktop
 drwxr-xr-x	root/root	opt/kde/share/services/
 -rw-r--r--	root/root	opt/kde/share/services/kfile_deb.desktop
 -rw-r--r--	root/root	opt/kde/share/services/kfile_rpm.desktop
diff --git a/kde3/kdeadmin3/.md5sum b/kde3/kdeadmin3/.md5sum
index 461b439ba..dfd6a8b47 100644
--- a/kde3/kdeadmin3/.md5sum
+++ b/kde3/kdeadmin3/.md5sum
@@ -1 +1,2 @@
 eb23c52c945f31a48f2c9df4330a1262  kdeadmin-3.5.10.tar.bz2
+e6fa9c6925eee09746dfc017f9bb82fd  kdedmin-3.5.10-nutyx-1.patch
diff --git a/kde3/kdeadmin3/Pkgfile b/kde3/kdeadmin3/Pkgfile
index 1194fabb5..53ae8c0bd 100755
--- a/kde3/kdeadmin3/Pkgfile
+++ b/kde3/kdeadmin3/Pkgfile
@@ -6,20 +6,19 @@
 
 name=kdeadmin3
 version=3.5.10
-release=1
-group=kde3
-source=(ftp://ftp.lip6.fr/pub/X11/kde/stable/$version/src/kdeadmin-$version.tar.bz2)
-
+release=2
+source=(ftp://ftp.lip6.fr/pub/X11/kde/stable/$version/src/kdeadmin-$version.tar.bz2 \
+	http://nutyx.meticul.eu/files/patchs/$name/kdedmin-3.5.10-nutyx-1.patch)
 build() {
 	cd kdeadmin-$version
+	patch -Np1 -i ../kdedmin-3.5.10-nutyx-1.patch
+	export DO_NOT_COMPILE=kpackage
 	./configure --prefix=/opt/kde \
                 --disable-debug \
 		--without-rpm \
 		--with-shadow \
-		DO_NOT_COMPILE="ksysv kpackage" \
                 --disable-dependency-tracking \
 		--enable-final
-	make -j2
+	make
 	make DESTDIR=$PKG install
-	rm -rf $PKG/$KDE3_PREFIX/share/doc
 }
diff --git a/kde3/kdeadmin3/post-install b/kde3/kdeadmin3/post-install
deleted file mode 100644
index e2a94d60a..000000000
--- a/kde3/kdeadmin3/post-install
+++ /dev/null
@@ -1,4 +0,0 @@
-package=kdeadmin
-if ( pkginfo -i | grep $package > /dev/null ) ; then
-        pkgrm $package
-fi