From a47911589d5233abfad2032aa6ea0e2c860549394e277505c8b875478fac5686 Mon Sep 17 00:00:00 2001 From: Arvin Schnell Date: Tue, 24 Jan 2023 10:58:49 +0000 Subject: [PATCH] - updated to latest repo version OBS-URL: https://build.opensuse.org/package/show/filesystems:snapper/snapper?expand=0&rev=471 --- debian.tar.gz | 4 ++-- 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 | 7 ++++++- snapper.spec | 26 ++++++++++++++------------ 17 files changed, 37 insertions(+), 30 deletions(-) diff --git a/debian.tar.gz b/debian.tar.gz index c6ec443..2424507 100644 --- a/debian.tar.gz +++ b/debian.tar.gz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ee0bd858aa76f782be0bc28b91a41f16e8a1dba0dca671174880e27fcaea2377 -size 3584 +oid sha256:98e3749e2ff140a637b704328bbd5999d1d1aafd594d5aba6b039e1824e5ece8 +size 3586 diff --git a/snapper-0.10.4.tar.bz2 b/snapper-0.10.4.tar.bz2 index 0bff4c4..0aa430f 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:3a349ab91e0d3b987f854dd3bc1a14329b198e35b384c04994b00a8535b9c963 -size 670300 +oid sha256:a8a5e15d68f7756c0843ca3524f3faf07ee5f7cacb742d7ef03da4d724c1bec8 +size 669957 diff --git a/snapper-Debian_10.0.dsc b/snapper-Debian_10.0.dsc index e05d622..e7df5e5 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: -04638ff5e7ee57badbaa802530b9b742 670300 snapper-0.10.4.tar.bz2 +6c6d39245a7a60d4eef8afccdc7bd6e1 669957 snapper-0.10.4.tar.bz2 diff --git a/snapper-Debian_11.0.dsc b/snapper-Debian_11.0.dsc index e05d622..e7df5e5 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: -04638ff5e7ee57badbaa802530b9b742 670300 snapper-0.10.4.tar.bz2 +6c6d39245a7a60d4eef8afccdc7bd6e1 669957 snapper-0.10.4.tar.bz2 diff --git a/snapper-Debian_Unstable.dsc b/snapper-Debian_Unstable.dsc index e05d622..e7df5e5 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: -04638ff5e7ee57badbaa802530b9b742 670300 snapper-0.10.4.tar.bz2 +6c6d39245a7a60d4eef8afccdc7bd6e1 669957 snapper-0.10.4.tar.bz2 diff --git a/snapper-xUbuntu_18.04.dsc b/snapper-xUbuntu_18.04.dsc index 42b12f6..84222a8 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: -04638ff5e7ee57badbaa802530b9b742 670300 snapper-0.10.4.tar.bz2 +6c6d39245a7a60d4eef8afccdc7bd6e1 669957 snapper-0.10.4.tar.bz2 diff --git a/snapper-xUbuntu_18.10.dsc b/snapper-xUbuntu_18.10.dsc index 42b12f6..84222a8 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: -04638ff5e7ee57badbaa802530b9b742 670300 snapper-0.10.4.tar.bz2 +6c6d39245a7a60d4eef8afccdc7bd6e1 669957 snapper-0.10.4.tar.bz2 diff --git a/snapper-xUbuntu_19.04.dsc b/snapper-xUbuntu_19.04.dsc index 42b12f6..84222a8 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: -04638ff5e7ee57badbaa802530b9b742 670300 snapper-0.10.4.tar.bz2 +6c6d39245a7a60d4eef8afccdc7bd6e1 669957 snapper-0.10.4.tar.bz2 diff --git a/snapper-xUbuntu_19.10.dsc b/snapper-xUbuntu_19.10.dsc index 42b12f6..84222a8 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: -04638ff5e7ee57badbaa802530b9b742 670300 snapper-0.10.4.tar.bz2 +6c6d39245a7a60d4eef8afccdc7bd6e1 669957 snapper-0.10.4.tar.bz2 diff --git a/snapper-xUbuntu_20.04.dsc b/snapper-xUbuntu_20.04.dsc index 42b12f6..84222a8 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: -04638ff5e7ee57badbaa802530b9b742 670300 snapper-0.10.4.tar.bz2 +6c6d39245a7a60d4eef8afccdc7bd6e1 669957 snapper-0.10.4.tar.bz2 diff --git a/snapper-xUbuntu_20.10.dsc b/snapper-xUbuntu_20.10.dsc index 42b12f6..84222a8 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: -04638ff5e7ee57badbaa802530b9b742 670300 snapper-0.10.4.tar.bz2 +6c6d39245a7a60d4eef8afccdc7bd6e1 669957 snapper-0.10.4.tar.bz2 diff --git a/snapper-xUbuntu_21.04.dsc b/snapper-xUbuntu_21.04.dsc index 42b12f6..84222a8 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: -04638ff5e7ee57badbaa802530b9b742 670300 snapper-0.10.4.tar.bz2 +6c6d39245a7a60d4eef8afccdc7bd6e1 669957 snapper-0.10.4.tar.bz2 diff --git a/snapper-xUbuntu_21.10.dsc b/snapper-xUbuntu_21.10.dsc index 42b12f6..84222a8 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: -04638ff5e7ee57badbaa802530b9b742 670300 snapper-0.10.4.tar.bz2 +6c6d39245a7a60d4eef8afccdc7bd6e1 669957 snapper-0.10.4.tar.bz2 diff --git a/snapper-xUbuntu_22.04.dsc b/snapper-xUbuntu_22.04.dsc index 42b12f6..84222a8 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: -04638ff5e7ee57badbaa802530b9b742 670300 snapper-0.10.4.tar.bz2 +6c6d39245a7a60d4eef8afccdc7bd6e1 669957 snapper-0.10.4.tar.bz2 diff --git a/snapper-xUbuntu_22.10.dsc b/snapper-xUbuntu_22.10.dsc index 42b12f6..84222a8 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: -04638ff5e7ee57badbaa802530b9b742 670300 snapper-0.10.4.tar.bz2 +6c6d39245a7a60d4eef8afccdc7bd6e1 669957 snapper-0.10.4.tar.bz2 diff --git a/snapper.changes b/snapper.changes index 84672d4..e04525a 100644 --- a/snapper.changes +++ b/snapper.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +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 @@ -29,7 +34,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 a015c05..d0270d6 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} > 1325 +%if 0%{?suse_version} BuildRequires: libboost_system-devel BuildRequires: libboost_thread-devel BuildRequires: libboost_test-devel @@ -58,16 +58,16 @@ BuildRequires: libbtrfs-devel %if 0%{?suse_version} >= 1550 BuildRequires: libbtrfsutil-devel %endif -%if 0%{?suse_version} > 1310 +%if 0%{?suse_version} BuildRequires: libmount-devel >= 2.24 %endif -%if 0%{?fedora_version} >= 23 +%if 0%{?fedora_version} BuildRequires: pkgconfig BuildRequires: systemd %else BuildRequires: pkg-config %endif -%if 0%{?fedora_version} >= 24 || 0%{?centos_version} >= 800 +%if 0%{?fedora_version} || 0%{?centos_version} BuildRequires: glibc-langpack-de BuildRequires: glibc-langpack-fr BuildRequires: glibc-langpack-en @@ -75,7 +75,7 @@ BuildRequires: glibc-langpack-en BuildRequires: glibc-locale %endif %if ! 0%{?mandriva_version} -%if 0%{?fedora_version} >= 23 +%if 0%{?fedora_version} BuildRequires: dbus-devel BuildRequires: docbook-style-xsl %else @@ -95,6 +95,7 @@ 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 @@ -134,11 +135,12 @@ autoreconf -fvi --enable-coverage \ %endif --with-pam-security="%{pam_security_dir}" \ -%if 0%{?suse_version} <= 1310 +%if ! 0%{?suse_version} --disable-rollback \ -%endif -%if 0%{?suse_version} <= 1310 --disable-btrfs-quota \ +%endif +%if 0%{?fedora_version} || 0%{?rhel_version} + --enable-selinux \ %endif --disable-silent-rules --disable-ext4 make %{?_smp_mflags} @@ -210,7 +212,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} > 1310 +%if 0%{?suse_version} %{_sbindir}/mksubvolume %endif %dir %{_prefix}/lib/snapper @@ -218,7 +220,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} > 1310 +%if 0%{?suse_version} %doc %{_mandir}/*/mksubvolume.8* %endif %if 0%{?suse_version} > 1500 @@ -286,7 +288,7 @@ done %postun -n libsnapper6 -p /sbin/ldconfig %package -n libsnapper-devel -%if 0%{?suse_version} > 1325 +%if 0%{?suse_version} Requires: libboost_headers-devel %else Requires: boost-devel @@ -299,7 +301,7 @@ Requires: libxml2-devel %if 0%{?suse_version} Requires: libbtrfs-devel %endif -%if 0%{?suse_version} > 1310 +%if 0%{?suse_version} Requires: libmount-devel >= 2.24 %endif Summary: Header files and documentation for libsnapper