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

[Travis Willard]

    Date: Sunday, June 3, 2007 @ 21:50:52
  Author: travis
    Path: /home/cvs-extra/extra/gnome/sbackup

Modified: PKGBUILD (1.5 -> 1.6) makefile.patch (1.2 -> 1.3)

upgpkg: sbackup 0.10.4-1
Upstream update


----------------+
 PKGBUILD       |   22 +++++++---------
 makefile.patch |   73 +++++++++++++++++++++++++++++++++++--------------------
 2 files changed, 57 insertions(+), 38 deletions(-)


Index: extra/gnome/sbackup/PKGBUILD
diff -u extra/gnome/sbackup/PKGBUILD:1.5 extra/gnome/sbackup/PKGBUILD:1.6
--- extra/gnome/sbackup/PKGBUILD:1.5	Wed May 16 22:30:39 2007
+++ extra/gnome/sbackup/PKGBUILD	Sun Jun  3 21:50:52 2007
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD,v 1.5 2007/05/17 02:30:39 travis Exp $
+# $Id: PKGBUILD,v 1.6 2007/06/04 01:50:52 travis Exp $
 # Maintainer: Travis Willard <travisw at wmpub.ca>
 # Contributor: William Rea <sillywilly at gmail.com>
 
 pkgname=sbackup
-pkgver=0.10.2
-pkgrel=3
+pkgver=0.10.4
+pkgrel=1
 pkgdesc="A simple backup solution intended for desktop use"
 arch=('i686' 'x86_64')
 url="http://sbackup.sourceforge.net"
@@ -16,15 +16,13 @@
 build() {
   export MAKEFLAGS="-j1"
   cd $startdir/src/$pkgname-$pkgver
-  patch -Np0 < $startdir/src/makefile.patch
-  sed -i -e "s/dpkg --get-selections/pacman -Q/" sbackupd
+
+  patch -Np0 -i $startdir/src/makefile.patch
+  sed -i -e "s/dpkg --get-selections/pacman -Q/" sbackupd.py
   sed -i -e "s/gksudo/gksu/" sbackup.desktop
-  mkdir -p $startdir/pkg/usr/share/applications
-  mkdir -p $startdir/pkg/etc
-  make PREFIX=/usr DESTDIR=$startdir/pkg/usr CONFDIR=$startdir/pkg/etc install
+
+  install -dm0755 $startdir/pkg/{usr/share/applications,etc}
+
+  make PREFIX=/usr DESTDIR=$startdir/pkg install
 }
 
-md5sums=('dcf32ce87580780be90675a3246726b4'
-         '0b525249fb6ef4bd17b74157a9d83c0c')
-sha1sums=('10bc6628e37d66d21a8d252883408394c0901652'
-          '83d507fa2e48ebf4f2110ef78cd70cab459bf90e')
Index: extra/gnome/sbackup/makefile.patch
diff -u extra/gnome/sbackup/makefile.patch:1.2 extra/gnome/sbackup/makefile.patch:1.3
--- extra/gnome/sbackup/makefile.patch:1.2	Wed May 16 22:30:39 2007
+++ extra/gnome/sbackup/makefile.patch	Sun Jun  3 21:50:52 2007
@@ -1,42 +1,63 @@
---- Makefile.old	2007-03-07 22:18:55.000000000 -0500
-+++ Makefile	2007-03-07 22:20:48.000000000 -0500
-@@ -2,6 +2,7 @@
+--- Makefile.old	2007-06-03 14:08:08.000000000 -0400
++++ Makefile	2007-06-03 14:12:01.000000000 -0400
+@@ -1,21 +1,18 @@
+ PO = pt_BR lv nl es sv fr
  
- DESTDIR = /usr/local
+-ifndef DESTDIR
+-	DESTDIR = /usr/local
+-endif 
+-
  PREFIX = /usr/local
