From 0c74d48db228c47849d5b2697d801ecbf8a9c467 Mon Sep 17 00:00:00 2001 From: meator Date: Sun, 27 Oct 2024 14:01:09 +0100 Subject: [PATCH] snapper: update to 0.11.2. --- common/shlibs | 2 +- .../snapper/patches/0001-disable-locale-tests.patch | 12 +++++------- srcpkgs/snapper/template | 8 ++++---- 3 files changed, 10 insertions(+), 12 deletions(-) diff --git a/common/shlibs b/common/shlibs index 6d083594e55a51..6a2500767b693c 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1454,7 +1454,7 @@ libgfrpc.so.0 libglusterfs-8.3_2 libgfxdr.so.0 libglusterfs-8.3_2 libgfapi.so.0 libglusterfs-8.3_2 libglusterd.so.0 libglusterfs-8.3_2 -libsnapper.so.6 libsnapper-0.10.2_1 +libsnapper.so.7 libsnapper-0.11.2_1 libtsm.so.4 libtsm-4.0.2_1 libxine.so.2 libxine-1.2.4_1 libjbig2dec.so.0 libjbig2dec-0.11_1 diff --git a/srcpkgs/snapper/patches/0001-disable-locale-tests.patch b/srcpkgs/snapper/patches/0001-disable-locale-tests.patch index f39d90ec944a4b..a9d05f04d75015 100644 --- a/srcpkgs/snapper/patches/0001-disable-locale-tests.patch +++ b/srcpkgs/snapper/patches/0001-disable-locale-tests.patch @@ -1,21 +1,19 @@ -diff --git testsuite/Makefile.am testsuite/Makefile.am -index ccb84d3..9774a9c 100644 --- a/testsuite/Makefile.am +++ b/testsuite/Makefile.am -@@ -7,9 +7,9 @@ AM_CPPFLAGS = -I$(top_srcdir) $(DBUS_CFLAGS) +@@ -7,9 +7,9 @@ AM_CPPFLAGS = -I$(top_srcdir) $(DBUS_CFL LDADD = ../snapper/libsnapper.la ../dbus/libdbus.la -lboost_unit_test_framework check_PROGRAMS = sysconfig-get1.test dirname1.test basename1.test \ -- equal-date.test dbus-escape.test cmp-lt.test humanstring.test uuid.test \ +- equal-date.test cmp-lt.test humanstring.test uuid.test \ - table.test table-formatter.test csv-formatter.test json-formatter.test \ - getopts.test scan-datetime.test root-prefix.test range.test limit.test -+ equal-date.test dbus-escape.test uuid.test \ ++ equal-date.test uuid.test \ + csv-formatter.test json-formatter.test \ + getopts.test scan-datetime.test root-prefix.test if ENABLE_BTRFS_QUOTA check_PROGRAMS += qgroup1.test -@@ -29,14 +29,8 @@ equal_date_test_LDADD = -lboost_unit_test_framework ../client/utils/libutils.la +@@ -29,14 +29,8 @@ equal_date_test_LDADD = -lboost_unit_tes scan_datetime_test_LDADD = -lboost_unit_test_framework ../client/utils/libutils.la @@ -30,7 +28,7 @@ index ccb84d3..9774a9c 100644 csv_formatter_test_LDADD = -lboost_unit_test_framework ../client/utils/libutils.la json_formatter_test_LDADD = -lboost_unit_test_framework ../client/utils/libutils.la $(JSONC_LIBS) -@@ -44,7 +38,3 @@ json_formatter_test_LDADD = -lboost_unit_test_framework ../client/utils/libutils +@@ -44,7 +38,3 @@ json_formatter_test_LDADD = -lboost_unit getopts_test_LDADD = -lboost_unit_test_framework ../client/utils/libutils.la lvm_utils_test_LDADD = -lboost_unit_test_framework ../snapper/libsnapper.la diff --git a/srcpkgs/snapper/template b/srcpkgs/snapper/template index 2f9e7a22f815a6..1aabb8fa838e8a 100644 --- a/srcpkgs/snapper/template +++ b/srcpkgs/snapper/template @@ -1,7 +1,7 @@ # Template file for 'snapper' pkgname=snapper -version=0.10.3 -revision=4 +version=0.11.2 +revision=1 build_style=gnu-configure configure_args="--disable-zypp --disable-systemd --with-conf=/etc/conf.d" conf_files="/etc/conf.d/snapper" @@ -17,7 +17,7 @@ maintainer="Orphaned " license="GPL-2.0-only" homepage="http://snapper.io" distfiles="https://github.com/openSUSE/snapper/archive/v${version}.tar.gz" -checksum=adc207cc049d3b2302201d3bc8ad4c49dd9cf61192273e0bca118d35c3e940cc +checksum=d2a33935f94f30b22aecbdfdecccf651b3616fa698aec266646a9d06043bfd6f lib32disabled=yes if [ "$XBPS_TARGET_LIBC" = musl ] @@ -30,7 +30,7 @@ pre_configure() { # rename cron scripts sed -i -e 's@suse.de-@@g' scripts/Makefile.am # fix config location in cron scripts - sed -i -e 's@/etc/sysconfig/@/etc/conf.d/@g' scripts/snapper-{daily,hourly} + sed -i -e 's@/etc/sysconfig/@/etc/conf.d/@g' scripts/snapper-hourly # fix pam plugin install location sed -i -e 's@shell echo /@shell echo /usr/@g' pam/Makefile.am