update to version 0.2.8
This commit is contained in:
Ondrej Kozina
parent
30f06b9f7c
commit
087b344aa9
|
|
@ -7,3 +7,4 @@
|
|||
/snapper-0.2.3.tar.gz
|
||||
/snapper-0.2.5.tar.gz
|
||||
/snapper-0.2.6.tar.gz
|
||||
/snapper-0.2.8.tar.gz
|
||||
|
|
|
|||
|
|
@ -1,47 +0,0 @@
|
|||
diff -rupN snapper-0.2.6.bcp/client/Makefile.am snapper-0.2.6/client/Makefile.am
|
||||
--- snapper-0.2.6.bcp/client/Makefile.am 2015-08-19 09:07:21.168758523 +0200
|
||||
+++ snapper-0.2.6/client/Makefile.am 2015-08-19 10:01:48.990652453 +0200
|
||||
@@ -20,15 +20,13 @@ snapper_LDADD = ../snapper/libsnapper.la
|
||||
|
||||
libexecdir = /usr/lib/snapper
|
||||
|
||||
-libexec_PROGRAMS = installation-helper
|
||||
+libexec_PROGRAMS = installation-helper systemd-helper
|
||||
|
||||
installation_helper_SOURCES = \
|
||||
installation-helper.cc
|
||||
|
||||
installation_helper_LDADD = ../snapper/libsnapper.la utils/libutils.la
|
||||
|
||||
-noinst_PROGRAMS = systemd-helper
|
||||
-
|
||||
systemd_helper_SOURCES = \
|
||||
systemd-helper.cc \
|
||||
types.cc types.h \
|
||||
diff -rupN snapper-0.2.6.bcp/data/Makefile.am snapper-0.2.6/data/Makefile.am
|
||||
--- snapper-0.2.6.bcp/data/Makefile.am 2015-08-19 09:07:21.170758518 +0200
|
||||
+++ snapper-0.2.6/data/Makefile.am 2015-08-19 10:00:29.232801060 +0200
|
||||
@@ -8,15 +8,23 @@ EXTRA_DIST = sysconfig.snapper base.txt
|
||||
|
||||
install-data-local:
|
||||
install -D -m 644 snapper.logrotate $(DESTDIR)/etc/logrotate.d/snapper
|
||||
+
|
||||
install -d -m 755 $(DESTDIR)/etc/snapper/configs
|
||||
install -D -m 644 default-config $(DESTDIR)/etc/snapper/config-templates/default
|
||||
+
|
||||
install -d -m 755 $(DESTDIR)/etc/snapper/filters
|
||||
install -D -m 644 base.txt $(DESTDIR)/etc/snapper/filters/base.txt
|
||||
install -D -m 644 lvm.txt $(DESTDIR)/etc/snapper/filters/lvm.txt
|
||||
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
|
||||
|
||||
+ install -D -m 644 timeline.service $(DESTDIR)/usr/lib/systemd/system/snapper-timeline.service
|
||||
+ install -D -m 644 timeline.timer $(DESTDIR)/usr/lib/systemd/system/snapper-timeline.timer
|
||||
+ install -D -m 644 cleanup.service $(DESTDIR)/usr/lib/systemd/system/snapper-cleanup.service
|
||||
+ install -D -m 644 cleanup.timer $(DESTDIR)/usr/lib/systemd/system/snapper-cleanup.timer
|
||||
+
|
||||
if HAVE_ZYPP
|
||||
install -D -m 644 zypp-plugin.conf $(DESTDIR)/etc/snapper/zypp-plugin.conf
|
||||
endif
|
||||
|
|
@ -1,12 +0,0 @@
|
|||
diff -rupN snapper-0.2.3.old/snapper/Makefile.am snapper-0.2.3/snapper/Makefile.am
|
||||
--- snapper-0.2.3.old/snapper/Makefile.am 2014-07-09 18:29:17.837468902 +0200
|
||||
+++ snapper-0.2.3/snapper/Makefile.am 2014-07-09 18:29:34.710400213 +0200
|
||||
@@ -53,7 +53,7 @@ endif
|
||||
|
||||
|
||||
libsnapper_la_LDFLAGS = -version-info @LIBVERSION_INFO@
|
||||
-libsnapper_la_LIBADD = -lboost_thread-mt -lboost_system-mt -lxml2 -lacl -lz -lm
|
||||
+libsnapper_la_LIBADD = -lboost_thread -lboost_system -lxml2 -lacl -lz -lm
|
||||
if ENABLE_ROLLBACK
|
||||
libsnapper_la_LIBADD += -lmount
|
||||
endif
|
||||
|
|
@ -1,6 +1,5 @@
|
|||
diff -rupN snapper-0.2.6.bcp/client/Makefile.am snapper-0.2.6/client/Makefile.am
|
||||
--- snapper-0.2.6.bcp/client/Makefile.am 2015-08-19 10:04:37.437338113 +0200
|
||||
+++ snapper-0.2.6/client/Makefile.am 2015-08-19 10:05:46.004210469 +0200
|
||||
--- snapper-0.2.8/client/Makefile.am~ 2015-03-03 05:07:43.000000000 -0500
|
||||
+++ snapper-0.2.8/client/Makefile.am 2015-10-28 23:00:59.155001300 -0400
|
||||
@@ -20,7 +20,7 @@ snapper_LDADD = ../snapper/libsnapper.la
|
||||
|
||||
libexecdir = /usr/lib/snapper
|
||||
|
|
@ -9,4 +8,4 @@ diff -rupN snapper-0.2.6.bcp/client/Makefile.am snapper-0.2.6/client/Makefile.am
|
|||
+libexec_PROGRAMS = systemd-helper
|
||||
|
||||
installation_helper_SOURCES = \
|
||||
installation-helper.cc
|
||||
installation-helper.cc \
|
||||
|
|
|
|||
15
snapper.spec
15
snapper.spec
|
|
@ -1,6 +1,6 @@
|
|||
Name: snapper
|
||||
Version: 0.2.6
|
||||
Release: 2%{?dist}
|
||||
Version: 0.2.8
|
||||
Release: 1%{?dist}
|
||||
License: GPLv2
|
||||
Group: Applications/System
|
||||
BuildRequires: boost-devel gettext libtool libxml2-devel dbus-devel
|
||||
|
|
@ -13,10 +13,8 @@ Url: http://en.opensuse.org/Portal:Snapper
|
|||
|
||||
Source0: https://github.com/openSUSE/snapper/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
|
||||
patch0: %{name}-remove-ext4-info-xml.patch
|
||||
patch1: %{name}-boost-mt.patch
|
||||
patch2: %{name}-securelibdir.patch
|
||||
patch3: %{name}-0.2.8-systemd-timer.patch
|
||||
patch4: %{name}-drop-installation-helper.patch
|
||||
patch1: %{name}-securelibdir.patch
|
||||
patch2: %{name}-drop-installation-helper.patch
|
||||
|
||||
%description
|
||||
This package contains snapper, a tool for filesystem snapshot management.
|
||||
|
|
@ -55,8 +53,6 @@ A PAM module for calling snapper during user login and logout.
|
|||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
%patch3 -p1
|
||||
%patch4 -p1
|
||||
|
||||
%build
|
||||
aclocal
|
||||
|
|
@ -127,6 +123,9 @@ rm -rf %{buildroot}/%{_docdir}/%{name}/COPYING
|
|||
%doc %{_mandir}/*/pam_snapper*.*
|
||||
|
||||
%changelog
|
||||
* Mon Nov 02 2015 Ondrej Kozina <okozina@redhat.com> - 0.2.8-1
|
||||
- Update to snapper 0.2.8
|
||||
|
||||
* Thu Aug 27 2015 Jonathan Wakely <jwakely@redhat.com> - 0.2.6-2
|
||||
- Rebuilt for Boost 1.59
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue