[arch-commits] Commit in gqview-devel/repos (unstable-x86_64 unstable-x86_64/PKGBUILD)

[Eric Belanger]

    Date: Wednesday, July 9, 2008 @ 12:18:19
  Author: eric
Revision: 4734

fixing svn conflict

Modified:
  gqview-devel/repos/unstable-x86_64/	(properties)
  gqview-devel/repos/unstable-x86_64/PKGBUILD

----------+
 PKGBUILD |   19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)


Property changes on: gqview-devel/repos/unstable-x86_64
___________________________________________________________________
Name: svnmerge-integrated
   - /gqview-devel/trunk:1
   + /gqview-devel/trunk:1-4733

Modified: unstable-x86_64/PKGBUILD
===================================================================
--- unstable-x86_64/PKGBUILD	2008-07-09 16:17:13 UTC (rev 4733)
+++ unstable-x86_64/PKGBUILD	2008-07-09 16:18:19 UTC (rev 4734)
@@ -2,25 +2,24 @@
 # Maintainer: damir <damir at archlinux.org>
 # Contributor: damir <damir at archlinux.org>
 
-origname=gqview
 pkgname=gqview-devel
-provides=('gqview')
-conflicts=('gqview')
 pkgver=2.1.5
-pkgrel=1
+pkgrel=2
 pkgdesc="An image browser and viewer [devel]"
 arch=('i686' 'x86_64')
+url="http://gqview.sourceforge.net/"
+license=('GPL2')
 depends=('gtk2' 'lcms')
-source=(http://puzzle.dl.sourceforge.net/sourceforge/$origname/$origname-$pkgver.tar.gz konqgqview.desktop)
-url="http://$origname.sourceforge.net/"
+provides=('gqview')
+conflicts=('gqview')
+source=(http://puzzle.dl.sourceforge.net/sourceforge/gqview/gqview-$pkgver.tar.gz konqgqview.desktop)
+md5sums=('4644187d9b14b1dc11ac3bb146f262ea' 'aa501f02b019590289ed17505863c859')
 
 build() {
-  cd $startdir/src/$origname-$pkgver
-  ./configure --prefix=/usr
+  cd $startdir/src/gqview-$pkgver
+  ./configure --prefix=/usr --mandir=/usr/share/man
   make || return 1
   make DESTDIR=$startdir/pkg install
-  rm -rf $startdir/pkg/usr/share
   mkdir -p $startdir/pkg/opt/kde/share/apps/konqueror/servicemenus/
   cp $startdir/src/konqgqview.desktop $startdir/pkg/opt/kde/share/apps/konqueror/servicemenus/
 }
-