diff --git a/.gitignore b/.gitignore index 0062326..535ec2d 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ /snapper-0.5.6.tar.gz /snapper-0.8.2.tar.gz /snapper-0.8.3.tar.gz +/snapper-0.8.9.tar.gz diff --git a/snapper.spec b/snapper.spec index 2b91ffd..7a90f1e 100644 --- a/snapper.spec +++ b/snapper.spec @@ -1,6 +1,6 @@ Name: snapper -Version: 0.8.3 -Release: 4%{?dist} +Version: 0.8.9 +Release: 1%{?dist} Summary: Tool for filesystem snapshot management License: GPLv2 @@ -18,15 +18,18 @@ BuildRequires: gcc-c++ BuildRequires: systemd BuildRequires: glibc-all-langpacks +BuildRequires: /usr/bin/xsltproc +BuildRequires: docbook-style-xsl +BuildRequires: btrfs-progs-devel +BuildRequires: libmount-devel +BuildRequires: libselinux-devel +BuildRequires: pkgconfig(dbus-1) +BuildRequires: pkgconfig(libxml-2.0) +BuildRequires: libacl-devel +# No explicit configure checks BuildRequires: boost-devel -BuildRequires: dbus-devel BuildRequires: e2fsprogs-devel -BuildRequires: libacl-devel -BuildRequires: libmount-devel >= 2.24 -BuildRequires: libxml2-devel -BuildRequires: btrfs-progs-devel >= 3.12 -BuildRequires: libselinux-devel -BuildRequires: libxslt docbook-style-xsl +BuildRequires: dbus-devel Requires: %{name}-libs%{?_isa} = %{version}-%{release} Requires: diffutils @@ -35,7 +38,8 @@ This package contains snapper, a tool for filesystem snapshot management. %package libs Summary: Library for filesystem snapshot management -Requires: util-linux%{?_isa} btrfs-progs%{?_isa} >= 3.12 +Requires: util-linux%{?_isa} +Requires: btrfs-progs%{?_isa} %description libs This package contains the snapper shared library @@ -47,14 +51,21 @@ Requires: %{name}-libs%{?_isa} = %{version}-%{release} Requires: libstdc++-devel%{?_isa} Requires: libacl-devel%{?_isa} Requires: boost-devel%{?_isa} -Requires: btrfs-progs-devel >= 3.12 +Requires: btrfs-progs-devel Requires: libxml2-devel%{?_isa} -Requires: libmount-devel%{?_isa} >= 2.24 +Requires: libmount-devel%{?_isa} %description devel This package contains header files and documentation for developing with snapper. +%package tests +Summary: Integration tests for snapper +Requires: %{name}-libs%{?_isa} = %{version}-%{release} + +%description tests +%{summary}. + %package -n pam_snapper Summary: PAM module for calling snapper BuildRequires: pam-devel @@ -63,6 +74,11 @@ Requires: %{name}%{?_isa} = %{version}-%{release} %description -n pam_snapper A PAM module for calling snapper during user login and logout. +%files tests +%license COPYING +%dir %{_libdir}/snapper +%{_libdir}/snapper/testsuite/ + %prep %autosetup -p1 # use libexecdir @@ -72,9 +88,11 @@ find -type f -exec sed -i -e "s|/usr/lib/snapper|%{_libexecdir}/%{name}|g" {} '; autoreconf -vfi # NOTE: --disable-ext4 option removes support for ext4 internal snapshots since the feature # never made it into upstream kernel -%configure --disable-silent-rules --disable-ext4 --disable-zypp --enable-selinux -#NOTE: avoid 'unused-direct-shlib-dependency' warning in rpmlint checks -sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool +%configure \ + --disable-ext4 \ + --disable-zypp \ + --enable-selinux \ + %{nil} %make_build %install @@ -89,8 +107,6 @@ rm -rf %{buildroot}%{_docdir}/%{name}/COPYING %check make %{?_smp_mflags} check -%ldconfig_scriptlets libs - %files -f snapper.lang %license COPYING %doc AUTHORS @@ -133,6 +149,9 @@ make %{?_smp_mflags} check %{_mandir}/man8/pam_snapper.8* %changelog +* Fri Jun 12 2020 Igor Raits - 0.8.9-1 +- Update to 0.8.9 + * Thu May 28 2020 Jonathan Wakely - 0.8.3-4 - Rebuilt for Boost 1.73 diff --git a/sources b/sources index 1925ddd..ad3d429 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (snapper-0.8.3.tar.gz) = 60d82854a323d4a872344a147efca7344a1bbcd9f9c5e607d037f335472f83070d7d4662c53b0fbcbaedea1bf008b63226beec7318a85b7b7343eff7009f34af +SHA512 (snapper-0.8.9.tar.gz) = 5a3e45839cd4b5e621425df2e1214ca5014a391d17b489fdf7d315e8ac9959741c1f6fcf7adf644276ed11488bc0f88fcfa563198bd78824867d267df204659d