Date: Wednesday, December 4, 2013 @ 09:53:41 Author: mtorromeo Revision: 102031
archrelease: copy trunk to community-i686, community-x86_64 Added: snapper/repos/community-i686/PKGBUILD (from rev 102030, snapper/trunk/PKGBUILD) snapper/repos/community-x86_64/PKGBUILD (from rev 102030, snapper/trunk/PKGBUILD) Deleted: snapper/repos/community-i686/PKGBUILD snapper/repos/community-i686/libbtrfs.patch snapper/repos/community-x86_64/PKGBUILD snapper/repos/community-x86_64/libbtrfs.patch ---------------------------------+ /PKGBUILD | 114 ++++++++++++++++++++++++++++++++++++++ community-i686/PKGBUILD | 61 -------------------- community-i686/libbtrfs.patch | 13 ---- community-x86_64/PKGBUILD | 61 -------------------- community-x86_64/libbtrfs.patch | 13 ---- 5 files changed, 114 insertions(+), 148 deletions(-) Deleted: community-i686/PKGBUILD =================================================================== --- community-i686/PKGBUILD 2013-12-04 08:50:12 UTC (rev 102030) +++ community-i686/PKGBUILD 2013-12-04 08:53:41 UTC (rev 102031) @@ -1,61 +0,0 @@ -# Maintainer: Massimiliano Torromeo <massimiliano.torro...@gmail.com> -# Contributor: Tom Kuther <gim...@sonnenkinder.org> - -pkgname=snapper -pkgver=0.1.7 -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') -url="http://snapper.io" -license=('GPL2') -depends=('btrfs-progs' 'libxml2' 'dbus' 'boost-libs') -makedepends=('boost' 'lvm2' 'libxslt' 'docbook-xsl' 'pam' 'git') -backup=('etc/conf.d/snapper') -source=("ftp://ftp.suse.com/pub/projects/$pkgname/$pkgname-$pkgver.tar.bz2" - 'libbtrfs.patch') -options=(!libtool) - -prepare() { - cd "$srcdir/$pkgname-$pkgver" - patch -p1 -i "$srcdir"/libbtrfs.patch -} - -build() { - cd "$srcdir/$pkgname-$pkgver" - - # rename cron scripts - sed -i -e 's...@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@lboost_thread-mt@lboost_thread@g' snapper/Makefile.am - sed -i -e 's@lboost_system-mt@lboost_system@g' snapper/Makefile.am - - # fix pam plugin install location - sed -i -e 's@shell echo /@shell echo /usr/@g' pam/Makefile.am - # Arch all in /usr/bin - sed -i -e 's@/usr/sbin@/usr/bin@g' data/org.opensuse.Snapper.service - - aclocal - libtoolize --force --automake --copy - autoheader - automake --add-missing --copy - autoconf - ./configure --prefix=/usr \ - --sbindir=/usr/bin \ - --with-conf=/etc/conf.d \ - --disable-zypp \ - --disable-silent-rules - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - - make DESTDIR="$pkgdir" install - install -Dm644 data/sysconfig.snapper "$pkgdir"/etc/conf.d/snapper -} - -sha256sums=('fcb8d98aa36021970b214a2b6ea85f86aa29e107559bf677226e2e4ade2c6ed0' - '0d0289e7448a357c78450f6690d684fef0e889921be152038a73401d37294317') Copied: snapper/repos/community-i686/PKGBUILD (from rev 102030, snapper/trunk/PKGBUILD) =================================================================== --- community-i686/PKGBUILD (rev 0) +++ community-i686/PKGBUILD 2013-12-04 08:53:41 UTC (rev 102031) @@ -0,0 +1,57 @@ +# Maintainer: Massimiliano Torromeo <massimiliano.torro...@gmail.com> +# Contributor: Tom Kuther <gim...@sonnenkinder.org> + +pkgname=snapper +pkgver=0.1.8 +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') +url="http://snapper.io" +license=('GPL2') +depends=('btrfs-progs' 'libxml2' 'dbus' 'boost-libs') +makedepends=('boost' 'lvm2' 'libxslt' 'docbook-xsl' 'pam' 'git') +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...@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@lboost_thread-mt@lboost_thread@g' snapper/Makefile.am + sed -i -e 's@lboost_system-mt@lboost_system@g' snapper/Makefile.am + + # fix pam plugin install location + sed -i -e 's@shell echo /@shell echo /usr/@g' pam/Makefile.am + # Arch all in /usr/bin + sed -i -e 's@/usr/sbin@/usr/bin@g' data/org.opensuse.Snapper.service + + aclocal + libtoolize --force --automake --copy + autoheader + automake --add-missing --copy + autoconf + ./configure --prefix=/usr \ + --sbindir=/usr/bin \ + --with-conf=/etc/conf.d \ + --disable-zypp \ + --disable-silent-rules + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + make DESTDIR="$pkgdir" install + install -Dm644 data/sysconfig.snapper "$pkgdir"/etc/conf.d/snapper + + rm -f "$pkgdir"/etc/snapper/zypp-plugin.conf + rm -f "$pkgdir"/usr/share/man/man*/snapper-zypp-plugin.*.gz +} + +sha256sums=('989a261411b7bf4f23373222402c37764e4f1714e301a8e9e396bb92a74e0539') Deleted: community-i686/libbtrfs.patch =================================================================== --- community-i686/libbtrfs.patch 2013-12-04 08:50:12 UTC (rev 102030) +++ community-i686/libbtrfs.patch 2013-12-04 08:53:41 UTC (rev 102031) @@ -1,13 +0,0 @@ -diff --git a/snapper/Btrfs.cc b/snapper/Btrfs.cc -index 2c110c3..be9e974 100644 ---- a/snapper/Btrfs.cc -+++ b/snapper/Btrfs.cc -@@ -982,7 +982,7 @@ namespace snapper - { - boost::this_thread::interruption_point(); - -- int r = btrfs_read_and_process_send_stream(fd, &send_ops, &*this); -+ int r = btrfs_read_and_process_send_stream(fd, &send_ops, &*this, 0); - - if (r < 0) - { Deleted: community-x86_64/PKGBUILD =================================================================== --- community-x86_64/PKGBUILD 2013-12-04 08:50:12 UTC (rev 102030) +++ community-x86_64/PKGBUILD 2013-12-04 08:53:41 UTC (rev 102031) @@ -1,61 +0,0 @@ -# Maintainer: Massimiliano Torromeo <massimiliano.torro...@gmail.com> -# Contributor: Tom Kuther <gim...@sonnenkinder.org> - -pkgname=snapper -pkgver=0.1.7 -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') -url="http://snapper.io" -license=('GPL2') -depends=('btrfs-progs' 'libxml2' 'dbus' 'boost-libs') -makedepends=('boost' 'lvm2' 'libxslt' 'docbook-xsl' 'pam' 'git') -backup=('etc/conf.d/snapper') -source=("ftp://ftp.suse.com/pub/projects/$pkgname/$pkgname-$pkgver.tar.bz2" - 'libbtrfs.patch') -options=(!libtool) - -prepare() { - cd "$srcdir/$pkgname-$pkgver" - patch -p1 -i "$srcdir"/libbtrfs.patch -} - -build() { - cd "$srcdir/$pkgname-$pkgver" - - # rename cron scripts - sed -i -e 's...@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@lboost_thread-mt@lboost_thread@g' snapper/Makefile.am - sed -i -e 's@lboost_system-mt@lboost_system@g' snapper/Makefile.am - - # fix pam plugin install location - sed -i -e 's@shell echo /@shell echo /usr/@g' pam/Makefile.am - # Arch all in /usr/bin - sed -i -e 's@/usr/sbin@/usr/bin@g' data/org.opensuse.Snapper.service - - aclocal - libtoolize --force --automake --copy - autoheader - automake --add-missing --copy - autoconf - ./configure --prefix=/usr \ - --sbindir=/usr/bin \ - --with-conf=/etc/conf.d \ - --disable-zypp \ - --disable-silent-rules - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - - make DESTDIR="$pkgdir" install - install -Dm644 data/sysconfig.snapper "$pkgdir"/etc/conf.d/snapper -} - -sha256sums=('fcb8d98aa36021970b214a2b6ea85f86aa29e107559bf677226e2e4ade2c6ed0' - '0d0289e7448a357c78450f6690d684fef0e889921be152038a73401d37294317') Copied: snapper/repos/community-x86_64/PKGBUILD (from rev 102030, snapper/trunk/PKGBUILD) =================================================================== --- community-x86_64/PKGBUILD (rev 0) +++ community-x86_64/PKGBUILD 2013-12-04 08:53:41 UTC (rev 102031) @@ -0,0 +1,57 @@ +# Maintainer: Massimiliano Torromeo <massimiliano.torro...@gmail.com> +# Contributor: Tom Kuther <gim...@sonnenkinder.org> + +pkgname=snapper +pkgver=0.1.8 +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') +url="http://snapper.io" +license=('GPL2') +depends=('btrfs-progs' 'libxml2' 'dbus' 'boost-libs') +makedepends=('boost' 'lvm2' 'libxslt' 'docbook-xsl' 'pam' 'git') +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...@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@lboost_thread-mt@lboost_thread@g' snapper/Makefile.am + sed -i -e 's@lboost_system-mt@lboost_system@g' snapper/Makefile.am + + # fix pam plugin install location + sed -i -e 's@shell echo /@shell echo /usr/@g' pam/Makefile.am + # Arch all in /usr/bin + sed -i -e 's@/usr/sbin@/usr/bin@g' data/org.opensuse.Snapper.service + + aclocal + libtoolize --force --automake --copy + autoheader + automake --add-missing --copy + autoconf + ./configure --prefix=/usr \ + --sbindir=/usr/bin \ + --with-conf=/etc/conf.d \ + --disable-zypp \ + --disable-silent-rules + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + make DESTDIR="$pkgdir" install + install -Dm644 data/sysconfig.snapper "$pkgdir"/etc/conf.d/snapper + + rm -f "$pkgdir"/etc/snapper/zypp-plugin.conf + rm -f "$pkgdir"/usr/share/man/man*/snapper-zypp-plugin.*.gz +} + +sha256sums=('989a261411b7bf4f23373222402c37764e4f1714e301a8e9e396bb92a74e0539') Deleted: community-x86_64/libbtrfs.patch =================================================================== --- community-x86_64/libbtrfs.patch 2013-12-04 08:50:12 UTC (rev 102030) +++ community-x86_64/libbtrfs.patch 2013-12-04 08:53:41 UTC (rev 102031) @@ -1,13 +0,0 @@ -diff --git a/snapper/Btrfs.cc b/snapper/Btrfs.cc -index 2c110c3..be9e974 100644 ---- a/snapper/Btrfs.cc -+++ b/snapper/Btrfs.cc -@@ -982,7 +982,7 @@ namespace snapper - { - boost::this_thread::interruption_point(); - -- int r = btrfs_read_and_process_send_stream(fd, &send_ops, &*this); -+ int r = btrfs_read_and_process_send_stream(fd, &send_ops, &*this, 0); - - if (r < 0) - {