[arch-commits] Commit in xdg-utils/trunk (PKGBUILD)

[andyrtr at archlinux.org]

    Date: Sunday, May 20, 2012 @ 05:27:01
  Author: andyrtr
Revision: 159268

upgpkg: xdg-utils 1.1.0-0.20120520

build latest git snapshot; drop Xfce patch - lots of commits adress xfce issue and should have solved it

Modified:
  xdg-utils/trunk/PKGBUILD

----------+
 PKGBUILD |   42 +++++++++++++-----------------------------
 1 file changed, 13 insertions(+), 29 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-05-20 08:22:19 UTC (rev 159267)
+++ PKGBUILD	2012-05-20 09:27:01 UTC (rev 159268)
@@ -2,13 +2,14 @@
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=xdg-utils
-pkgver=1.1.0rc1
-pkgrel=3
-pkgdesc='Command line tools that assist applications with a variety of desktop integration tasks'
+pkgver=1.1.0
+_gitdate=20120520
+pkgrel=0.${_gitdate}
+pkgdesc="Command line tools that assist applications with a variety of desktop integration tasks"
 arch=('any')
-url='http://portland.freedesktop.org/'
+url="http://portland.freedesktop.org/"
 license=('MIT')
-depends=('sh' 'xorg-xset')
+depends=('sh' 'xorg-xset') # xset needed inside xdg-screensaver
 makedepends=('docbook-xsl' 'lynx' 'xmlto')
 optdepends=('kdebase-runtime: for KDE support in xdg-open'
             'libgnome: for GNOME support in xdg-open'
@@ -16,39 +17,22 @@
             'xorg-xprop: for Xfce support in xdg-open'
             'pcmanfm: for LXDE support in xdg-open'
             'perl-file-mimeinfo: for generic support in xdg-open')
-source=(#"ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.xz"
-	http://portland.freedesktop.org/download/${pkgname}-${pkgver/rc1/-rc1}.tar.gz \
-	xfce-detection.diff)
-md5sums=('fadf5e7a08e0526fc60dbe3e5b7ef8d6'
+source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.${_gitdate}.tar.gz  # last git commit 2012-03-10 13:55:24 (GMT) allow DESKTOP_SESSION='Xfce Session' to match xfce
+		xfce-detection.diff)
+md5sums=('4e37d65322dbc4763e85b8ba461f919b'
          '061c85755b9f3ca8a8cc847518b6be3d')
 
 build() {
-	#cd "${srcdir}/${pkgname}-${pkgver}"
-	cd "${srcdir}"/${pkgname}-${pkgver/rc1/-rc1}
-	patch -p0 -i "${srcdir}"/xfce-detection.diff
+	cd ${srcdir}/${pkgname}-5be359a49d4d8dc3c5f814ab89b8422ad522d837
+	# disable patch for now, the grep upstream issue is solved as fixed and lots of xfce related commits should have fixed this
+	#patch -p0 -i "${srcdir}"/xfce-detection.diff
 	./configure --prefix=/usr --mandir=/usr/share/man
 	make -C scripts
 	make
 }
 
 package() {
-	#cd "${srcdir}/${pkgname}-${pkgver}"
-	cd "${srcdir}"/${pkgname}-${pkgver/rc1/-rc1}
+	cd ${srcdir}/${pkgname}-5be359a49d4d8dc3c5f814ab89b8422ad522d837
 	make DESTDIR="${pkgdir}" install
 	install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
-
-_source() {
-
-	# outdated! see now http://cgit.freedesktop.org/xdg/xdg-utils/
-	local _current=$(pwd)
-	local _tmp=$(mktemp -d)
-	cd $_tmp
-
-	cvs -d:pserver:anoncvs at anoncvs.freedesktop.org:/cvs/portland co -d ${pkgname}-${pkgver} portland/xdg-utils
-	find ${pkgname}-${pkgver} -name 'CVS' -type d -exec rm -rf {} \;
-	bsdtar cJf ${pkgname}-${pkgver}.tar.xz ${pkgname}-${pkgver}
-	mv ${pkgname}-${pkgver}.tar.xz $_current
-	cd $_current
-	rm -rf $_tmp
-}