[arch-commits] Commit in gtkam/trunk (PKGBUILD gtkam.patch)

[Eduardo Romero]

    Date: Wednesday, July 16, 2008 @ 15:05:38
  Author: eduardo
Revision: 5487

upgpkg: gtkam 0.1.15-1
    now uses libexif-gtk, has no GNOME dependencies

Modified:
  gtkam/trunk/PKGBUILD
Deleted:
  gtkam/trunk/gtkam.patch

-------------+
 PKGBUILD    |   16 ++++++--------
 gtkam.patch |   63 ----------------------------------------------------------
 2 files changed, 7 insertions(+), 72 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2008-07-16 19:04:04 UTC (rev 5486)
+++ PKGBUILD	2008-07-16 19:05:38 UTC (rev 5487)
@@ -1,24 +1,22 @@
 # $Id$
-# Maintainer: Jason Chu <jason at archlinux.org>
+# Maintainer: Eduardo Romero <eduardo at archlinux.org>
 
 pkgname=gtkam
 pkgver=0.1.15
 pkgrel=1
 pkgdesc="A graphical front-end to gPhoto for GNOME"
+arch=('i686')
 url="http://gphoto.sourceforge.net/proj/gtkam/"
-arch=('i686' 'x86_64')
-depends=('libgphoto2' 'libbonoboui' 'libgnomeui')
+license=('GPL')
+depends=('libgphoto2' 'libexif-gtk')
 makedepends=('gimp')
-conflicts=()
-backup=()
 install=gtkam.install
 source=(http://downloads.sourceforge.net/sourceforge/gphoto/$pkgname-$pkgver.tar.gz)
-license=('GPL2')
 md5sums=('6278447dd2f6352809d5378bb88555fc')
 
 build() {
   cd $startdir/src/$pkgname-$pkgver
-  patch -p1 < ../gtkam.patch
-  ./configure --prefix=/usr --sysconfdir=/etc
-  make DESTDIR=$startdir/pkg install
+  ./configure --prefix=/usr --sysconfdir=/etc --without-bonobo --without-gnome
+  make || return 1
+  make DESTDIR=$startdir/pkg install || return 1
 }

Deleted: gtkam.patch
===================================================================
--- gtkam.patch	2008-07-16 19:04:04 UTC (rev 5486)
+++ gtkam.patch	2008-07-16 19:05:38 UTC (rev 5487)
@@ -1,63 +0,0 @@
-diff -ur gtkam-0.1.12/help/C/gtkam.xml gtkam-0.1.12-new/help/C/gtkam.xml
---- gtkam-0.1.12/help/C/gtkam.xml	2004-04-27 03:38:53.000000000 -0700
-+++ gtkam-0.1.12-new/help/C/gtkam.xml	2004-07-14 23:19:19.000000000 -0700
-@@ -183,7 +183,7 @@
-     		then press <keycap>Return</keycap>:</para>
-     		<para> 
- 			<command>gtkam</command> 
--			<!--FIXME comand line --switches -->
-+			<!--FIXME comand line switches -->
-     		</para> 
-     		</listitem>
-     	</varlistentry>
-@@ -203,7 +203,7 @@
- 		fileref="figures/gtkam_start_window.png" format="PNG"/> 
- 	    </imageobject>
- 	    <textobject> 
--	      <phrase>The &app; main window. On the left is the camera tree. The file list is on the right.
-+	      <phrase>The &app; main window. On the left is the camera tree. The file list is on the right.</phrase>
- 	    </textobject> 
- 	  </mediaobject> 
- 	</screenshot> 
-diff -ur gtkam-0.1.12/omf-install/Makefile.am gtkam-0.1.12-new/omf-install/Makefile.am
---- gtkam-0.1.12/omf-install/Makefile.am	2004-01-21 02:55:11.000000000 -0800
-+++ gtkam-0.1.12-new/omf-install/Makefile.am	2004-07-14 23:19:41.000000000 -0700
-@@ -24,7 +24,7 @@
- 	-for file in $(srcdir)/*.omf; do \
- 		$(INSTALL_DATA) $(srcdir)/$$file $(DESTDIR)$(omf_dest_dir); \
- 	done
--	-scrollkeeper-update -p $(scrollkeeper_localstate_dir) 
-+	-/bin/true -p $(scrollkeeper_localstate_dir) 
- 
- uninstall-local:
- 	-for file in $(srcdir)/*.omf; do \
-@@ -32,7 +32,7 @@
- 		rm -f $(omf_dest_dir)/$$basefile; \
- 	done
- 	-rmdir $(omf_dest_dir)
--	-scrollkeeper-update -p $(scrollkeeper_localstate_dir)
-+	-/bin/true -p $(scrollkeeper_localstate_dir)
- 
- clean-local:
- 	-for file in $(omffile); do \
-diff -ur gtkam-0.1.12/omf-install/Makefile.in gtkam-0.1.12-new/omf-install/Makefile.in
---- gtkam-0.1.12/omf-install/Makefile.in	2004-05-21 18:28:56.000000000 -0700
-+++ gtkam-0.1.12-new/omf-install/Makefile.in	2004-07-14 23:19:58.000000000 -0700
-@@ -232,7 +232,7 @@
- 	-for file in $(srcdir)/*.omf; do \
- 		$(INSTALL_DATA) $(srcdir)/$$file $(DESTDIR)$(omf_dest_dir); \
- 	done
--	-scrollkeeper-update -p $(scrollkeeper_localstate_dir) 
-+	-/bin/true -p $(scrollkeeper_localstate_dir) 
- 
- uninstall-local:
- 	-for file in $(srcdir)/*.omf; do \
-@@ -240,7 +240,7 @@
- 		rm -f $(omf_dest_dir)/$$basefile; \
- 	done
- 	-rmdir $(omf_dest_dir)
--	-scrollkeeper-update -p $(scrollkeeper_localstate_dir)
-+	-/bin/true -p $(scrollkeeper_localstate_dir)
- 
- clean-local:
- 	-for file in $(omffile); do \