[arch-commits] Commit in snapper/trunk (PKGBUILD)

[Massimiliano Torromeo]

    Date: Thursday, May 22, 2014 @ 10:53:24
  Author: mtorromeo
Revision: 111654

upgpkg: snapper 0.2.2-1

Updated to 0.2.2 with rollback support disabled due to bug in btrfs-progs

Modified:
  snapper/trunk/PKGBUILD

----------+
 PKGBUILD |   25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-05-22 08:37:27 UTC (rev 111653)
+++ PKGBUILD	2014-05-22 08:53:24 UTC (rev 111654)
@@ -2,7 +2,7 @@
 # Contributor: Tom Kuther <gimpel at sonnenkinder.org>
 
 pkgname=snapper
-pkgver=0.2.1
+pkgver=0.2.2
 pkgrel=1
 pkgdesc="A tool for managing BTRFS and LVM snapshots. It can create, diff and restore snapshots and provides timelined auto-snapping."
 arch=('i686' 'x86_64')
@@ -13,16 +13,10 @@
 optdepends=('pam: pam_snapper')
 backup=('etc/conf.d/snapper')
 source=("ftp://ftp.suse.com/pub/projects/$pkgname/$pkgname-$pkgver.tar.bz2")
-options=(!libtool)
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
-  # rename cron scripts
-  sed -i -e 's at suse.de-@@g' scripts/Makefile.am
-  # fix config location in cron scripts
-  sed -i -e 's@/etc/sysconfig/@/etc/conf.d/@g' scripts/snapper-{daily,hourly}
-
   # boost fixlets - Arch doesn't use -mt suffix
   sed -i -e 's at lboost_thread-mt@lboost_thread at g' snapper/Makefile.am
   sed -i -e 's at lboost_system-mt@lboost_system at g' snapper/Makefile.am
@@ -29,9 +23,16 @@
 
   # fix pam plugin install location
   sed -i -e 's at shell echo /@shell echo /usr/@g' pam/Makefile.am
-  # Arch all in /usr/bin
+
+  # all in /usr/bin
   sed -i -e 's@/usr/sbin@/usr/bin at g' data/org.opensuse.Snapper.service
 
+    # NTP drift file location
+  sed -i -e 's@/var/lib/ntp/drift/ntp.drift@/var/lib/ntp/ntp.drift@' data/base.txt
+
+  # man pages sysconfig location
+  sed -i -e 's@/etc/sysconfig@/etc/conf.d at g' doc/*
+
   aclocal
   libtoolize --force --automake --copy
   autoheader
@@ -41,7 +42,10 @@
               --sbindir=/usr/bin \
               --with-conf=/etc/conf.d \
               --disable-zypp \
-              --disable-silent-rules
+              --disable-silent-rules \
+              --disable-rollback
+  # rollback disabled until patch applied in next btrfs-progs release
+  # http://www.spinics.net/lists/linux-btrfs/msg33434.html
   make
 }
 
@@ -55,4 +59,5 @@
   rm -f "$pkgdir"/usr/share/man/man*/snapper-zypp-plugin.*.gz
 }
 
-sha256sums=('37f4aa1712be2cd561d1bc062c27f30b7bd4d470fd57c95f53b90fba522352f5')
+sha256sums=('0fbe2b5520d7a22e6212ef41304b5ec43006ab47cf99800d3266a00bc53e56b9')
+