-+CONFDIR = /etc
- BIN = $(DESTDIR)/sbin/
- SUPPORT = $(DESTDIR)/share/sbackup/
- DOC = $(DESTDIR)/share/doc/sbackup/
-@@ -12,7 +13,7 @@
+-BIN = $(DESTDIR)/sbin/
+-SUPPORT = $(DESTDIR)/share/sbackup/
+-DOC = $(DESTDIR)/share/doc/sbackup/
+-PIXDIR = $(DESTDIR)/share/pixmaps/
++BIN = $(DESTDIR)$(PREFIX)/sbin/
++SUPPORT = $(DESTDIR)$(PREFIX)/share/sbackup/
++DOC = $(DESTDIR)$(PREFIX)/share/doc/sbackup/
++PIXDIR = $(DESTDIR)$(PREFIX)/share/pixmaps/
++DESKTOPDIR = $(DESTDIR)$(PREFIX)/share/applications/
+ 
+ all:
+ 
  default:
  
  install: po-data install-po 
 -	install -d $(BIN) $(SUPPORT) $(DOC) $(PIXDIR) $(DESTDIR)/share/applications $(DESTDIR)/etc
-+	install -d $(BIN) $(SUPPORT) $(DOC) $(PIXDIR) $(DESTDIR)/share/applications $(CONFDIR)
- 	install ./sbackupd $(BIN)
- 	install ./simple-backup-config $(BIN)/simple-backup-config
- 	install ./simple-restore-gnome $(BIN)/simple-restore-gnome
-@@ -26,10 +27,8 @@
- 	install -m644 srestore.desktop $(DESTDIR)/share/applications/
- 	install -m644 simple-restore.glade $(SUPPORT)
- #	install -m644 simple-backup-tocd.glade $(SUPPORT)
++	install -d $(BIN) $(SUPPORT) $(DOC) $(PIXDIR) $(DESKTOPDIR) $(DESTDIR)/etc
+ 	install ./sbackupd.py $(SUPPORT)
+ 	ln -s ../share/sbackup/sbackupd.py $(BIN)/sbackupd
+ 	install ./simple-backup-config.py $(SUPPORT)
+@@ -30,16 +27,14 @@
+ 	install -m644 -D simple-backup-config.glade $(SUPPORT)
+ 	install -m644 -D sbackup-conf.png $(PIXDIR)
+ 	install -m644 -D sbackup-restore.png $(PIXDIR)
+-	install -m644 -D sbackup.desktop $(DESTDIR)/share/applications/
+-	install -m644 -D srestore.desktop $(DESTDIR)/share/applications/
++	install -m644 -D sbackup.desktop $(DESKTOPDIR)
++	install -m644 -D srestore.desktop $(DESKTOPDIR)
+ 	install -m644 -D simple-restore.glade $(SUPPORT)
+ 	install ./sbackup $(SUPPORT)
+ #	install -m644 -D simple-backup-tocd.glade $(SUPPORT)
 -ifeq ($(DESTDIR),/usr/local/)
 -	install -b -m600 sbackup.conf.example /etc/sbackup.conf
 -	@echo "[places]" >> /etc/sbackup.conf
 -	@echo "prefix=$(PREFIX)" >> /etc/sbackup.conf
 -endif
-+	install -b -m600 sbackup.conf.example $(CONFDIR)/sbackup.conf
-+	@echo "[places]" >> $(CONFDIR)/sbackup.conf
-+	@echo "prefix=$(PREFIX)" >> $(CONFDIR)/sbackup.conf
++	install -b -m600 sbackup.conf.example $(DESTDIR)/etc/sbackup.conf
++	@echo "[places]" >> $(DESTDIR)/etc/sbackup.conf
++	@echo "prefix=$(PREFIX)" >> $(DESTDIR)/etc/sbackup.conf
  
  uninstall:
-@@ -42,7 +41,7 @@
+ 	rm -f $(BIN)/sbackupd
+@@ -49,8 +44,8 @@
+ 	rm -f $(BIN)/upgrade_backups.py
+ 	rm -rf $(SUPPORT)
  	rm -rf $(DOC)
- 	rm -f $(DESTDIR)/share/applications/sbackup.desktop
- 	rm -f $(DESTDIR)/share/applications/srestore.desktop
--	rm -f $(DESTDIR)/etc/sbackup.conf
-+	rm -f $(CONFDIR)/sbackup.conf
+-	rm -f $(DESTDIR)/share/applications/sbackup.desktop
+-	rm -f $(DESTDIR)/share/applications/srestore.desktop
++	rm -f $(DESKTOPDIR)/sbackup.desktop
++	rm -f $(DESKTOPDIR)/srestore.desktop
+ 	rm -f $(DESTDIR)/etc/sbackup.conf
  
  clean:
- 	for lang in $(PO); do rm -rf po/$$lang ; done