[arch-commits] Commit in polkit-kde/repos (3 files)

[Pierre Schmitz]

    Date: Wednesday, February 10, 2010 @ 15:40:11
  Author: pierre
Revision: 68129

Merged revisions 68126 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/polkit-kde/trunk

........
  r68126 | pierre | 2010-02-10 21:37:55 +0100 (Mi, 10 Feb 2010) | 1 line
  
  fix xdg path
........

Added:
  polkit-kde/repos/extra-x86_64/xdg-path.patch
    (from rev 68126, polkit-kde/trunk/xdg-path.patch)
Modified:
  polkit-kde/repos/extra-x86_64/	(properties)
  polkit-kde/repos/extra-x86_64/PKGBUILD

----------------+
 PKGBUILD       |   14 +++++++++-----
 xdg-path.patch |   13 +++++++++++++
 2 files changed, 22 insertions(+), 5 deletions(-)


Property changes on: polkit-kde/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /polkit-kde/trunk:1-66737
   + /polkit-kde/trunk:1-68127

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2010-02-10 20:40:01 UTC (rev 68128)
+++ extra-x86_64/PKGBUILD	2010-02-10 20:40:11 UTC (rev 68129)
@@ -3,18 +3,22 @@
 
 pkgname=polkit-kde
 pkgver=0.95.1
-pkgrel=1
+pkgrel=2
 pkgdesc='KDE PolicyKit Authentication Agent'
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
 license=('GPL')
 depends=('kdelibs')
 makedepends=('cmake' 'automoc4')
-source=("ftp://ftp.kde.org/pub/kde/stable/apps/KDE4.x/admin/${pkgname}-1-${pkgver}.tar.bz2")
-md5sums=('68e40d2a43335cb5876a1c8bc51c461b')
+source=("ftp://ftp.kde.org/pub/kde/stable/apps/KDE4.x/admin/${pkgname}-1-${pkgver}.tar.bz2"
+        'xdg-path.patch')
+md5sums=('68e40d2a43335cb5876a1c8bc51c461b'
+         '84d4873e60c1b628bcbaaf38c7ab2f44')
 
 build() {
-	cd ${srcdir}
+	cd ${srcdir}/${pkgname}-1-${pkgver}
+	patch -p0 -i ${srcdir}/xdg-path.patch || return 1
+	cd ..
 	mkdir build
 	cd build
 	export XDG_CONFIG_DIRS=/etc/xdg
@@ -27,5 +31,5 @@
 
 package() {
 	cd ${srcdir}/build
-	make DESTDIR=$pkgdir install
+	make DESTDIR=${pkgdir} install
 }

Copied: polkit-kde/repos/extra-x86_64/xdg-path.patch (from rev 68126, polkit-kde/trunk/xdg-path.patch)
===================================================================
--- extra-x86_64/xdg-path.patch	                        (rev 0)
+++ extra-x86_64/xdg-path.patch	2010-02-10 20:40:11 UTC (rev 68129)
@@ -0,0 +1,13 @@
+--- agent/CMakeLists.txt	2009-12-23 12:31:29.000000000 +0100
++++ agent/CMakeLists.txt	2010-02-10 21:26:05.183779591 +0100
+@@ -18,8 +18,8 @@
+ 
+ install(TARGETS polkit-kde-authentication-agent-1 DESTINATION ${LIBEXEC_INSTALL_DIR})
+ 
+-# Install .desktop file to the XDG_CONFIG_DIRS if exists, to the /etc/xdg/autostart otherwise
+-set (DESKTOP_INSTALL_DIR $ENV{XDG_CONFIG_DIRS})
++# Install .desktop file to the XDG_CONFIG_DIRS/autostart if exists, to the /etc/xdg/autostart otherwise
++set (DESKTOP_INSTALL_DIR $ENV{XDG_CONFIG_DIRS}/autostart)
+ if (DESKTOP_INSTALL_DIR)
+ else (DESKTOP_INSTALL_DIR)
+   set (DESKTOP_INSTALL_DIR /etc/xdg/autostart)