diff --git a/debian.tar.gz b/debian.tar.gz index 4363abd..c4a4729 100644 --- a/debian.tar.gz +++ b/debian.tar.gz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:badaf37fad830058b6056f8a3fdc46dd69b3219874ec16b2b53609682cbdc37d -size 3600 +oid sha256:35c3645bc57d8f058596d2f4dac00ab7122869c2b9e84a733fb2b9772f7e0872 +size 3598 diff --git a/snapper-0.10.4.tar.bz2 b/snapper-0.10.4.tar.bz2 index 0926b5d..36e7bae 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:897386e66aec5c1afdb0e82abf608b6d3935487d16624f84ee9cac50b23aafd4 -size 672300 +oid sha256:6382a8f4a6241add32780e81a09d65de37d0d9ce9e2ce1615f5780401dd5d46a +size 671913 diff --git a/snapper-Debian_10.0.dsc b/snapper-Debian_10.0.dsc index b2d8a12..a8c460c 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: -dfdaf63f4d8ec6f1dc25aaac99cbf667 672300 snapper-0.10.4.tar.bz2 +f240ccd20f60cc7c90c5c00507e80235 671913 snapper-0.10.4.tar.bz2 diff --git a/snapper-Debian_11.0.dsc b/snapper-Debian_11.0.dsc index b2d8a12..a8c460c 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: -dfdaf63f4d8ec6f1dc25aaac99cbf667 672300 snapper-0.10.4.tar.bz2 +f240ccd20f60cc7c90c5c00507e80235 671913 snapper-0.10.4.tar.bz2 diff --git a/snapper-Debian_Unstable.dsc b/snapper-Debian_Unstable.dsc index b2d8a12..a8c460c 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: -dfdaf63f4d8ec6f1dc25aaac99cbf667 672300 snapper-0.10.4.tar.bz2 +f240ccd20f60cc7c90c5c00507e80235 671913 snapper-0.10.4.tar.bz2 diff --git a/snapper-xUbuntu_18.04.dsc b/snapper-xUbuntu_18.04.dsc index c53864b..3fe08ce 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: -dfdaf63f4d8ec6f1dc25aaac99cbf667 672300 snapper-0.10.4.tar.bz2 +f240ccd20f60cc7c90c5c00507e80235 671913 snapper-0.10.4.tar.bz2 diff --git a/snapper-xUbuntu_18.10.dsc b/snapper-xUbuntu_18.10.dsc index c53864b..3fe08ce 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: -dfdaf63f4d8ec6f1dc25aaac99cbf667 672300 snapper-0.10.4.tar.bz2 +f240ccd20f60cc7c90c5c00507e80235 671913 snapper-0.10.4.tar.bz2 diff --git a/snapper-xUbuntu_19.04.dsc b/snapper-xUbuntu_19.04.dsc index c53864b..3fe08ce 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: -dfdaf63f4d8ec6f1dc25aaac99cbf667 672300 snapper-0.10.4.tar.bz2 +f240ccd20f60cc7c90c5c00507e80235 671913 snapper-0.10.4.tar.bz2 diff --git a/snapper-xUbuntu_19.10.dsc b/snapper-xUbuntu_19.10.dsc index c53864b..3fe08ce 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: -dfdaf63f4d8ec6f1dc25aaac99cbf667 672300 snapper-0.10.4.tar.bz2 +f240ccd20f60cc7c90c5c00507e80235 671913 snapper-0.10.4.tar.bz2 diff --git a/snapper-xUbuntu_20.04.dsc b/snapper-xUbuntu_20.04.dsc index c53864b..3fe08ce 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: -dfdaf63f4d8ec6f1dc25aaac99cbf667 672300 snapper-0.10.4.tar.bz2 +f240ccd20f60cc7c90c5c00507e80235 671913 snapper-0.10.4.tar.bz2 diff --git a/snapper-xUbuntu_20.10.dsc b/snapper-xUbuntu_20.10.dsc index c53864b..3fe08ce 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: -dfdaf63f4d8ec6f1dc25aaac99cbf667 672300 snapper-0.10.4.tar.bz2 +f240ccd20f60cc7c90c5c00507e80235 671913 snapper-0.10.4.tar.bz2 diff --git a/snapper-xUbuntu_21.04.dsc b/snapper-xUbuntu_21.04.dsc index c53864b..3fe08ce 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: -dfdaf63f4d8ec6f1dc25aaac99cbf667 672300 snapper-0.10.4.tar.bz2 +f240ccd20f60cc7c90c5c00507e80235 671913 snapper-0.10.4.tar.bz2 diff --git a/snapper-xUbuntu_21.10.dsc b/snapper-xUbuntu_21.10.dsc index c53864b..3fe08ce 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: -dfdaf63f4d8ec6f1dc25aaac99cbf667 672300 snapper-0.10.4.tar.bz2 +f240ccd20f60cc7c90c5c00507e80235 671913 snapper-0.10.4.tar.bz2 diff --git a/snapper-xUbuntu_22.04.dsc b/snapper-xUbuntu_22.04.dsc index c53864b..3fe08ce 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: -dfdaf63f4d8ec6f1dc25aaac99cbf667 672300 snapper-0.10.4.tar.bz2 +f240ccd20f60cc7c90c5c00507e80235 671913 snapper-0.10.4.tar.bz2 diff --git a/snapper-xUbuntu_22.10.dsc b/snapper-xUbuntu_22.10.dsc index c53864b..3fe08ce 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: -dfdaf63f4d8ec6f1dc25aaac99cbf667 672300 snapper-0.10.4.tar.bz2 +f240ccd20f60cc7c90c5c00507e80235 671913 snapper-0.10.4.tar.bz2 diff --git a/snapper.changes b/snapper.changes index b8bad0e..bac54cb 100644 --- a/snapper.changes +++ b/snapper.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Mar 21 08:51:05 CET 2023 - aschnell@suse.com + +- enable SELinux (and allow to disable via conditional build) + (bsc#1209515) +- avoid some extra checks if SELinux is compile-time disabled + ------------------------------------------------------------------- Thu Feb 23 11:14:58 CET 2023 - aschnell@suse.com diff --git a/snapper.spec b/snapper.spec index 202cf6f..a4c911e 100644 --- a/snapper.spec +++ b/snapper.spec @@ -1,7 +1,7 @@ # # spec file for package snapper # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -28,6 +28,9 @@ %define pam_security_dir /%{_lib}/security %endif +# Optionally build without SELinux support +%bcond_without selinux + # Optionally build with test coverage reporting %bcond_with coverage @@ -41,16 +44,16 @@ URL: http://snapper.io/ Source: snapper-%{version}.tar.bz2 %if 0%{?suse_version} BuildRequires: libboost_system-devel -BuildRequires: libboost_thread-devel BuildRequires: libboost_test-devel +BuildRequires: libboost_thread-devel %else BuildRequires: boost-devel %endif +BuildRequires: e2fsprogs-devel BuildRequires: gcc-c++ BuildRequires: libacl-devel BuildRequires: libtool BuildRequires: libxml2-devel -BuildRequires: e2fsprogs-devel BuildRequires: ncurses-devel %if 0%{?suse_version} BuildRequires: libbtrfs-devel @@ -68,9 +71,9 @@ BuildRequires: systemd BuildRequires: pkg-config %endif %if 0%{?fedora_version} || 0%{?centos_version} -BuildRequires: glibc-langpack-de -BuildRequires: glibc-langpack-fr -BuildRequires: glibc-langpack-en +BuildRequires: glibc-langpack-de +BuildRequires: glibc-langpack-en +BuildRequires: glibc-langpack-fr %else BuildRequires: glibc-locale %endif @@ -95,10 +98,12 @@ 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 +%if %{with selinux} +BuildRequires: libselinux-devel +%endif BuildRequires: zlib-devel %if %{with coverage} BuildRequires: lcov @@ -107,7 +112,8 @@ Requires: diffutils Requires: libsnapper6 = %version Requires: systemd %if 0%{?suse_version} -Recommends: logrotate snapper-zypp-plugin +Recommends: logrotate +Recommends: snapper-zypp-plugin Supplements: btrfsprogs %endif @@ -131,17 +137,13 @@ export CXXFLAGS="%{optflags} -DNDEBUG" autoreconf -fvi %configure \ --docdir="%{_defaultdocdir}/snapper" \ -%if %{with coverage} - --enable-coverage \ -%endif + %{?with_coverage:--enable-coverage} \ --with-pam-security="%{pam_security_dir}" \ %if ! 0%{?suse_version} --disable-rollback \ --disable-btrfs-quota \ %endif -%if 0%{?fedora_version} || 0%{?rhel_version} - --enable-selinux \ -%endif + %{?with_selinux:--enable-selinux} \ --disable-silent-rules --disable-ext4 make %{?_smp_mflags} @@ -295,7 +297,7 @@ Requires: libboost_headers-devel Requires: boost-devel %endif Requires: gcc-c++ -Requires: libacl-devel +Requires: libacl-devel Requires: libsnapper6 = %version Requires: libstdc++-devel Requires: libxml2-devel @@ -317,8 +319,8 @@ libsnapper. %{_includedir}/snapper %package -n snapper-zypp-plugin -Requires: libzypp(plugin:commit) = 1 Requires: snapper = %version +Requires: libzypp(plugin:commit) = 1 Summary: A zypp commit plugin for calling snapper Group: System/Packages