[arch-commits] Commit in evms/repos (3 files)

[Eric Bélanger]

    Date: Tuesday, October 13, 2009 @ 15:00:41
  Author: eric
Revision: 55530

Merged revisions 52418,55529 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/evms/trunk

........
  r52418 | allan | 2009-09-19 02:22:59 -0400 (Sat, 19 Sep 2009) | 1 line
  
  add lib/initcpio/install/evms to backup array so users can added extra binaries if needed (http://bugs.archlinux.org/task/16079#comment49434)
........
  r55529 | eric | 2009-10-13 15:00:07 -0400 (Tue, 13 Oct 2009) | 2 lines
  
  upgpkg: evms 2.5.5-10
      fixed wrong lib directory in evms_install (close FS#16576)
........

Modified:
  evms/repos/extra-x86_64/	(properties)
  evms/repos/extra-x86_64/PKGBUILD
  evms/repos/extra-x86_64/evms_install

--------------+
 PKGBUILD     |   32 ++++++++++++++++----------------
 evms_install |    2 +-
 2 files changed, 17 insertions(+), 17 deletions(-)


Property changes on: evms/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /evms/trunk:1-51819
   + /evms/trunk:1-55529

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-10-13 19:00:07 UTC (rev 55529)
+++ extra-x86_64/PKGBUILD	2009-10-13 19:00:41 UTC (rev 55530)
@@ -3,7 +3,7 @@
 
 pkgname=evms
 pkgver=2.5.5
-pkgrel=9
+pkgrel=10
 pkgdesc="Enterprise Volume Management System"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -12,7 +12,7 @@
 optdepends=('gtk: for evmsgui'
             'glib: for evmsn')
 makedepends=('gtk')
-backup=('etc/evms.conf')
+backup=('etc/evms.conf' 'lib/initcpio/install/evms')
 source=(http://downloads.sourceforge.net/project/evms/EVMS/$pkgver/evms-$pkgver.tar.gz
 	# patches from evms homepage
 	http://evms.sourceforge.net/patches/2.5.5/engine/BaseName.patch
@@ -52,35 +52,35 @@
          '43b7b8e3a11ada886a92f0c8f9d18ce4'
          '19e17ea80b35e5574777ed8e42b4210a'
          'c97b7918f589ecfe244ed86de5513f0a'
-         'b0b5f684d04aab4c21789e37a3e26bb3')
+         'ecb262ce210f5f644527897bb303fe59')
 
 build() {
-  cd $srcdir/$pkgname-$pkgver
+  cd "$srcdir/$pkgname-$pkgver"
   # adding patches from http://evms.sourceforge.net/patches/2.5.5/engine/
   PATCHES="md_super_fix ntfs_unmkfs raid5_degrade_fix raid5_remove_spare_fix \
            raid5_remove_spare_fix_2 raid5_algorithm cli_reload_options \
            cli_query_segfault get_geometry BaseName s390_ioctl_fix disk_cache \
            fix-strings ocfs2_version_check copy_target_linear"
   for i in $PATCHES; do
-    patch -Np1 -i $srcdir/$i.patch || return 1
+    patch -Np1 -i "$srcdir/$i.patch" || return 1
   done
-  patch -Np1 -i $srcdir/evms-2.5.5-pagesize.patch || return 1
-  patch -Np1 -i $srcdir/evms-2.5.5-as-needed.patch || return 1
-  ./configure --sysconfdir=/etc --localstatedir=/var --mandir=/usr/share/man
+  patch -Np1 -i "$srcdir/evms-2.5.5-pagesize.patch" || return 1
+  patch -Np1 -i "$srcdir/evms-2.5.5-as-needed.patch" || return 1
+  ./configure --sysconfdir=/etc --localstatedir=/var --mandir=/usr/share/man || return 1
   make || return 1
-  make DESTDIR=$pkgdir install
+  make DESTDIR="$pkgdir" install || return 1
   
   # move unneeded files from /sbin and /lib
-  install -dm755 $pkgdir/usr/sbin
+  install -dm755 "$pkgdir/usr/sbin"
   for f in evms_gather_info evmsn evmsgui; do
-    mv $pkgdir/sbin/$f $pkgdir/usr/sbin/$f
+    mv "$pkgdir/sbin/$f" "$pkgdir/usr/sbin/$f" || return 1
   done
   
-  install -dm755 $pkgdir/usr/lib
-  mv $pkgdir/lib/libevms.a $pkgdir/usr/lib/libevms.a
-  ln -s ../../lib/libevms.so $pkgdir/usr/lib/libevms.so
+  install -dm755 "$pkgdir/usr/lib"
+  mv "$pkgdir/lib/libevms.a" "$pkgdir/usr/lib/libevms.a" || return 1
+  ln -s ../../lib/libevms.so "$pkgdir/usr/lib/libevms.so" || return 1
   
   # add evms hook and install file for initcpio
-  install -Dm644 $srcdir/evms_install $pkgdir/lib/initcpio/install/evms
-  install -Dm644 $srcdir/evms_hook $pkgdir/lib/initcpio/hooks/evms
+  install -Dm644 "$srcdir/evms_install" "$pkgdir/lib/initcpio/install/evms" || return 1
+  install -Dm644 "$srcdir/evms_hook" "$pkgdir/lib/initcpio/hooks/evms" || return 1
 }

Modified: extra-x86_64/evms_install
===================================================================
--- extra-x86_64/evms_install	2009-10-13 19:00:07 UTC (rev 55529)
+++ extra-x86_64/evms_install	2009-10-13 19:00:41 UTC (rev 55530)
@@ -12,7 +12,7 @@
 	add_file "/usr/lib/libgcc_s.so.1" "/usr/lib/libgcc_s.so.1"
 	add_file "/lib/libuuid.so.1" "/lib/libuuid.so.1"
 	add_file "/etc/evms.conf" "/etc/evms.conf"
-	add_full_dir "/usr/lib/evms"
+	add_full_dir "/lib/evms"
 }
 
 help ()