[arch-commits] Commit in snapper/repos/community-x86_64 (4 files)
Massimiliano Torromeo
mtorromeo at archlinux.org
Tue Oct 15 13:49:47 UTC 2019
Date: Tuesday, October 15, 2019 @ 13:49:46
Author: mtorromeo
Revision: 516127
archrelease: copy trunk to community-x86_64
Added:
snapper/repos/community-x86_64/PKGBUILD
(from rev 516126, snapper/trunk/PKGBUILD)
snapper/repos/community-x86_64/add-missing-pthread-library-for-server.patch
(from rev 516126, snapper/trunk/add-missing-pthread-library-for-server.patch)
Deleted:
snapper/repos/community-x86_64/PKGBUILD
snapper/repos/community-x86_64/add-missing-pthread-library-for-server.patch
----------------------------------------------+
PKGBUILD | 136 ++++++++++++-------------
add-missing-pthread-library-for-server.patch | 54 ++++-----
2 files changed, 95 insertions(+), 95 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2019-10-15 13:49:32 UTC (rev 516126)
+++ PKGBUILD 2019-10-15 13:49:46 UTC (rev 516127)
@@ -1,68 +0,0 @@
-# Maintainer: Massimiliano Torromeo <massimiliano.torromeo at gmail.com>
-# Contributor: Tom Kuther <gimpel at sonnenkinder.org>
-
-pkgname=snapper
-pkgver=0.8.3
-pkgrel=2
-pkgdesc="A tool for managing BTRFS and LVM snapshots. It can create, diff and restore snapshots and provides timelined auto-snapping."
-arch=('x86_64')
-url="http://snapper.io"
-license=('GPL2')
-depends=('btrfs-progs' 'libxml2' 'dbus' 'boost-libs' 'acl')
-makedepends=('boost' 'lvm2' 'libxslt' 'docbook-xsl' 'pam' 'git' 'systemd')
-optdepends=('pam: pam_snapper')
-backup=('etc/conf.d/snapper')
-source=("ftp://ftp.suse.com/pub/projects/$pkgname/$pkgname-$pkgver.tar.bz2")
-sha256sums=('7214d8e4e81f180acaecb191de4bdc5736007bea52156d7d8587141478da8878')
-
-prepare() {
- cd "$srcdir/$pkgname-$pkgver"
-
- # cron names
- sed -e 's at suse.de-snapper@snapper at g' -i scripts/Makefile.am
-
- # fix sysconf dir
- sed -e 's@/etc/sysconfig@/etc/conf.d at g' -i scripts/*snapper*
-
- # fix pam plugin install location
- sed -i -e 's at shell echo /@shell echo /usr/@g' pam/Makefile.am
-
- # dbus policy files in /usr/share/dbus-1
- sed -i -e 's@/etc/dbus-1/@/usr/share/dbus-1/@' data/Makefile.am
-
- # 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/*
-
- # swap macro errors
- sed -i -e '/#include <vector>/i #include <iterator>' {snapper,client,dbus}/*.{h,cc}
-}
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
-
- 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
-}
Copied: snapper/repos/community-x86_64/PKGBUILD (from rev 516126, snapper/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2019-10-15 13:49:46 UTC (rev 516127)
@@ -0,0 +1,68 @@
+# Maintainer: Massimiliano Torromeo <massimiliano.torromeo at gmail.com>
+# Contributor: Tom Kuther <gimpel at sonnenkinder.org>
+
+pkgname=snapper
+pkgver=0.8.4
+pkgrel=1
+pkgdesc="A tool for managing BTRFS and LVM snapshots. It can create, diff and restore snapshots and provides timelined auto-snapping."
+arch=('x86_64')
+url="http://snapper.io"
+license=('GPL2')
+depends=('btrfs-progs' 'libxml2' 'dbus' 'boost-libs' 'acl')
+makedepends=('boost' 'lvm2' 'libxslt' 'docbook-xsl' 'pam' 'git' 'systemd')
+optdepends=('pam: pam_snapper')
+backup=('etc/conf.d/snapper')
+source=("ftp://ftp.suse.com/pub/projects/$pkgname/$pkgname-$pkgver.tar.bz2")
+sha256sums=('cc8f6616e783fde75d18a3503d9ca90e4f88603db92c25ea40a2daeb9b491843')
+
+prepare() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ # cron names
+ sed -e 's at suse.de-snapper@snapper at g' -i scripts/Makefile.am
+
+ # fix sysconf dir
+ sed -e 's@/etc/sysconfig@/etc/conf.d at g' -i scripts/*snapper*
+
+ # fix pam plugin install location
+ sed -i -e 's at shell echo /@shell echo /usr/@g' pam/Makefile.am
+
+ # dbus policy files in /usr/share/dbus-1
+ sed -i -e 's@/etc/dbus-1/@/usr/share/dbus-1/@' data/Makefile.am
+
+ # 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/*
+
+ # swap macro errors
+ sed -i -e '/#include <vector>/i #include <iterator>' {snapper,client,dbus}/*.{h,cc}
+}
+
+build() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ 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
+}
Deleted: add-missing-pthread-library-for-server.patch
===================================================================
--- add-missing-pthread-library-for-server.patch 2019-10-15 13:49:32 UTC (rev 516126)
+++ add-missing-pthread-library-for-server.patch 2019-10-15 13:49:46 UTC (rev 516127)
@@ -1,27 +0,0 @@
-From 4f3f9d516c68c99b412b6e4b2eaa6e25f389b337 Mon Sep 17 00:00:00 2001
-From: Adam Majer <amajer at suse.de>
-Date: Tue, 22 May 2018 09:43:21 +0200
-Subject: [PATCH] Add missing pthread library for server
-
-While building snapper with Boost 1.67, the following error
-occurred,
-
-/usr/lib64/gcc/x86_64-suse-linux/7/../../../../x86_64-suse-linux/bin/ld: Client.o: undefined reference to symbol 'pthread_condattr_setclock@@GLIBC_2.3.3'
-/lib64/libpthread.so.0: error adding symbols: DSO missing from command line
-collect2: error: ld returned 1 exit status
-make[2]: *** [Makefile:440: snapperd] Error 1
-make[2]: Leaving directory '/home/abuild/rpmbuild/BUILD/snapper-0.5.4/server'
----
- server/Makefile.am | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/server/Makefile.am b/server/Makefile.am
-index 2a6a4c2d..009fe414 100644
---- a/server/Makefile.am
-+++ b/server/Makefile.am
-@@ -14,4 +14,4 @@ snapperd_SOURCES = \
- Types.cc Types.h
-
- snapperd_LDADD = ../snapper/libsnapper.la ../dbus/libdbus.la -lrt
--snapperd_LDFLAGS = -lboost_system -lboost_thread
-+snapperd_LDFLAGS = -lboost_system -lboost_thread -lpthread
Copied: snapper/repos/community-x86_64/add-missing-pthread-library-for-server.patch (from rev 516126, snapper/trunk/add-missing-pthread-library-for-server.patch)
===================================================================
--- add-missing-pthread-library-for-server.patch (rev 0)
+++ add-missing-pthread-library-for-server.patch 2019-10-15 13:49:46 UTC (rev 516127)
@@ -0,0 +1,27 @@
+From 4f3f9d516c68c99b412b6e4b2eaa6e25f389b337 Mon Sep 17 00:00:00 2001
+From: Adam Majer <amajer at suse.de>
+Date: Tue, 22 May 2018 09:43:21 +0200
+Subject: [PATCH] Add missing pthread library for server
+
+While building snapper with Boost 1.67, the following error
+occurred,
+
+/usr/lib64/gcc/x86_64-suse-linux/7/../../../../x86_64-suse-linux/bin/ld: Client.o: undefined reference to symbol 'pthread_condattr_setclock@@GLIBC_2.3.3'
+/lib64/libpthread.so.0: error adding symbols: DSO missing from command line
+collect2: error: ld returned 1 exit status
+make[2]: *** [Makefile:440: snapperd] Error 1
+make[2]: Leaving directory '/home/abuild/rpmbuild/BUILD/snapper-0.5.4/server'
+---
+ server/Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/server/Makefile.am b/server/Makefile.am
+index 2a6a4c2d..009fe414 100644
+--- a/server/Makefile.am
++++ b/server/Makefile.am
+@@ -14,4 +14,4 @@ snapperd_SOURCES = \
+ Types.cc Types.h
+
+ snapperd_LDADD = ../snapper/libsnapper.la ../dbus/libdbus.la -lrt
+-snapperd_LDFLAGS = -lboost_system -lboost_thread
++snapperd_LDFLAGS = -lboost_system -lboost_thread -lpthread
More information about the arch-commits
mailing list