Updated to 2.1 and added youtube-dl

3 files changed, 35 insertions, 24 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ffd8a265cfb9..83816743efd5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = kde-services
 	pkgdesc = kde-service multifunction
-	pkgver = 2.0
-	pkgrel = 8
+	pkgver = 2.1
+	pkgrel = 1
 	url = https://opendesktop.org/content/show.php/kde-services?content=147065
 	install = kde-services.install
 	arch = any
@@ -17,10 +17,11 @@ pkgbase = kde-services
 	depends = cdrkit
 	depends = diffutils
 	depends = fuseiso
-	source = http://downloads.sourceforge.net/project/kde-services/Source-Code/kde-services-2.0.tar.bz2
+	depends = youtube-dl
+	source = http://downloads.sourceforge.net/project/kde-services/Source-Code/kde-services-2.1.tar.bz2
 	source = System-Tools_addtoservicemenu.desktop
-	md5sums = 903f63348e5c04e5aaeb5d23f4c3b4e3
-	md5sums = 2a096a1c7f0b579c37fa0046b46e6770
+	sha512sums = c10f5be7ade82cff4079d63fa83a615a871cec0df3ec15bea87fe63ae074ae5c13754a77eb4b72d99f0b9ffd8689caf585e341a43fb270f211de69c2b42a1b9f
+	sha512sums = 170b89e91dad38340424911f3a1daad69b4a3bc7aa6813ffd74e53c4b34c2555f68c05334b0d2a7fa17d1f0f778369e7cfe3e0590e18e8e0bf006ec1685a59f2
 
 pkgname = kde-services
 
diff --git a/PKGBUILD b/PKGBUILD
index eb959c387f0c..d843f32c64c5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,33 +1,40 @@
-# Maintainer: carlos_manuel_83@hotmail.com  
-# Contributer: giacomogiorgianni@gmail.com 
+# Maintainer: archlinux@carstenfeuls.de
 
 pkgname=kde-services
-pkgver=2.0
-pkgrel=8
+pkgver=2.1
+pkgrel=1
 pkgdesc="kde-service multifunction"
 arch=('any')
 url="https://opendesktop.org/content/show.php/kde-services?content=147065"
 license=('GPL')
-depends=('kdebase-runtime' 'dmidecode' 'festival' 'poppler' 'ffmpeg' 'transcode' 'ghostscript' 'fuse' 'cdrkit' 'diffutils' 'fuseiso')
+depends=('kdebase-runtime' 'dmidecode' 'festival' 'poppler' 'ffmpeg' 'transcode' 'ghostscript' 'fuse' 'cdrkit' 'diffutils' 'fuseiso' 'youtube-dl')
 source=("http://downloads.sourceforge.net/project/kde-services/Source-Code/$pkgname-$pkgver.tar.bz2" System-Tools_addtoservicemenu.desktop)
-md5sums=('903f63348e5c04e5aaeb5d23f4c3b4e3'
-         '2a096a1c7f0b579c37fa0046b46e6770')
 install=${pkgname}.install
 
 package() {
   cd $srcdir/$pkgname-$pkgver
   #sed "255s|xdg-mime|##|" -i Makefile
-  sed "260s|update|##|" -i Makefile
-  sed "261s|xdg|##|" -i Makefile
-  sed "262s|xdg|##|" -i Makefile
-  sed "32s|xdg|##|" -i Makefile
-  sed "33s|update|##|" -i Makefile
-  sed "34s|xdg|##|" -i Makefile
-  sed "35s|xdg|##|" -i Makefile
+  #sed "260s|update|##|" -i Makefile
+  #sed "261s|xdg|##|" -i Makefile
+  #sed "262s|xdg|##|" -i Makefile
+  #sed "32s|xdg|##|" -i Makefile
+  #sed "33s|update|##|" -i Makefile
+  #sed "34s|xdg|##|" -i Makefile
+  #sed "35s|xdg|##|" -i Makefile
   #sed "264s|update|##|" -i Makefile
   #sed "265s|xdg|##|" -i Makefile
   #sed "266s|xdg|##|" -i Makefile
- 
+#cp servicetypes/* $(PREFIXservicetypes5)
+  
+  sed -e '/mkdir\ -p \$\(PREFIXservicetypes5\)/ s/^#*/#/' -i Makefile
+  sed -e '/servicetypes\/\*/ s/^#*/#/' -i Makefile
+
+
+  sed -e '/xdg-mime/ s/system/user/' -i Makefile
+  sed -e '/update-mime-database/ s/^#*/#/' -i Makefile
+  sed -e '/xdg-icon-resource/ s/^#*/#/' -i Makefile
+  sed -e '/xdg-desktop-menu/ s/^#*/#/' -i Makefile 
+	 
   #sed "27s|/usr|${pkgdir}/usr|" -i Makefile
   make "RPM_BUILD_ROOT=${pkgdir}" install
   # remove kernel rebuild entry is for fedora linux
@@ -36,3 +43,5 @@ package() {
   #sed '13,36d' <$pkgdir/usr/share/kde4/services/ServiceMenus/System-Tools_addtoservicemenu.desktop
   cp $srcdir/System-Tools_addtoservicemenu.desktop $pkgdir/usr/share/kde4/services/ServiceMenus/System-Tools_addtoservicemenu.desktop
 }
+sha512sums=('c10f5be7ade82cff4079d63fa83a615a871cec0df3ec15bea87fe63ae074ae5c13754a77eb4b72d99f0b9ffd8689caf585e341a43fb270f211de69c2b42a1b9f'
+            '170b89e91dad38340424911f3a1daad69b4a3bc7aa6813ffd74e53c4b34c2555f68c05334b0d2a7fa17d1f0f778369e7cfe3e0590e18e8e0bf006ec1685a59f2')
diff --git a/kde-services.install b/kde-services.install
index 304b5a94a5c5..e65cde2afae5 100644
--- a/kde-services.install
+++ b/kde-services.install
@@ -1,8 +1,9 @@
 post_install() {
-	[ -x `which update-mime-database` ] &&  update-mime-database usr/share/mime 
-	[ -x `which gtk-update-icon-cache` ] && gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-	update-desktop-database -q
-	bin/true
+	[ -x `which update-mime-database` ] &&  update-mime-database /usr/share/mime  > /dev/null
+#	[ -x `which gtk-update-icon-cache` ] && gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+	[ -x `which xdg-icon-resource` ] && xdg-icon-resource forceupdate --theme hicolor
+	[ -x `which xdg-desktop-menu` ] && xdg-desktop-menu forceupdate
+	[ -x `which update-desktop-database` ] && update-desktop-database -q
 }
 
 post_upgrade() {