SHA256
1
0
forked from pool/snapper

Accepting request 1074617 from filesystems:snapper

- updated to latest repository

OBS-URL: https://build.opensuse.org/request/show/1074617
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/snapper?expand=0&rev=152
This commit is contained in:
Dominique Leuenberger 2023-03-29 21:25:53 +00:00 committed by Git OBS Bridge
commit f8826abd4b
17 changed files with 42 additions and 33 deletions

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:badaf37fad830058b6056f8a3fdc46dd69b3219874ec16b2b53609682cbdc37d oid sha256:35c3645bc57d8f058596d2f4dac00ab7122869c2b9e84a733fb2b9772f7e0872
size 3600 size 3598

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:897386e66aec5c1afdb0e82abf608b6d3935487d16624f84ee9cac50b23aafd4 oid sha256:6382a8f4a6241add32780e81a09d65de37d0d9ce9e2ce1615f5780401dd5d46a
size 672300 size 671913

View File

@ -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 # 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz
# #
Files: Files:
dfdaf63f4d8ec6f1dc25aaac99cbf667 672300 snapper-0.10.4.tar.bz2 f240ccd20f60cc7c90c5c00507e80235 671913 snapper-0.10.4.tar.bz2

View File

@ -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 # 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz
# #
Files: Files:
dfdaf63f4d8ec6f1dc25aaac99cbf667 672300 snapper-0.10.4.tar.bz2 f240ccd20f60cc7c90c5c00507e80235 671913 snapper-0.10.4.tar.bz2

View File

@ -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 # 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz
# #
Files: Files:
dfdaf63f4d8ec6f1dc25aaac99cbf667 672300 snapper-0.10.4.tar.bz2 f240ccd20f60cc7c90c5c00507e80235 671913 snapper-0.10.4.tar.bz2

View File

@ -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 # 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz
# #
Files: Files:
dfdaf63f4d8ec6f1dc25aaac99cbf667 672300 snapper-0.10.4.tar.bz2 f240ccd20f60cc7c90c5c00507e80235 671913 snapper-0.10.4.tar.bz2

View File

@ -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 # 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz
# #
Files: Files:
dfdaf63f4d8ec6f1dc25aaac99cbf667 672300 snapper-0.10.4.tar.bz2 f240ccd20f60cc7c90c5c00507e80235 671913 snapper-0.10.4.tar.bz2

View File

@ -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 # 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz
# #
Files: Files:
dfdaf63f4d8ec6f1dc25aaac99cbf667 672300 snapper-0.10.4.tar.bz2 f240ccd20f60cc7c90c5c00507e80235 671913 snapper-0.10.4.tar.bz2

View File

@ -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 # 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz
# #
Files: Files:
dfdaf63f4d8ec6f1dc25aaac99cbf667 672300 snapper-0.10.4.tar.bz2 f240ccd20f60cc7c90c5c00507e80235 671913 snapper-0.10.4.tar.bz2

View File

@ -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 # 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz
# #
Files: Files:
dfdaf63f4d8ec6f1dc25aaac99cbf667 672300 snapper-0.10.4.tar.bz2 f240ccd20f60cc7c90c5c00507e80235 671913 snapper-0.10.4.tar.bz2

View File

@ -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 # 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz
# #
Files: Files:
dfdaf63f4d8ec6f1dc25aaac99cbf667 672300 snapper-0.10.4.tar.bz2 f240ccd20f60cc7c90c5c00507e80235 671913 snapper-0.10.4.tar.bz2

View File

@ -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 # 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz
# #
Files: Files:
dfdaf63f4d8ec6f1dc25aaac99cbf667 672300 snapper-0.10.4.tar.bz2 f240ccd20f60cc7c90c5c00507e80235 671913 snapper-0.10.4.tar.bz2

View File

@ -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 # 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz
# #
Files: Files:
dfdaf63f4d8ec6f1dc25aaac99cbf667 672300 snapper-0.10.4.tar.bz2 f240ccd20f60cc7c90c5c00507e80235 671913 snapper-0.10.4.tar.bz2

View File

@ -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 # 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz
# #
Files: Files:
dfdaf63f4d8ec6f1dc25aaac99cbf667 672300 snapper-0.10.4.tar.bz2 f240ccd20f60cc7c90c5c00507e80235 671913 snapper-0.10.4.tar.bz2

View File

@ -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 # 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz
# #
Files: Files:
dfdaf63f4d8ec6f1dc25aaac99cbf667 672300 snapper-0.10.4.tar.bz2 f240ccd20f60cc7c90c5c00507e80235 671913 snapper-0.10.4.tar.bz2

View File

@ -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 Thu Feb 23 11:14:58 CET 2023 - aschnell@suse.com

View File

