[packages/snapper] - up to 0.12.0
baggins
baggins at pld-linux.org
Mon Dec 23 15:51:51 CET 2024
commit 68a71c0013743a5f6411fab4e9e1e51f62a9f945
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Mon Dec 23 16:12:00 2024 +0100
- up to 0.12.0
gcc13.patch | 20 --------------------
json-c.patch | 13 -------------
snapper.spec | 33 ++++++++++++++++-----------------
systemd-install.patch | 23 -----------------------
4 files changed, 16 insertions(+), 73 deletions(-)
---
diff --git a/snapper.spec b/snapper.spec
index b13b2bf..4450b2d 100644
--- a/snapper.spec
+++ b/snapper.spec
@@ -1,15 +1,12 @@
Summary: Tool for filesystem snapshot management
Name: snapper
-Version: 0.8.15
-Release: 6
+Version: 0.12.0
+Release: 1
License: GPL v2
Source0: https://github.com/openSUSE/snapper/archive/v%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: df0e34b092bde0d8447360adc7bffb3a
+# Source0-md5: 080b8af3a35b527aaf0120a1dc06bbfb
URL: http://snapper.io
Patch0: remove-ext4-info-xml.patch
-Patch1: json-c.patch
-Patch2: systemd-install.patch
-Patch3: gcc13.patch
BuildRequires: acl-devel
BuildRequires: autoconf
BuildRequires: automake
@@ -66,13 +63,12 @@ A PAM module for calling snapper during user login and logout.
%prep
%setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
+%patch -P 0 -p1
# use libexecdir
-find -type f -exec sed -i -e "s|/usr/lib/snapper|%{_libexecdir}/%{name}|g" {} ';'
+find -type f -exec \
+ %{__sed} -i -e "s|/usr/lib/snapper|%{_libexecdir}/%{name}|g" \
+ -e "s|/usr/lib/systemd|/lib/systemd|g" {} ';'
%build
%{__libtoolize}
@@ -81,6 +77,7 @@ find -type f -exec sed -i -e "s|/usr/lib/snapper|%{_libexecdir}/%{name}|g" {} ';
%{__autoheader}
%{__automake}
%configure \
+ --with-pam-security=/%{_lib}/security \
--disable-ext4 \
--disable-zypp \
--enable-selinux
@@ -117,8 +114,10 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_bindir}/snapper
%attr(755,root,root) %{_sbindir}/mksubvolume
%attr(755,root,root) %{_sbindir}/snapperd
+%attr(755,root,root) %{_sbindir}/snbk
%config(noreplace) /etc/logrotate.d/snapper
-%config(noreplace) /etc/dbus-1/system.d/org.opensuse.Snapper.conf
+%{_datadir}/snapper
+%{_datadir}/dbus-1/system.d/org.opensuse.Snapper.conf
%{_datadir}/dbus-1/system-services/org.opensuse.Snapper.service
%dir %{_libexecdir}/%{name}
%{_libexecdir}/%{name}/installation-helper
@@ -126,21 +125,21 @@ rm -rf $RPM_BUILD_ROOT
%{systemdunitdir}/%{name}-*.timer
%{systemdunitdir}/%{name}-*.service
%{systemdunitdir}/snapperd.service
+%{_mandir}/man5/snapper-backup-configs.5*
%{_mandir}/man5/snapper-configs.5*
%{_mandir}/man8/%{name}.8*
%{_mandir}/man8/mksubvolume.8*
%{_mandir}/man8/snapperd.8*
+%{_mandir}/man8/snbk.8*
%files libs
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libsnapper.so.*.*.*
-%ghost %{_libdir}/libsnapper.so.5
+%ghost %{_libdir}/libsnapper.so.7
%dir %{_sysconfdir}/%{name}
+%dir %{_sysconfdir}/%{name}/backup-configs
+%dir %{_sysconfdir}/%{name}/certs
%dir %{_sysconfdir}/%{name}/configs
-%dir %{_sysconfdir}/%{name}/config-templates
-%config(noreplace) %{_sysconfdir}/%{name}/config-templates/default
-%dir %{_sysconfdir}/%{name}/filters
-%config(noreplace) %{_sysconfdir}/%{name}/filters/*.txt
%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/%{name}
%files devel
diff --git a/gcc13.patch b/gcc13.patch
deleted file mode 100644
index 2417bd5..0000000
--- a/gcc13.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- snapper-0.8.15/snapper/Snapper.h.orig 2023-07-05 11:48:11.280057383 +0200
-+++ snapper-0.8.15/snapper/Snapper.h 2023-07-05 11:49:21.270441224 +0200
-@@ -25,6 +25,7 @@
- #define SNAPPER_SNAPPER_H
-
-
-+#include <cstdint>
- #include <vector>
- #include <boost/noncopyable.hpp>
-
---- snapper-0.8.15/snapper/Snapshot.h.orig 2023-07-05 11:48:11.233390460 +0200
-+++ snapper-0.8.15/snapper/Snapshot.h 2023-07-05 11:50:59.260978628 +0200
-@@ -25,6 +25,7 @@
- #define SNAPPER_SNAPSHOT_H
-
-
-+#include <cstdint>
- #include <time.h>
- #include <sys/types.h>
- #include <string>
diff --git a/json-c.patch b/json-c.patch
deleted file mode 100644
index 0b6fefb..0000000
--- a/json-c.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- snapper-0.8.15/configure.ac~ 2021-03-15 21:29:58.000000000 +0100
-+++ snapper-0.8.15/configure.ac 2021-03-15 21:33:42.630871897 +0100
-@@ -194,9 +194,7 @@
-
- PKG_CHECK_MODULES(DBUS, dbus-1)
- PKG_CHECK_MODULES(XML2, libxml-2.0)
--if test "x$with_zypp" = "xyes"; then
-- PKG_CHECK_MODULES(JSONC, json-c, [], [AC_MSG_WARN([Cannot find json-c. Please install libjson-c-devel])])
--fi
-+PKG_CHECK_MODULES(JSONC, json-c, [], [AC_MSG_WARN([Cannot find json-c. Please install libjson-c-devel])])
-
- AC_CHECK_HEADER(acl/libacl.h,[],[AC_MSG_ERROR([Cannout find libacl headers. Please install libacl-devel])])
-
diff --git a/systemd-install.patch b/systemd-install.patch
deleted file mode 100644
index b64203c..0000000
--- a/systemd-install.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- snapper-0.8.15/data/Makefile.am~ 2021-03-15 21:35:19.000000000 +0100
-+++ snapper-0.8.15/data/Makefile.am 2021-03-15 21:38:52.026915450 +0100
-@@ -22,13 +22,13 @@
- install -D -m 644 org.opensuse.Snapper.service $(DESTDIR)/usr/share/dbus-1/system-services/org.opensuse.Snapper.service
-
- if ENABLE_SYSTEMD
-- 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
-- install -D -m 644 boot.service $(DESTDIR)/usr/lib/systemd/system/snapper-boot.service
-- install -D -m 644 boot.timer $(DESTDIR)/usr/lib/systemd/system/snapper-boot.timer
-- install -D -m 644 snapperd.service $(DESTDIR)/usr/lib/systemd/system/snapperd.service
-+ install -D -m 644 timeline.service $(DESTDIR)/lib/systemd/system/snapper-timeline.service
-+ install -D -m 644 timeline.timer $(DESTDIR)/lib/systemd/system/snapper-timeline.timer
-+ install -D -m 644 cleanup.service $(DESTDIR)/lib/systemd/system/snapper-cleanup.service
-+ install -D -m 644 cleanup.timer $(DESTDIR)/lib/systemd/system/snapper-cleanup.timer
-+ install -D -m 644 boot.service $(DESTDIR)/lib/systemd/system/snapper-boot.service
-+ install -D -m 644 boot.timer $(DESTDIR)/lib/systemd/system/snapper-boot.timer
-+ install -D -m 644 snapperd.service $(DESTDIR)/lib/systemd/system/snapperd.service
- endif
-
- if HAVE_ZYPP
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/snapper.git/commitdiff/68a71c0013743a5f6411fab4e9e1e51f62a9f945
More information about the pld-cvs-commit
mailing list