kdeadmin 4.8.4-1 maj

(cherry picked from commit 883ac42e23f2e76123ce588e9f83f771f290b3d0)

5 files changed, 44 insertions, 5 deletions

diff --git a/kdeadmin/.footprint.i686 b/kdeadmin/.footprint.i686
index 94ceb63e3..b12aa1c3d 100644
--- a/kdeadmin/.footprint.i686
+++ b/kdeadmin/.footprint.i686
@@ -59,6 +59,21 @@ lrwxrwxrwx	root/root	usr/share/doc/kde/html/en/kuser/common -> /usr/share/doc/kd
 -rw-r--r--	root/root	usr/share/doc/kde/html/en/kuser/index.cache.bz2
 -rw-r--r--	root/root	usr/share/doc/kde/html/en/kuser/index.docbook
 -rw-r--r--	root/root	usr/share/doc/kde/html/en/kuser/kuser.png
+drwxr-xr-x	root/root	usr/share/doc/kde/html/en/system-config-printer-kde/
+lrwxrwxrwx	root/root	usr/share/doc/kde/html/en/system-config-printer-kde/common -> /usr/share/doc/kde/html/en/common
+-rw-r--r--	root/root	usr/share/doc/kde/html/en/system-config-printer-kde/index.cache.bz2
+-rw-r--r--	root/root	usr/share/doc/kde/html/en/system-config-printer-kde/index.docbook
+-rw-r--r--	root/root	usr/share/doc/kde/html/en/system-config-printer-kde/new-class.png
+-rw-r--r--	root/root	usr/share/doc/kde/html/en/system-config-printer-kde/new-details.png
+-rw-r--r--	root/root	usr/share/doc/kde/html/en/system-config-printer-kde/new-driver.png
+-rw-r--r--	root/root	usr/share/doc/kde/html/en/system-config-printer-kde/new-manufacturer.png
+-rw-r--r--	root/root	usr/share/doc/kde/html/en/system-config-printer-kde/new-uri.png
+-rw-r--r--	root/root	usr/share/doc/kde/html/en/system-config-printer-kde/new.png
+-rw-r--r--	root/root	usr/share/doc/kde/html/en/system-config-printer-kde/printer-job-options.png
+-rw-r--r--	root/root	usr/share/doc/kde/html/en/system-config-printer-kde/printer-options.png
+-rw-r--r--	root/root	usr/share/doc/kde/html/en/system-config-printer-kde/printer-policies.png
+-rw-r--r--	root/root	usr/share/doc/kde/html/en/system-config-printer-kde/printer-settings.png
+-rw-r--r--	root/root	usr/share/doc/kde/html/en/system-config-printer-kde/server.png
 drwxr-xr-x	root/root	usr/share/icons/
 drwxr-xr-x	root/root	usr/share/icons/hicolor/
 drwxr-xr-x	root/root	usr/share/icons/hicolor/128x128/
diff --git a/kdeadmin/.footprint.x86_64 b/kdeadmin/.footprint.x86_64
index 94ceb63e3..b12aa1c3d 100644
--- a/kdeadmin/.footprint.x86_64
+++ b/kdeadmin/.footprint.x86_64
@@ -59,6 +59,21 @@ lrwxrwxrwx	root/root	usr/share/doc/kde/html/en/kuser/common -> /usr/share/doc/kd
 -rw-r--r--	root/root	usr/share/doc/kde/html/en/kuser/index.cache.bz2
 -rw-r--r--	root/root	usr/share/doc/kde/html/en/kuser/index.docbook
 -rw-r--r--	root/root	usr/share/doc/kde/html/en/kuser/kuser.png
+drwxr-xr-x	root/root	usr/share/doc/kde/html/en/system-config-printer-kde/
+lrwxrwxrwx	root/root	usr/share/doc/kde/html/en/system-config-printer-kde/common -> /usr/share/doc/kde/html/en/common
+-rw-r--r--	root/root	usr/share/doc/kde/html/en/system-config-printer-kde/index.cache.bz2
+-rw-r--r--	root/root	usr/share/doc/kde/html/en/system-config-printer-kde/index.docbook
+-rw-r--r--	root/root	usr/share/doc/kde/html/en/system-config-printer-kde/new-class.png
+-rw-r--r--	root/root	usr/share/doc/kde/html/en/system-config-printer-kde/new-details.png
+-rw-r--r--	root/root	usr/share/doc/kde/html/en/system-config-printer-kde/new-driver.png
+-rw-r--r--	root/root	usr/share/doc/kde/html/en/system-config-printer-kde/new-manufacturer.png
+-rw-r--r--	root/root	usr/share/doc/kde/html/en/system-config-printer-kde/new-uri.png
+-rw-r--r--	root/root	usr/share/doc/kde/html/en/system-config-printer-kde/new.png
+-rw-r--r--	root/root	usr/share/doc/kde/html/en/system-config-printer-kde/printer-job-options.png
+-rw-r--r--	root/root	usr/share/doc/kde/html/en/system-config-printer-kde/printer-options.png
+-rw-r--r--	root/root	usr/share/doc/kde/html/en/system-config-printer-kde/printer-policies.png
+-rw-r--r--	root/root	usr/share/doc/kde/html/en/system-config-printer-kde/printer-settings.png
+-rw-r--r--	root/root	usr/share/doc/kde/html/en/system-config-printer-kde/server.png
 drwxr-xr-x	root/root	usr/share/icons/
 drwxr-xr-x	root/root	usr/share/icons/hicolor/
 drwxr-xr-x	root/root	usr/share/icons/hicolor/128x128/
diff --git a/kdeadmin/.md5sum.i686 b/kdeadmin/.md5sum.i686
index 43f6dbfac..bc5f1c582 100644
--- a/kdeadmin/.md5sum.i686
+++ b/kdeadmin/.md5sum.i686
@@ -1 +1,2 @@
-e91742cf1c77b7c799f2b1d974088a1d  kdeadmin-4.8.3.tar.xz
+7807e66e0cfe1c573b96f705d3219ee2  kdeadmin-4.8.4.tar.xz
+10f5ec447853b728f765124db67ee7cb  syslog-path.patch
diff --git a/kdeadmin/.md5sum.x86_64 b/kdeadmin/.md5sum.x86_64
index 43f6dbfac..bc5f1c582 100644
--- a/kdeadmin/.md5sum.x86_64
+++ b/kdeadmin/.md5sum.x86_64
@@ -1 +1,2 @@
-e91742cf1c77b7c799f2b1d974088a1d  kdeadmin-4.8.3.tar.xz
+7807e66e0cfe1c573b96f705d3219ee2  kdeadmin-4.8.4.tar.xz
+10f5ec447853b728f765124db67ee7cb  syslog-path.patch
diff --git a/kdeadmin/Pkgfile b/kdeadmin/Pkgfile
index a9d57f2fa..080408bc9 100755
--- a/kdeadmin/Pkgfile
+++ b/kdeadmin/Pkgfile
@@ -3,15 +3,17 @@
 # Maintainer: KDE Project : https://projects.kde.org/projects/kde
 # Packager: lesibel at free dot fr
 # Depends on: cmake,automoc4,kdelibs,kdepimlibs,pykde4,system-config-printer,libcups
-# Run on: kdelibs,kdepimlibs,pykde4,system-config-printer,libcups
+# Run on: kdelibs,kdepiimlibs,pykde4,system-config-printer,libcups
 
 name=kdeadmin
-version=4.8.3
+version=4.8.4
 release=1
-source=( ftp://ftp.kde.org/pub/kde/stable/$version/src/$name-$version.tar.xz)
+source=( ftp://ftp.kde.org/pub/kde/stable/$version/src/$name-$version.tar.xz
+	 syslog-path.patch)
 
 build() {
 	cd $name-*
+#	patch -p1 -i ../syslog-path.patch
 	mkdir build
 	cd build
 	cmake ../ -DCMAKE_INSTALL_PREFIX=/usr \
@@ -24,6 +26,11 @@ build() {
  
 	make
 	make DESTDIR=$PKG install
+
+	sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \
+        	$PKG/usr/share/apps/system-config-printer-kde/{system-config-printer-kde,authconn}.py
+    	sed -i 's|#!/usr/bin/python|#!/usr/bin/python2|' \
+        	$PKG/usr/share/apps/system-config-printer-kde/pysmb.py
 }