@ -1,7 +1,7 @@
# #
# spec file for package snapper # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -28,6 +28,9 @@
%define pam_security_dir /%{_lib}/security %define pam_security_dir /%{_lib}/security
%endif %endif
# Optionally build without SELinux support
%bcond_without selinux
# Optionally build with test coverage reporting # Optionally build with test coverage reporting
%bcond_with coverage %bcond_with coverage
@ -41,16 +44,16 @@ URL: http://snapper.io/
Source: snapper-%{version}.tar.bz2 Source: snapper-%{version}.tar.bz2
%if 0%{?suse_version} %if 0%{?suse_version}
BuildRequires: libboost_system-devel BuildRequires: libboost_system-devel
BuildRequires: libboost_thread-devel
BuildRequires: libboost_test-devel BuildRequires: libboost_test-devel
BuildRequires: libboost_thread-devel
%else %else
BuildRequires: boost-devel BuildRequires: boost-devel
%endif %endif
BuildRequires: e2fsprogs-devel
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: libacl-devel BuildRequires: libacl-devel
BuildRequires: libtool BuildRequires: libtool
BuildRequires: libxml2-devel BuildRequires: libxml2-devel
BuildRequires: e2fsprogs-devel
BuildRequires: ncurses-devel BuildRequires: ncurses-devel
%if 0%{?suse_version} %if 0%{?suse_version}
BuildRequires: libbtrfs-devel BuildRequires: libbtrfs-devel
@ -68,9 +71,9 @@ BuildRequires: systemd
BuildRequires: pkg-config BuildRequires: pkg-config
%endif %endif
%if 0%{?fedora_version} || 0%{?centos_version} %if 0%{?fedora_version} || 0%{?centos_version}
BuildRequires: glibc-langpack-de BuildRequires: glibc-langpack-de
BuildRequires: glibc-langpack-fr BuildRequires: glibc-langpack-en
BuildRequires: glibc-langpack-en BuildRequires: glibc-langpack-fr
%else %else
BuildRequires: glibc-locale BuildRequires: glibc-locale
%endif %endif
@ -95,10 +98,12 @@ BuildRequires: libzypp(plugin:commit)
BuildRequires: pam-devel BuildRequires: pam-devel
%if 0%{?fedora_version} || 0%{?rhel_version} || 0%{?centos_version} || 0%{?scientificlinux_version} %if 0%{?fedora_version} || 0%{?rhel_version} || 0%{?centos_version} || 0%{?scientificlinux_version}
BuildRequires: json-c-devel BuildRequires: json-c-devel
BuildRequires: libselinux-devel
%else %else
BuildRequires: libjson-c-devel BuildRequires: libjson-c-devel
%endif %endif
%if %{with selinux}
BuildRequires: libselinux-devel
%endif
BuildRequires: zlib-devel BuildRequires: zlib-devel
%if %{with coverage} %if %{with coverage}
BuildRequires: lcov BuildRequires: lcov
@ -107,7 +112,8 @@ Requires: diffutils
Requires: libsnapper6 = %version Requires: libsnapper6 = %version
Requires: systemd Requires: systemd
%if 0%{?suse_version} %if 0%{?suse_version}
Recommends: logrotate snapper-zypp-plugin Recommends: logrotate
Recommends: snapper-zypp-plugin
Supplements: btrfsprogs Supplements: btrfsprogs
%endif %endif
@ -131,17 +137,13 @@ export CXXFLAGS="%{optflags} -DNDEBUG"
autoreconf -fvi autoreconf -fvi
%configure \ %configure \
--docdir="%{_defaultdocdir}/snapper" \ --docdir="%{_defaultdocdir}/snapper" \
%if %{with coverage} %{?with_coverage:--enable-coverage} \
--enable-coverage \
%endif
--with-pam-security="%{pam_security_dir}" \ --with-pam-security="%{pam_security_dir}" \
%if ! 0%{?suse_version} %if ! 0%{?suse_version}
--disable-rollback \ --disable-rollback \
--disable-btrfs-quota \ --disable-btrfs-quota \
%endif %endif
%if 0%{?fedora_version} || 0%{?rhel_version} %{?with_selinux:--enable-selinux} \
--enable-selinux \
%endif
--disable-silent-rules --disable-ext4 --disable-silent-rules --disable-ext4
make %{?_smp_mflags} make %{?_smp_mflags}
@ -295,7 +297,7 @@ Requires: libboost_headers-devel
Requires: boost-devel Requires: boost-devel
%endif %endif
Requires: gcc-c++ Requires: gcc-c++
Requires: libacl-devel Requires: libacl-devel
Requires: libsnapper6 = %version Requires: libsnapper6 = %version
Requires: libstdc++-devel Requires: libstdc++-devel
Requires: libxml2-devel Requires: libxml2-devel
@ -317,8 +319,8 @@ libsnapper.
%{_includedir}/snapper %{_includedir}/snapper
%package -n snapper-zypp-plugin %package -n snapper-zypp-plugin
Requires: libzypp(plugin:commit) = 1
Requires: snapper = %version Requires: snapper = %version
Requires: libzypp(plugin:commit) = 1
Summary: A zypp commit plugin for calling snapper Summary: A zypp commit plugin for calling snapper
Group: System/Packages Group: System/Packages