From 70af860a2e67df264c33a443ce72c1e8efc44a8c3825f5d3bf1b7bdbb24b6f25 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Sat, 4 Feb 2023 13:08:59 +0000 Subject: [PATCH] https://bugzilla.opensuse.org/show_bug.cgi?id=1207901 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/snapper?expand=0&rev=149 --- debian.tar.gz | 2 +- snapper-0.10.4.tar.bz2 | 4 ++-- snapper-Debian_10.0.dsc | 2 +- snapper-Debian_11.0.dsc | 2 +- snapper-Debian_Unstable.dsc | 2 +- snapper-xUbuntu_18.04.dsc | 2 +- snapper-xUbuntu_18.10.dsc | 2 +- snapper-xUbuntu_19.04.dsc | 2 +- snapper-xUbuntu_19.10.dsc | 2 +- snapper-xUbuntu_20.04.dsc | 2 +- snapper-xUbuntu_20.10.dsc | 2 +- snapper-xUbuntu_21.04.dsc | 2 +- snapper-xUbuntu_21.10.dsc | 2 +- snapper-xUbuntu_22.04.dsc | 2 +- snapper-xUbuntu_22.10.dsc | 2 +- snapper.changes | 29 +---------------------------- snapper.spec | 29 ++++++++++++----------------- 17 files changed, 29 insertions(+), 61 deletions(-) diff --git a/debian.tar.gz b/debian.tar.gz index 97a8c1f..1e51d64 100644 --- a/debian.tar.gz +++ b/debian.tar.gz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8a84a0f15b4c3b40ee1b739fe16d7ea6a69185f2f5bd73dc2a063c20cec3a61c +oid sha256:e7b4fbed59ffb32a6b00cffcd34f68ae58ae25b1876e0a74493509f11aea2f08 size 3584 diff --git a/snapper-0.10.4.tar.bz2 b/snapper-0.10.4.tar.bz2 index fb235c2..1597587 100644 --- a/snapper-0.10.4.tar.bz2 +++ b/snapper-0.10.4.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fc960823ac14cedbd11e53e23ce8b84c284466493d06251e86abfff97c12a2af -size 670516 +oid sha256:6b32bf2e947bd893209182c3a3ff6c92bd13ce566944285df030a87a767115e2 +size 669404 diff --git a/snapper-Debian_10.0.dsc b/snapper-Debian_10.0.dsc index 16cceb7..9ac1542 100644 --- a/snapper-Debian_10.0.dsc +++ b/snapper-Debian_10.0.dsc @@ -11,4 +11,4 @@ Build-Depends: debhelper (>= 4.1.16), acl-dev, dbus, g++, libboost-dev, libboost # 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz # Files: -4538d86f7634dccc1d1546da35b88454 670516 snapper-0.10.4.tar.bz2 +746d03d606b9273e46b0361dcbbb83ce 669404 snapper-0.10.4.tar.bz2 diff --git a/snapper-Debian_11.0.dsc b/snapper-Debian_11.0.dsc index 16cceb7..9ac1542 100644 --- a/snapper-Debian_11.0.dsc +++ b/snapper-Debian_11.0.dsc @@ -11,4 +11,4 @@ Build-Depends: debhelper (>= 4.1.16), acl-dev, dbus, g++, libboost-dev, libboost # 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz # Files: -4538d86f7634dccc1d1546da35b88454 670516 snapper-0.10.4.tar.bz2 +746d03d606b9273e46b0361dcbbb83ce 669404 snapper-0.10.4.tar.bz2 diff --git a/snapper-Debian_Unstable.dsc b/snapper-Debian_Unstable.dsc index 16cceb7..9ac1542 100644 --- a/snapper-Debian_Unstable.dsc +++ b/snapper-Debian_Unstable.dsc @@ -11,4 +11,4 @@ Build-Depends: debhelper (>= 4.1.16), acl-dev, dbus, g++, libboost-dev, libboost # 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz # Files: -4538d86f7634dccc1d1546da35b88454 670516 snapper-0.10.4.tar.bz2 +746d03d606b9273e46b0361dcbbb83ce 669404 snapper-0.10.4.tar.bz2 diff --git a/snapper-xUbuntu_18.04.dsc b/snapper-xUbuntu_18.04.dsc index 77a0ced..6a95600 100644 --- a/snapper-xUbuntu_18.04.dsc +++ b/snapper-xUbuntu_18.04.dsc @@ -11,4 +11,4 @@ Build-Depends: debhelper (>= 4.1.16), acl-dev, dbus, g++, libboost-dev, libboost # 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz # Files: -4538d86f7634dccc1d1546da35b88454 670516 snapper-0.10.4.tar.bz2 +746d03d606b9273e46b0361dcbbb83ce 669404 snapper-0.10.4.tar.bz2 diff --git a/snapper-xUbuntu_18.10.dsc b/snapper-xUbuntu_18.10.dsc index 77a0ced..6a95600 100644 --- a/snapper-xUbuntu_18.10.dsc +++ b/snapper-xUbuntu_18.10.dsc @@ -11,4 +11,4 @@ Build-Depends: debhelper (>= 4.1.16), acl-dev, dbus, g++, libboost-dev, libboost # 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz # Files: -4538d86f7634dccc1d1546da35b88454 670516 snapper-0.10.4.tar.bz2 +746d03d606b9273e46b0361dcbbb83ce 669404 snapper-0.10.4.tar.bz2 diff --git a/snapper-xUbuntu_19.04.dsc b/snapper-xUbuntu_19.04.dsc index 77a0ced..6a95600 100644 --- a/snapper-xUbuntu_19.04.dsc +++ b/snapper-xUbuntu_19.04.dsc @@ -11,4 +11,4 @@ Build-Depends: debhelper (>= 4.1.16), acl-dev, dbus, g++, libboost-dev, libboost # 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz # Files: -4538d86f7634dccc1d1546da35b88454 670516 snapper-0.10.4.tar.bz2 +746d03d606b9273e46b0361dcbbb83ce 669404 snapper-0.10.4.tar.bz2 diff --git a/snapper-xUbuntu_19.10.dsc b/snapper-xUbuntu_19.10.dsc index 77a0ced..6a95600 100644 --- a/snapper-xUbuntu_19.10.dsc +++ b/snapper-xUbuntu_19.10.dsc @@ -11,4 +11,4 @@ Build-Depends: debhelper (>= 4.1.16), acl-dev, dbus, g++, libboost-dev, libboost # 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz # Files: -4538d86f7634dccc1d1546da35b88454 670516 snapper-0.10.4.tar.bz2 +746d03d606b9273e46b0361dcbbb83ce 669404 snapper-0.10.4.tar.bz2 diff --git a/snapper-xUbuntu_20.04.dsc b/snapper-xUbuntu_20.04.dsc index 77a0ced..6a95600 100644 --- a/snapper-xUbuntu_20.04.dsc +++ b/snapper-xUbuntu_20.04.dsc @@ -11,4 +11,4 @@ Build-Depends: debhelper (>= 4.1.16), acl-dev, dbus, g++, libboost-dev, libboost # 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz # Files: -4538d86f7634dccc1d1546da35b88454 670516 snapper-0.10.4.tar.bz2 +746d03d606b9273e46b0361dcbbb83ce 669404 snapper-0.10.4.tar.bz2 diff --git a/snapper-xUbuntu_20.10.dsc b/snapper-xUbuntu_20.10.dsc index 77a0ced..6a95600 100644 --- a/snapper-xUbuntu_20.10.dsc +++ b/snapper-xUbuntu_20.10.dsc @@ -11,4 +11,4 @@ Build-Depends: debhelper (>= 4.1.16), acl-dev, dbus, g++, libboost-dev, libboost # 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz # Files: -4538d86f7634dccc1d1546da35b88454 670516 snapper-0.10.4.tar.bz2 +746d03d606b9273e46b0361dcbbb83ce 669404 snapper-0.10.4.tar.bz2 diff --git a/snapper-xUbuntu_21.04.dsc b/snapper-xUbuntu_21.04.dsc index 77a0ced..6a95600 100644 --- a/snapper-xUbuntu_21.04.dsc +++ b/snapper-xUbuntu_21.04.dsc @@ -11,4 +11,4 @@ Build-Depends: debhelper (>= 4.1.16), acl-dev, dbus, g++, libboost-dev, libboost # 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz # Files: -4538d86f7634dccc1d1546da35b88454 670516 snapper-0.10.4.tar.bz2 +746d03d606b9273e46b0361dcbbb83ce 669404 snapper-0.10.4.tar.bz2 diff --git a/snapper-xUbuntu_21.10.dsc b/snapper-xUbuntu_21.10.dsc index 77a0ced..6a95600 100644 --- a/snapper-xUbuntu_21.10.dsc +++ b/snapper-xUbuntu_21.10.dsc @@ -11,4 +11,4 @@ Build-Depends: debhelper (>= 4.1.16), acl-dev, dbus, g++, libboost-dev, libboost # 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz # Files: -4538d86f7634dccc1d1546da35b88454 670516 snapper-0.10.4.tar.bz2 +746d03d606b9273e46b0361dcbbb83ce 669404 snapper-0.10.4.tar.bz2 diff --git a/snapper-xUbuntu_22.04.dsc b/snapper-xUbuntu_22.04.dsc index 77a0ced..6a95600 100644 --- a/snapper-xUbuntu_22.04.dsc +++ b/snapper-xUbuntu_22.04.dsc @@ -11,4 +11,4 @@ Build-Depends: debhelper (>= 4.1.16), acl-dev, dbus, g++, libboost-dev, libboost # 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz # Files: -4538d86f7634dccc1d1546da35b88454 670516 snapper-0.10.4.tar.bz2 +746d03d606b9273e46b0361dcbbb83ce 669404 snapper-0.10.4.tar.bz2 diff --git a/snapper-xUbuntu_22.10.dsc b/snapper-xUbuntu_22.10.dsc index 77a0ced..6a95600 100644 --- a/snapper-xUbuntu_22.10.dsc +++ b/snapper-xUbuntu_22.10.dsc @@ -11,4 +11,4 @@ Build-Depends: debhelper (>= 4.1.16), acl-dev, dbus, g++, libboost-dev, libboost # 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz # Files: -4538d86f7634dccc1d1546da35b88454 670516 snapper-0.10.4.tar.bz2 +746d03d606b9273e46b0361dcbbb83ce 669404 snapper-0.10.4.tar.bz2 diff --git a/snapper.changes b/snapper.changes index c268acf..9a35eb5 100644 --- a/snapper.changes +++ b/snapper.changes @@ -1,30 +1,3 @@ -------------------------------------------------------------------- -Wed Jan 25 12:25:23 CET 2023 - aschnell@suse.com - -- suppress debug logging in zypp-plugin per default - -------------------------------------------------------------------- -Tue Jan 24 10:56:29 CET 2023 - aschnell@suse.com - -- enable SELinux on Fedora and RHEL (gh#openSUSE/snapper#772) - -------------------------------------------------------------------- -Thu Jan 19 12:00:00 PM CET 2023 - David Sterba - -- Use libbtrfsutil implementation for BtrfsUtil::get_subvolume - -------------------------------------------------------------------- -Thu Jan 12 12:00:00 PM CET 2023 - David Sterba - -- Add build support for libbtrfsutil -- Use libbtrfsutil implementation for the following methods: - - check if a subvolume exists - - create subvolume, snapshot - - subvolume read-only check - - delete subvolume - - set/get default subvolume - - filesystem sync - ------------------------------------------------------------------- Tue Dec 27 13:20:38 UTC 2022 - Ludwig Nussel @@ -39,7 +12,7 @@ Thu Dec 22 09:03:33 CET 2022 - aschnell@suse.com ------------------------------------------------------------------- Mon Dec 05 08:13:07 CET 2022 - aschnell@suse.com -- fix build with upcoming SELinux +- fix build with upcoming selinux - version 0.10.4 ------------------------------------------------------------------- diff --git a/snapper.spec b/snapper.spec index d0270d6..3b856c2 100644 --- a/snapper.spec +++ b/snapper.spec @@ -39,7 +39,7 @@ License: GPL-2.0-only Group: System/Packages URL: http://snapper.io/ Source: snapper-%{version}.tar.bz2 -%if 0%{?suse_version} +%if 0%{?suse_version} > 1325 BuildRequires: libboost_system-devel BuildRequires: libboost_thread-devel BuildRequires: libboost_test-devel @@ -55,19 +55,16 @@ BuildRequires: ncurses-devel %if 0%{?suse_version} BuildRequires: libbtrfs-devel %endif -%if 0%{?suse_version} >= 1550 -BuildRequires: libbtrfsutil-devel -%endif -%if 0%{?suse_version} +%if 0%{?suse_version} > 1310 BuildRequires: libmount-devel >= 2.24 %endif -%if 0%{?fedora_version} +%if 0%{?fedora_version} >= 23 BuildRequires: pkgconfig BuildRequires: systemd %else BuildRequires: pkg-config %endif -%if 0%{?fedora_version} || 0%{?centos_version} +%if 0%{?fedora_version} >= 24 || 0%{?centos_version} >= 800 BuildRequires: glibc-langpack-de BuildRequires: glibc-langpack-fr BuildRequires: glibc-langpack-en @@ -75,7 +72,7 @@ BuildRequires: glibc-langpack-en BuildRequires: glibc-locale %endif %if ! 0%{?mandriva_version} -%if 0%{?fedora_version} +%if 0%{?fedora_version} >= 23 BuildRequires: dbus-devel BuildRequires: docbook-style-xsl %else @@ -95,7 +92,6 @@ BuildRequires: libzypp(plugin:commit) BuildRequires: pam-devel %if 0%{?fedora_version} || 0%{?rhel_version} || 0%{?centos_version} || 0%{?scientificlinux_version} BuildRequires: json-c-devel -BuildRequires: libselinux-devel %else BuildRequires: libjson-c-devel %endif @@ -135,12 +131,11 @@ autoreconf -fvi --enable-coverage \ %endif --with-pam-security="%{pam_security_dir}" \ -%if ! 0%{?suse_version} +%if 0%{?suse_version} <= 1310 --disable-rollback \ - --disable-btrfs-quota \ %endif -%if 0%{?fedora_version} || 0%{?rhel_version} - --enable-selinux \ +%if 0%{?suse_version} <= 1310 + --disable-btrfs-quota \ %endif --disable-silent-rules --disable-ext4 make %{?_smp_mflags} @@ -212,7 +207,7 @@ test -f /etc/logrotate.d/snapper.rpmsave && mv -v /etc/logrotate.d/snapper.rpmsa %defattr(-,root,root) %{_bindir}/snapper %{_sbindir}/snapperd -%if 0%{?suse_version} +%if 0%{?suse_version} > 1310 %{_sbindir}/mksubvolume %endif %dir %{_prefix}/lib/snapper @@ -220,7 +215,7 @@ test -f /etc/logrotate.d/snapper.rpmsave && mv -v /etc/logrotate.d/snapper.rpmsa %{_mandir}/*/snapper.8* %{_mandir}/*/snapperd.8* %{_mandir}/*/snapper-configs.5* -%if 0%{?suse_version} +%if 0%{?suse_version} > 1310 %doc %{_mandir}/*/mksubvolume.8* %endif %if 0%{?suse_version} > 1500 @@ -288,7 +283,7 @@ done %postun -n libsnapper6 -p /sbin/ldconfig %package -n libsnapper-devel -%if 0%{?suse_version} +%if 0%{?suse_version} > 1325 Requires: libboost_headers-devel %else Requires: boost-devel @@ -301,7 +296,7 @@ Requires: libxml2-devel %if 0%{?suse_version} Requires: libbtrfs-devel %endif -%if 0%{?suse_version} +%if 0%{?suse_version} > 1310 Requires: libmount-devel >= 2.24 %endif Summary: Header files and documentation for libsnapper