[arch-commits] CVS update of extra/gnome/sbackup (PKGBUILD makefile.patch)

[Travis Willard]

    Date: Wednesday, May 16, 2007 @ 22:30:40
  Author: travis
    Path: /home/cvs-extra/extra/gnome/sbackup

Modified: PKGBUILD (1.4 -> 1.5) makefile.patch (1.1 -> 1.2)

upgpkg: sbackup 0.10.2-3
Fix a small problem with the makefile and PKGBUILD that causes the default sbackup.conf to contain my build path


----------------+
 PKGBUILD       |   10 +++++-----
 makefile.patch |    7 +++----
 2 files changed, 8 insertions(+), 9 deletions(-)


Index: extra/gnome/sbackup/PKGBUILD
diff -u extra/gnome/sbackup/PKGBUILD:1.4 extra/gnome/sbackup/PKGBUILD:1.5
--- extra/gnome/sbackup/PKGBUILD:1.4	Sun Apr 29 11:19:57 2007
+++ extra/gnome/sbackup/PKGBUILD	Wed May 16 22:30:39 2007
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD,v 1.4 2007/04/29 15:19:57 travis Exp $
+# $Id: PKGBUILD,v 1.5 2007/05/17 02:30:39 travis Exp $
 # Maintainer: Travis Willard <travisw at wmpub.ca>
 # Contributor: William Rea <sillywilly at gmail.com>
 
 pkgname=sbackup
 pkgver=0.10.2
-pkgrel=2
+pkgrel=3
 pkgdesc="A simple backup solution intended for desktop use"
 arch=('i686' 'x86_64')
 url="http://sbackup.sourceforge.net"
@@ -21,10 +21,10 @@
   sed -i -e "s/gksudo/gksu/" sbackup.desktop
   mkdir -p $startdir/pkg/usr/share/applications
   mkdir -p $startdir/pkg/etc
-  make DESTDIR=$startdir/pkg/usr PREFIX=$startdir/pkg/usr CONFDIR=$startdir/pkg/etc install
+  make PREFIX=/usr DESTDIR=$startdir/pkg/usr CONFDIR=$startdir/pkg/etc install
 }
 
 md5sums=('dcf32ce87580780be90675a3246726b4'
-         '9a76c8b7b2409fbb0e44365687e4def3')
+         '0b525249fb6ef4bd17b74157a9d83c0c')
 sha1sums=('10bc6628e37d66d21a8d252883408394c0901652'
-          '45ba6fd6b26b86962701b9a1972bde57c2673b1c')
+          '83d507fa2e48ebf4f2110ef78cd70cab459bf90e')
Index: extra/gnome/sbackup/makefile.patch
diff -u extra/gnome/sbackup/makefile.patch:1.1 extra/gnome/sbackup/makefile.patch:1.2
--- extra/gnome/sbackup/makefile.patch:1.1	Wed Mar  7 22:34:41 2007
+++ extra/gnome/sbackup/makefile.patch	Wed May 16 22:30:39 2007
@@ -17,7 +17,7 @@
  	install ./sbackupd $(BIN)
  	install ./simple-backup-config $(BIN)/simple-backup-config
  	install ./simple-restore-gnome $(BIN)/simple-restore-gnome
-@@ -26,10 +27,10 @@
+@@ -26,10 +27,8 @@
  	install -m644 srestore.desktop $(DESTDIR)/share/applications/
  	install -m644 simple-restore.glade $(SUPPORT)
  #	install -m644 simple-backup-tocd.glade $(SUPPORT)
@@ -25,14 +25,13 @@
 -	install -b -m600 sbackup.conf.example /etc/sbackup.conf
 -	@echo "[places]" >> /etc/sbackup.conf
 -	@echo "prefix=$(PREFIX)" >> /etc/sbackup.conf
-+ifeq ($(DESTDIR),$(PREFIX))
+-endif
 +	install -b -m600 sbackup.conf.example $(CONFDIR)/sbackup.conf
 +	@echo "[places]" >> $(CONFDIR)/sbackup.conf
 +	@echo "prefix=$(PREFIX)" >> $(CONFDIR)/sbackup.conf
- endif
  
  uninstall:
-@@ -42,7 +43,7 @@
+@@ -42,7 +41,7 @@
  	rm -rf $(DOC)
  	rm -f $(DESTDIR)/share/applications/sbackup.desktop
  	rm -f $(DESTDIR)/share/applications/srestore.desktop