From a9db0e5276a269ce5702f42859a1ca5d50fe419a Mon Sep 17 00:00:00 2001 From: Ondrej Kozina Date: Dec 04 2013 17:21:16 +0000 Subject: - update to snapper-0.1.8 --- diff --git a/.gitignore b/.gitignore index ffcf2c7..486d803 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /snapper-0.1.3.tar.bz2 /snapper-0.1.5.tar.gz /snapper-0.1.7.tar.gz +/snapper-0.1.8.tar.gz diff --git a/snapper-0.1.8-libbtrfs.patch b/snapper-0.1.8-libbtrfs.patch deleted file mode 100644 index f492858..0000000 --- a/snapper-0.1.8-libbtrfs.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -rupN snapper-0.1.7.old/snapper/Btrfs.cc snapper-0.1.7/snapper/Btrfs.cc ---- snapper-0.1.7.old/snapper/Btrfs.cc 2013-11-01 11:38:48.988814949 +0100 -+++ snapper-0.1.7/snapper/Btrfs.cc 2013-11-01 12:58:05.324061367 +0100 -@@ -982,7 +982,8 @@ namespace snapper - { - boost::this_thread::interruption_point(); - -- int r = btrfs_read_and_process_send_stream(fd, &send_ops, &*this); -+ // remove the fourth parameter for older versions of libbtrfs -+ int r = btrfs_read_and_process_send_stream(fd, &send_ops, &*this, 0); - - if (r < 0) - { diff --git a/snapper-0.1.9-remove-deprecated-lt-macro.patch b/snapper-0.1.9-remove-deprecated-lt-macro.patch new file mode 100644 index 0000000..3527e1d --- /dev/null +++ b/snapper-0.1.9-remove-deprecated-lt-macro.patch @@ -0,0 +1,13 @@ +diff -rupN snapper-0.1.8.old/configure.ac snapper-0.1.8/configure.ac +--- snapper-0.1.8.old/configure.ac 2013-12-04 15:22:01.322271168 +0100 ++++ snapper-0.1.8/configure.ac 2013-12-04 15:58:23.231443121 +0100 +@@ -19,8 +19,7 @@ AC_CONFIG_HEADERS(config.h) + AC_DISABLE_STATIC + + AC_PROG_CXX +-AC_PROG_LIBTOOL +-AM_PROG_LIBTOOL ++LT_INIT + + AC_PREFIX_DEFAULT(/usr) + diff --git a/snapper-0.1.9-zypp-plugin-configurable.patch b/snapper-0.1.9-zypp-plugin-configurable.patch new file mode 100644 index 0000000..a2fde96 --- /dev/null +++ b/snapper-0.1.9-zypp-plugin-configurable.patch @@ -0,0 +1,33 @@ +diff -rupN snapper-0.1.8.old/data/Makefile.am snapper-0.1.8/data/Makefile.am +--- snapper-0.1.8.old/data/Makefile.am 2013-12-04 15:22:01.311271204 +0100 ++++ snapper-0.1.8/data/Makefile.am 2013-12-04 15:45:28.541882501 +0100 +@@ -16,4 +16,7 @@ install-data-local: + install -D -m 644 x11.txt $(DESTDIR)/etc/snapper/filters/x11.txt + install -D -m 644 org.opensuse.Snapper.conf $(DESTDIR)/etc/dbus-1/system.d/org.opensuse.Snapper.conf + install -D -m 644 org.opensuse.Snapper.service $(DESTDIR)/usr/share/dbus-1/system-services/org.opensuse.Snapper.service ++ ++if HAVE_ZYPP + install -D -m 644 zypp-plugin.conf $(DESTDIR)/etc/snapper/zypp-plugin.conf ++endif +diff -rupN snapper-0.1.8.old/doc/Makefile.am snapper-0.1.8/doc/Makefile.am +--- snapper-0.1.8.old/doc/Makefile.am 2013-12-04 15:22:01.314271194 +0100 ++++ snapper-0.1.8/doc/Makefile.am 2013-12-04 15:37:42.248195836 +0100 +@@ -2,13 +2,16 @@ + # Makefile.am for snapper/doc + # + +-man_MANS = snapper.8 snapperd.8 snapper-configs.5 snapper-zypp-plugin.8 \ +- snapper-zypp-plugin.conf.5 ++man_MANS = snapper.8 snapperd.8 snapper-configs.5 + + if HAVE_PAM + man_MANS += pam_snapper.8 + endif + ++if HAVE_ZYPP ++man_MANS += snapper-zypp-plugin.conf.5 snapper-zypp-plugin.8 ++endif ++ + .xml.5: .xml + $(XSLTPROC) --nonet manpages.xsl $< + diff --git a/snapper-rename-cron-files.patch b/snapper-rename-cron-files.patch index 8d22fcf..3233a27 100644 --- a/snapper-rename-cron-files.patch +++ b/snapper-rename-cron-files.patch @@ -1,7 +1,8 @@ ---- a/scripts/Makefile.am 2013-07-12 10:47:19.000000000 +0200 -+++ b/scripts/Makefile.am 2013-07-29 12:49:49.505908078 +0200 +diff -rupN snapper-0.1.8.old/scripts/Makefile.am snapper-0.1.8/scripts/Makefile.am +--- snapper-0.1.8.old/scripts/Makefile.am 2013-12-04 15:22:01.306271220 +0100 ++++ snapper-0.1.8/scripts/Makefile.am 2013-12-04 15:23:18.948020277 +0100 @@ -17,8 +17,8 @@ endif - EXTRA_DIST = snapper-hourly snapper-daily zypp-plugin.py $(pam_snapper_SCRIPTS) + EXTRA_DIST = snapper-hourly snapper-daily zypp-plugin.py grub-plugin.py $(pam_snapper_SCRIPTS) install-data-local: - install -D snapper-hourly $(DESTDIR)/etc/cron.hourly/suse.de-snapper @@ -10,4 +11,4 @@ + install -D snapper-daily $(DESTDIR)/etc/cron.daily/snapper if HAVE_ZYPP install -D zypp-plugin.py $(DESTDIR)/usr/lib/zypp/plugins/commit/snapper.py - endif + install -D grub-plugin.py $(DESTDIR)/usr/lib/snapper/plugins/grub.py diff --git a/snapper.spec b/snapper.spec index 45c3f4d..d0607d4 100644 --- a/snapper.spec +++ b/snapper.spec @@ -1,5 +1,5 @@ Name: snapper -Version: 0.1.7 +Version: 0.1.8 Release: 1%{?dist} License: GPLv2 Group: Applications/System @@ -16,7 +16,8 @@ patch0: %{name}-remove-ext4-info-xml.patch patch1: %{name}-rename-cron-files.patch patch2: %{name}-boost-mt.patch patch3: %{name}-securelibdir.patch -patch4: %{name}-0.1.8-libbtrfs.patch +patch4: %{name}-0.1.9-zypp-plugin-configurable.patch +patch5: %{name}-0.1.9-remove-deprecated-lt-macro.patch %description This package contains snapper, a tool for filesystem snapshot management. @@ -42,8 +43,8 @@ snapper. %package -n pam_snapper Requires: %{name}%{?_isa} = %version-%{release} -Requires: pam%{?_isa} -Summary: PAM module for calling snapper +Requires: pam%{?_isa} +Summary: PAM module for calling snapper %description -n pam_snapper A PAM module for calling snapper during user login and logout. @@ -55,6 +56,7 @@ A PAM module for calling snapper during user login and logout. %patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 %build aclocal @@ -117,6 +119,9 @@ rm -f %{buildroot}/%{_libdir}/security/*.la %doc %{_mandir}/*/pam_snapper*.* %changelog +* Wed Dec 04 2013 Ondrej Kozina - 0.1.8-1 +- Update to snapper 0.1.8 + * Fri Nov 01 2013 Ondrej Kozina - 0.1.7-1 - Update to snapper 0.1.7. - removed --enable-xattrs (already enabled by default) diff --git a/sources b/sources index cb1db43..aa0c9b7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -fcc795de2f5e9b7de202d0b4eb5559ad snapper-0.1.7.tar.gz +ac43330afdd352f8ef41ac9d9df906a3 snapper-0.1.8.tar.gz