[arch-commits] Commit in (4 files)

[Andrea Scarpino]

    Date: Monday, November 21, 2011 @ 09:04:58
  Author: andrea
Revision: 143033

Minor KDE fixes

Modified:
  kdebase-runtime/trunk/PKGBUILD
  kdelibs/trunk/PKGBUILD
  kdemultimedia/trunk/PKGBUILD
  kdepim/trunk/PKGBUILD

--------------------------------+
 kdebase-runtime/trunk/PKGBUILD |    6 +++++-
 kdelibs/trunk/PKGBUILD         |    6 +++---
 kdemultimedia/trunk/PKGBUILD   |    3 +--
 kdepim/trunk/PKGBUILD          |    5 +++--
 4 files changed, 12 insertions(+), 8 deletions(-)

Modified: kdebase-runtime/trunk/PKGBUILD
===================================================================
--- kdebase-runtime/trunk/PKGBUILD	2011-11-21 14:01:14 UTC (rev 143032)
+++ kdebase-runtime/trunk/PKGBUILD	2011-11-21 14:04:58 UTC (rev 143033)
@@ -10,7 +10,7 @@
 url='http://www.kde.org'
 license=('GPL' 'LGPL')
 depends=('kdelibs' 'ntrack' 'smbclient' 'libssh' 'libcanberra' 'oxygen-icons'
-        'xorg-xauth' 'hicolor-icon-theme')
+        'xorg-xauth')
 makedepends=('pkg-config' 'cmake' 'automoc4' 'kdepimlibs' 'openslp' 'xine-lib')
 optdepends=('htdig: to build the search index in khelpcenter'
             'rarian: needed by khelpcenter'
@@ -35,4 +35,8 @@
 	make DESTDIR="$pkgdir" install
 	rm -f "${pkgdir}/usr/share/icons/hicolor/index.theme"
 	ln -sf /usr/lib/kde4/libexec/kdesu "${pkgdir}/usr/bin/"
+
+    # Fix Python2 path
+    sed -i 's|/usr/bin/env python|/usr/bin/env python2|' \
+      "${pkgdir}"/usr/bin/nepomuk-simpleresource-rcgen
 }

Modified: kdelibs/trunk/PKGBUILD
===================================================================
--- kdelibs/trunk/PKGBUILD	2011-11-21 14:01:14 UTC (rev 143032)
+++ kdelibs/trunk/PKGBUILD	2011-11-21 14:04:58 UTC (rev 143033)
@@ -9,13 +9,13 @@
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
 license=('GPL' 'LGPL' 'FDL')
-depends=('strigi' 'attica' 'libxss' 'xz' 'openssl' 'soprano' 'krb5'
-        'shared-desktop-ontologies' 'qca' 'libdbusmenu-qt' 'polkit-qt' 'grantlee'
+depends=('strigi' 'attica' 'libxss' 'xz' 'soprano' 'krb5' 'grantlee'
+        'shared-desktop-ontologies' 'qca' 'libdbusmenu-qt' 'polkit-qt'
         'shared-mime-info' 'enchant' 'giflib' 'jasper' 'openexr' 'docbook-xsl'
         'phonon' 'upower' 'udisks' 'libxcursor')
 makedepends=('pkgconfig' 'cmake' 'automoc4' 'avahi' 'libgl' 'hspell')
 replaces=('kdelibs-experimental')
-install='kdelibs.install'
+install=${pkgname}.install
 source=("http://download.kde.org/unstable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2"
         'kde-applications-menu.patch' 'archlinux-menu.patch')
 sha1sums=('f2fb780794ec49687009d9367f895470aecb23ad'

Modified: kdemultimedia/trunk/PKGBUILD
===================================================================
--- kdemultimedia/trunk/PKGBUILD	2011-11-21 14:01:14 UTC (rev 143032)
+++ kdemultimedia/trunk/PKGBUILD	2011-11-21 14:04:58 UTC (rev 143033)
@@ -30,8 +30,7 @@
 	cmake ../${pkgbase}-${pkgver} \
 		-DCMAKE_BUILD_TYPE=Release \
 		-DCMAKE_SKIP_RPATH=ON \
-		-DCMAKE_INSTALL_PREFIX=/usr \
-		-DWITH_Xine=OFF
+		-DCMAKE_INSTALL_PREFIX=/usr
 	make
 }
 

Modified: kdepim/trunk/PKGBUILD
===================================================================
--- kdepim/trunk/PKGBUILD	2011-11-21 14:01:14 UTC (rev 143032)
+++ kdepim/trunk/PKGBUILD	2011-11-21 14:04:58 UTC (rev 143033)
@@ -127,6 +127,7 @@
 package_kdepim-kleopatra() {
 	pkgdesc='Certificate Manager and Unified Crypto GUI'
 	depends=('kdepim-libkdepim')
+    install=kdepim-kleopatra.install
 	url="http://kde.org/applications/utilities/kleopatra/"
 	cd "${srcdir}"/build/kleopatra
 	make DESTDIR="${pkgdir}" install
@@ -138,7 +139,7 @@
 	pkgdesc='Mail Client'
 	depends=('kdepim-libkdepim')
 	url="http://kde.org/applications/internet/kmail/"
-	install='kdepim.install'
+	install='kdepim-kmail.install'
 	conflicts=('kdepim-kmailcvt' 'kdepim-ksendemail' 'kdepim-libksieve'
 	           'kdepim-mimelib' 'kdepim-plugins')
 	replaces=('kdepim-kmailcvt' 'kdepim-ksendemail' 'kdepim-libksieve'
@@ -194,7 +195,7 @@
 	pkgdesc='Calendar and Scheduling Program'
 	depends=('kdepim-libkdepim')
 	url="http://kde.org/applications/office/korganizer"
-	install='kdepim.install'
+	install='kdepim-korganizer.install'
 	cd "${srcdir}"/build/korganizer
 	make DESTDIR="${pkgdir}" install
 	cd "${srcdir}"/build/doc/korganizer