summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicoHood2016-11-04 22:22:51 +0100
committerNicoHood2016-11-04 22:22:51 +0100
commite63f87eb9d83b8d673b7a857960670fbcf318708 (patch)
treeaa8fbb50b350a33faf0d6035c4e02acf8c177386
parent5ab9c03e70ad7d0a5d1afa91f299843ccc9facfc (diff)
downloadaur-e63f87eb9d83b8d673b7a857960670fbcf318708.tar.gz
Updated to 3.3 git
-rw-r--r--.SRCINFO14
-rw-r--r--.gitignore4
-rw-r--r--PKGBUILD52
-rw-r--r--snapper.install11
4 files changed, 26 insertions, 55 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 9ac85ecfb80c..a91d22083984 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,28 +1,28 @@
-# Generated by mksrcinfo v8
-# Thu Jun 30 04:25:22 UTC 2016
pkgbase = snapper-git
pkgdesc = A tool for managing BTRFS and LVM snapshots. It can create, diff and restore snapshots and provides timelined auto-snapping.
- pkgver = 0.3.2.git.1223.0b36c71
+ pkgver = 0.3.3.git.1299.4f9be7b
pkgrel = 1
url = http://snapper.io
- install = snapper.install
arch = i686
arch = x86_64
license = GPL2
+ makedepends = boost
makedepends = lvm2
makedepends = libxslt
makedepends = docbook-xsl
+ makedepends = pam
makedepends = git
+ makedepends = systemd
depends = btrfs-progs
depends = libxml2
depends = dbus
- depends = boost
- depends = pam
+ depends = boost-libs
+ depends = acl
provides = snapper
conflicts = snapper
backup = etc/conf.d/snapper
source = snapper::git+https://github.com/openSUSE/snapper.git
- md5sums = SKIP
+ sha512sums = SKIP
pkgname = snapper-git
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index c3fde878f4b5..000000000000
--- a/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-pkg/
-src/
-snapper/
-*.xz
diff --git a/PKGBUILD b/PKGBUILD
index 0aa921586647..fb75f2a7f02b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,9 @@
# Maintainer: Tom Kuther <archlinux@kuther.net>
+# Co-Maintainer: NicoHood <archlinux {cat} nicohood {dog} de>
pkgname=snapper-git
_gitname=snapper
-pkgver=0.3.2.git.1223.0b36c71
+pkgver=0.3.3.git.1299.4f9be7b
pkgrel=1
pkgdesc="A tool for managing BTRFS and LVM snapshots. It can create, diff and restore snapshots and provides timelined auto-snapping."
provides=('snapper')
@@ -10,12 +11,11 @@ conflicts=('snapper')
arch=('i686' 'x86_64')
url="http://snapper.io"
license=('GPL2')
-depends=('btrfs-progs' 'libxml2' 'dbus' 'boost' 'pam')
-makedepends=('lvm2' 'libxslt' 'docbook-xsl' 'git')
-install=snapper.install
+depends=('btrfs-progs' 'libxml2' 'dbus' 'boost-libs' 'acl')
+makedepends=('boost' 'lvm2' 'libxslt' 'docbook-xsl' 'pam' 'git' 'systemd')
backup=('etc/conf.d/snapper')
source=('snapper::git+https://github.com/openSUSE/snapper.git')
-md5sums=('SKIP')
+sha512sums=('SKIP')
pkgver() {
cd "$_gitname"
@@ -25,28 +25,23 @@ pkgver() {
prepare() {
cd "$_gitname"
- ## Build fixes
- # boost fixlets - Arch doesn't use -mt suffix
- sed -e 's@lboost_thread-mt@lboost_thread@g' \
- -e 's@lboost_system-mt@lboost_system@g' \
- -i snapper/Makefile.am
+ # cron names
+ sed -e 's@suse.de-snapper@snapper@g' -i scripts/Makefile.am
+
+ # fix sysconf dir
+ sed -e 's@/etc/sysconfig@/etc/conf.d@g' -i scripts/*snapper*
- ## Location/naming fixes
# fix pam plugin install location
sed -i -e 's@shell echo /@shell echo /usr/@g' pam/Makefile.am
+
# all in /usr/bin
sed -i -e 's@/usr/sbin@/usr/bin@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
+
+ # 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@g' doc/*
-
- # systemd timer stuff (>= systemd-212)
- sed ':a;N;$!ba;s/\[Timer\]\nOnCalendar=hourly\n\n/\[Timer\]\nOnCalendar=hourly\nPersistent=true\n\n/g' \
- -i data/timeline.timer
- sed '/cron./d' -i scripts/Makefile.am
- sed -e 's@noinst_PROGRAMS@libexec_PROGRAMS@g' -i client/Makefile.am
}
build() {
@@ -59,25 +54,16 @@ build() {
autoconf
./configure --prefix=/usr \
--sbindir=/usr/bin \
- --libexecdir=/usr/lib/snapper \
--with-conf=/etc/conf.d \
--disable-zypp \
- --disable-silent-rules \
- --disable-ext4 \
- --enable-xattrs
+ --disable-silent-rules
make
}
package() {
cd "$_gitname"
- make DESTDIR="${pkgdir}" install
- install -Dm644 data/sysconfig.snapper "${pkgdir}"/etc/conf.d/snapper
- # systemd timer units
- install -Dm644 data/cleanup.service "${pkgdir}"/usr/lib/systemd/system/snapper-cleanup.service
- install -Dm644 data/cleanup.timer "${pkgdir}"/usr/lib/systemd/system/snapper-cleanup.timer
- install -Dm644 data/timeline.service "${pkgdir}"/usr/lib/systemd/system/snapper-timeline.service
- install -Dm644 data/timeline.timer "${pkgdir}"/usr/lib/systemd/system/snapper-timeline.timer
+ make DESTDIR="$pkgdir" install
+ install -Dm644 data/sysconfig.snapper \
+ "$pkgdir"/etc/conf.d/snapper
}
-
-# vim:set ts=2 sw=2 et:
diff --git a/snapper.install b/snapper.install
deleted file mode 100644
index 7d797f4f2e46..000000000000
--- a/snapper.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
- echo "For first-time config instructions see https://wiki.archlinux.org/index.php/Snapper"
- echo
- echo "To use timelined snapshots, you need to manually enable and start the timer units with:"
- echo
- echo "# systemctl enable snapper-cleanup.timer"
- echo "# systemctl enable snapper-timeline.timer"
- echo "# systemctl start snapper-cleanup.timer"
- echo "# systemctl start snapper-timeline.timer"
- echo
-}