[arch-commits] Commit in gtk-xfce-engine/repos (extra-x86_64 extra-x86_64/PKGBUILD)

[Eric Belanger]

    Date: Sunday, September 7, 2008 @ 19:02:21
  Author: eric
Revision: 12012

fixing svn conflicts

Modified:
  gtk-xfce-engine/repos/extra-x86_64/	(properties)
  gtk-xfce-engine/repos/extra-x86_64/PKGBUILD

----------+
 PKGBUILD |   11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)


Property changes on: gtk-xfce-engine/repos/extra-x86_64
___________________________________________________________________
Name: svnmerge-integrated
   - /gtk-xfce-engine/trunk:1
   + /gtk-xfce-engine/trunk:1-12011

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2008-09-07 22:45:22 UTC (rev 12011)
+++ extra-x86_64/PKGBUILD	2008-09-07 23:02:21 UTC (rev 12012)
@@ -1,9 +1,9 @@
 # $Id$
-# Maintainer: aurelien <aurelien at archlinux.org>
+# Maintainer: Tobias Kieslich <tobias at archlinux.org>
 
 pkgname=gtk-xfce-engine
 pkgver=2.4.2
-pkgrel=1
+pkgrel=2
 pkgdesc="A port of Xfce engine to GTK+-2.0"
 arch=(i686 x86_64)
 license=('GPL2')
@@ -12,9 +12,8 @@
 depends=('gtk2')
 makedepends=('pkgconfig')
 options=('!libtool')
-source=(http://www.xfce.org/archive/xfce-4.4.2/src/${pkgname}-${pkgver}.tar.bz2 \
-        ftp://ftp.archlinux.org/other/xfce4-graphics/ArchLinux-xfce4-gtk2.tar.gz)
-md5sums=('00eb6a62defe6867d28a18569b96d151' '71481fef064c74041f4529589a98875c')
+source=(http://www.xfce.org/archive/xfce-4.4.2/src/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('00eb6a62defe6867d28a18569b96d151')
 
 build() {
   cd ${startdir}/src/${pkgname}-${pkgver}
@@ -22,6 +21,4 @@
     --localstatedir=/var --disable-static
   make || return 1
   make DESTDIR=${startdir}/pkg install
-  mkdir -p ${startdir}/pkg/usr/share/themes
-  cp -R ../ArchLinux ${startdir}/pkg/usr/share/themes
 }