diff --git a/debian.tar.gz b/debian.tar.gz index a847492..3a22ba6 100644 --- a/debian.tar.gz +++ b/debian.tar.gz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:59b900800a4f3916807e0825396edea1b0df11aee72f953c5f137d95d99d5e75 -size 3056 +oid sha256:df9809a0ba4e1b1b28079bd48db9fa085bff0b86f6ed33d733cb4b366b5927e2 +size 3045 diff --git a/snapper-0.5.1.tar.bz2 b/snapper-0.5.1.tar.bz2 deleted file mode 100644 index 4406242..0000000 --- a/snapper-0.5.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e5a375440432f49ddc659eaf471ed5b3c92b12c6c02be9379bd303b47d8e700d -size 572455 diff --git a/snapper-0.5.2.tar.bz2 b/snapper-0.5.2.tar.bz2 new file mode 100644 index 0000000..b5a0eba --- /dev/null +++ b/snapper-0.5.2.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8b4ff7766e8d02a54bad2d54b02e92840c7b2ae22790ece1d15c8914676f71b6 +size 571883 diff --git a/snapper-Debian_7.0.dsc b/snapper-Debian_7.0.dsc index fdb1328..f5c3825 100644 --- a/snapper-Debian_7.0.dsc +++ b/snapper-Debian_7.0.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: snapper -Version: 0.5.1 +Version: 0.5.2 Binary: snapper Maintainer: Arvin Schnell Architecture: any @@ -11,4 +11,4 @@ Build-Depends: debhelper (>= 4.1.16), acl-dev, g++, libboost-dev, libboost-threa # 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz # Files: -609b6d3ee1d6acda52864bed2a1bd4d8 572455 snapper-0.5.1.tar.bz2 +4129fcadbc5407a448bf3f649b72dfc2 571883 snapper-0.5.2.tar.bz2 diff --git a/snapper-Debian_8.0.dsc b/snapper-Debian_8.0.dsc index fdb1328..f5c3825 100644 --- a/snapper-Debian_8.0.dsc +++ b/snapper-Debian_8.0.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: snapper -Version: 0.5.1 +Version: 0.5.2 Binary: snapper Maintainer: Arvin Schnell Architecture: any @@ -11,4 +11,4 @@ Build-Depends: debhelper (>= 4.1.16), acl-dev, g++, libboost-dev, libboost-threa # 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz # Files: -609b6d3ee1d6acda52864bed2a1bd4d8 572455 snapper-0.5.1.tar.bz2 +4129fcadbc5407a448bf3f649b72dfc2 571883 snapper-0.5.2.tar.bz2 diff --git a/snapper-xUbuntu_14.04.dsc b/snapper-xUbuntu_14.04.dsc index 5fb8644..20f3dfc 100644 --- a/snapper-xUbuntu_14.04.dsc +++ b/snapper-xUbuntu_14.04.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: snapper -Version: 0.5.1 +Version: 0.5.2 Binary: snapper Maintainer: Arvin Schnell Architecture: any @@ -11,4 +11,4 @@ Build-Depends: debhelper (>= 4.1.16), acl-dev, g++, libboost-dev, libboost-threa # 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz # Files: -609b6d3ee1d6acda52864bed2a1bd4d8 572455 snapper-0.5.1.tar.bz2 +4129fcadbc5407a448bf3f649b72dfc2 571883 snapper-0.5.2.tar.bz2 diff --git a/snapper-xUbuntu_14.10.dsc b/snapper-xUbuntu_14.10.dsc index 5fb8644..20f3dfc 100644 --- a/snapper-xUbuntu_14.10.dsc +++ b/snapper-xUbuntu_14.10.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: snapper -Version: 0.5.1 +Version: 0.5.2 Binary: snapper Maintainer: Arvin Schnell Architecture: any @@ -11,4 +11,4 @@ Build-Depends: debhelper (>= 4.1.16), acl-dev, g++, libboost-dev, libboost-threa # 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz # Files: -609b6d3ee1d6acda52864bed2a1bd4d8 572455 snapper-0.5.1.tar.bz2 +4129fcadbc5407a448bf3f649b72dfc2 571883 snapper-0.5.2.tar.bz2 diff --git a/snapper-xUbuntu_15.04.dsc b/snapper-xUbuntu_15.04.dsc index 5fb8644..20f3dfc 100644 --- a/snapper-xUbuntu_15.04.dsc +++ b/snapper-xUbuntu_15.04.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: snapper -Version: 0.5.1 +Version: 0.5.2 Binary: snapper Maintainer: Arvin Schnell Architecture: any @@ -11,4 +11,4 @@ Build-Depends: debhelper (>= 4.1.16), acl-dev, g++, libboost-dev, libboost-threa # 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz # Files: -609b6d3ee1d6acda52864bed2a1bd4d8 572455 snapper-0.5.1.tar.bz2 +4129fcadbc5407a448bf3f649b72dfc2 571883 snapper-0.5.2.tar.bz2 diff --git a/snapper-xUbuntu_15.10.dsc b/snapper-xUbuntu_15.10.dsc index 5fb8644..20f3dfc 100644 --- a/snapper-xUbuntu_15.10.dsc +++ b/snapper-xUbuntu_15.10.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: snapper -Version: 0.5.1 +Version: 0.5.2 Binary: snapper Maintainer: Arvin Schnell Architecture: any @@ -11,4 +11,4 @@ Build-Depends: debhelper (>= 4.1.16), acl-dev, g++, libboost-dev, libboost-threa # 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz # Files: -609b6d3ee1d6acda52864bed2a1bd4d8 572455 snapper-0.5.1.tar.bz2 +4129fcadbc5407a448bf3f649b72dfc2 571883 snapper-0.5.2.tar.bz2 diff --git a/snapper-xUbuntu_16.04.dsc b/snapper-xUbuntu_16.04.dsc index 5fb8644..20f3dfc 100644 --- a/snapper-xUbuntu_16.04.dsc +++ b/snapper-xUbuntu_16.04.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: snapper -Version: 0.5.1 +Version: 0.5.2 Binary: snapper Maintainer: Arvin Schnell Architecture: any @@ -11,4 +11,4 @@ Build-Depends: debhelper (>= 4.1.16), acl-dev, g++, libboost-dev, libboost-threa # 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz # Files: -609b6d3ee1d6acda52864bed2a1bd4d8 572455 snapper-0.5.1.tar.bz2 +4129fcadbc5407a448bf3f649b72dfc2 571883 snapper-0.5.2.tar.bz2 diff --git a/snapper-xUbuntu_16.10.dsc b/snapper-xUbuntu_16.10.dsc index 5fb8644..20f3dfc 100644 --- a/snapper-xUbuntu_16.10.dsc +++ b/snapper-xUbuntu_16.10.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: snapper -Version: 0.5.1 +Version: 0.5.2 Binary: snapper Maintainer: Arvin Schnell Architecture: any @@ -11,4 +11,4 @@ Build-Depends: debhelper (>= 4.1.16), acl-dev, g++, libboost-dev, libboost-threa # 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz # Files: -609b6d3ee1d6acda52864bed2a1bd4d8 572455 snapper-0.5.1.tar.bz2 +4129fcadbc5407a448bf3f649b72dfc2 571883 snapper-0.5.2.tar.bz2 diff --git a/snapper-xUbuntu_17.04.dsc b/snapper-xUbuntu_17.04.dsc index 5fb8644..20f3dfc 100644 --- a/snapper-xUbuntu_17.04.dsc +++ b/snapper-xUbuntu_17.04.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: snapper -Version: 0.5.1 +Version: 0.5.2 Binary: snapper Maintainer: Arvin Schnell Architecture: any @@ -11,4 +11,4 @@ Build-Depends: debhelper (>= 4.1.16), acl-dev, g++, libboost-dev, libboost-threa # 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz # Files: -609b6d3ee1d6acda52864bed2a1bd4d8 572455 snapper-0.5.1.tar.bz2 +4129fcadbc5407a448bf3f649b72dfc2 571883 snapper-0.5.2.tar.bz2 diff --git a/snapper.changes b/snapper.changes index bd42ece..08f66bd 100644 --- a/snapper.changes +++ b/snapper.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Sep 6 09:53:12 CEST 2017 - aschnell@suse.com + +- fix compilation with boost 1.65.0 (gh#openSUSE/snapper#354) + (bsc#1061262) +- version 0.5.2 + ------------------------------------------------------------------- Thu Aug 3 18:12:17 UTC 2017 - lslezak@suse.com diff --git a/snapper.spec b/snapper.spec index 84fa796..5e51095 100644 --- a/snapper.spec +++ b/snapper.spec @@ -17,11 +17,10 @@ Name: snapper -Version: 0.5.1 +Version: 0.5.2 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: snapper-%{version}.tar.bz2 -Prefix: /usr %if 0%{?suse_version} > 1325 BuildRequires: libboost_system-devel BuildRequires: libboost_test-devel @@ -82,25 +81,16 @@ Url: http://snapper.io/ %description This package contains snapper, a tool for filesystem snapshot management. -Authors: --------- - Arvin Schnell - %prep -%setup -n snapper-%{version} +%setup %build -export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG" -export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG" +export CFLAGS="%{optflags} -DNDEBUG" +export CXXFLAGS="%{optflags} -DNDEBUG" -aclocal -libtoolize --force --automake --copy -autoheader -automake --add-missing --copy -autoconf - -./configure --libdir=%{_libdir} --prefix=%{prefix} --mandir=%{_mandir} \ - --docdir=%{prefix}/share/doc/packages/snapper \ +autoreconf -fi +%configure \ + --docdir="%{_defaultdocdir}/snapper" \ %if 0%{?suse_version} <= 1310 --disable-rollback \ %endif @@ -108,16 +98,16 @@ autoconf --disable-btrfs-quota \ %endif --disable-silent-rules --disable-ext4 -make %{?jobs:-j%jobs} +make %{?_smp_mflags} %install -make install DESTDIR="$RPM_BUILD_ROOT" -rm $RPM_BUILD_ROOT/%{_lib}/security/pam_snapper.la +%make_install +rm -f "%{buildroot}/%{_libdir}"/*.la "%{buildroot}/%{_lib}/security/pam_snapper.la" %if 0%{?suse_version} -install -D -m 644 data/sysconfig.snapper $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.snapper +install -D -m 644 data/sysconfig.snapper "%{buildroot}/var/adm/fillup-templates/sysconfig.snapper" %else -install -D -m 644 data/sysconfig.snapper $RPM_BUILD_ROOT/etc/sysconfig/snapper +install -D -m 644 data/sysconfig.snapper "%{buildroot}/etc/sysconfig/snapper" %endif %{find_lang} snapper @@ -125,17 +115,14 @@ install -D -m 644 data/sysconfig.snapper $RPM_BUILD_ROOT/etc/sysconfig/snapper %check make check -%clean -rm -rf "$RPM_BUILD_ROOT" - %files -f snapper.lang %defattr(-,root,root) -%{prefix}/bin/snapper -%{prefix}/sbin/snapperd +%{_bindir}/snapper +%{_sbindir}/snapperd %if 0%{?suse_version} > 1310 -%{prefix}/sbin/mksubvolume +%{_sbindir}/mksubvolume %endif -%{prefix}/lib/snapper +%{_prefix}/lib/snapper %doc %{_mandir}/*/snapper.8* %doc %{_mandir}/*/snapperd.8* %doc %{_mandir}/*/snapper-configs.5* @@ -147,7 +134,7 @@ rm -rf "$RPM_BUILD_ROOT" /etc/cron.daily/suse.de-snapper /usr/lib/systemd/system/snapper-*.* %config /etc/dbus-1/system.d/org.opensuse.Snapper.conf -%{prefix}/share/dbus-1/system-services/org.opensuse.Snapper.service +%{_datadir}/dbus-1/system-services/org.opensuse.Snapper.service %package -n libsnapper4 Summary: Library for filesystem snapshot management @@ -162,10 +149,6 @@ Obsoletes: %(echo `seq -s " " -f "libsnapper%.f" $((4 - 1))`) %description -n libsnapper4 This package contains libsnapper, a library for filesystem snapshot management. -Authors: --------- - Arvin Schnell - %files -n libsnapper4 %defattr(-,root,root) %{_libdir}/libsnapper.so.* @@ -175,9 +158,9 @@ Authors: %config(noreplace) %{_sysconfdir}/snapper/config-templates/default %dir %{_sysconfdir}/snapper/filters %config(noreplace) %{_sysconfdir}/snapper/filters/*.txt -%doc %dir %{prefix}/share/doc/packages/snapper -%doc %{prefix}/share/doc/packages/snapper/AUTHORS -%doc %{prefix}/share/doc/packages/snapper/COPYING +%doc %dir %{_defaultdocdir}/snapper +%doc %{_defaultdocdir}/snapper/AUTHORS +%doc %{_defaultdocdir}/snapper/COPYING %if 0%{?suse_version} /var/adm/fillup-templates/sysconfig.snapper %else @@ -190,8 +173,7 @@ Authors: %{fillup_only -n snapper} %endif -%postun -n libsnapper4 -/sbin/ldconfig +%postun -n libsnapper4 -p /sbin/ldconfig %package -n libsnapper-devel %if 0%{?suse_version} > 1325 @@ -217,15 +199,10 @@ Group: Development/Languages/C and C++ This package contains header files and documentation for developing with libsnapper. -Authors: --------- - Arvin Schnell - %files -n libsnapper-devel %defattr(-,root,root) -%{_libdir}/libsnapper.la %{_libdir}/libsnapper.so -%{prefix}/include/snapper +%{_includedir}/snapper %package -n snapper-zypp-plugin BuildArch: noarch @@ -241,10 +218,6 @@ Group: System/Packages This package contains a plugin for zypp that makes filesystem snapshots with snapper during commits. -Authors: --------- - Arvin Schnell - %files -n snapper-zypp-plugin %defattr(-,root,root) %config(noreplace) %{_sysconfdir}/snapper/zypp-plugin.conf @@ -266,10 +239,6 @@ Group: System/Packages %description -n pam_snapper A PAM module for calling snapper during user login and logout. -Authors: --------- - Matthias G. Eckermann - %files -n pam_snapper %defattr(-,root,root) /%{_lib}/security/pam_snapper.so