From c9fd6f547f3b2bde5403c2cd66451f8d8cf8fb47487bdd8c201be5bde8770e09 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 18 Jan 2017 20:31:08 +0000 Subject: [PATCH] Accepting request 450473 from filesystems:snapper submit new version 0.4.1 OBS-URL: https://build.opensuse.org/request/show/450473 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/snapper?expand=0&rev=90 --- debian.tar.gz | 3 +++ snapper-0.3.3.tar.bz2 | 3 --- snapper-0.4.1.tar.bz2 | 3 +++ snapper-Debian_7.0.dsc | 14 ++++++++++++++ snapper-Debian_8.0.dsc | 14 ++++++++++++++ snapper-xUbuntu_14.04.dsc | 14 ++++++++++++++ snapper-xUbuntu_14.10.dsc | 14 ++++++++++++++ snapper-xUbuntu_15.04.dsc | 14 ++++++++++++++ snapper-xUbuntu_15.10.dsc | 14 ++++++++++++++ snapper-xUbuntu_16.04.dsc | 14 ++++++++++++++ snapper-xUbuntu_16.10.dsc | 14 ++++++++++++++ snapper.changes | 23 ++++++++++++++++++++++ snapper.spec | 40 +++++++++++++++++++++++++++++---------- 13 files changed, 171 insertions(+), 13 deletions(-) create mode 100644 debian.tar.gz delete mode 100644 snapper-0.3.3.tar.bz2 create mode 100644 snapper-0.4.1.tar.bz2 create mode 100644 snapper-Debian_7.0.dsc create mode 100644 snapper-Debian_8.0.dsc create mode 100644 snapper-xUbuntu_14.04.dsc create mode 100644 snapper-xUbuntu_14.10.dsc create mode 100644 snapper-xUbuntu_15.04.dsc create mode 100644 snapper-xUbuntu_15.10.dsc create mode 100644 snapper-xUbuntu_16.04.dsc create mode 100644 snapper-xUbuntu_16.10.dsc diff --git a/debian.tar.gz b/debian.tar.gz new file mode 100644 index 0000000..44a7fae --- /dev/null +++ b/debian.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7bbbe19dc6d188193d4a808e06f6792afcd396fa3d50c417976ff99bb9829ed5 +size 2339 diff --git a/snapper-0.3.3.tar.bz2 b/snapper-0.3.3.tar.bz2 deleted file mode 100644 index 939dd8a..0000000 --- a/snapper-0.3.3.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9044c6bd7e80a539a8ab19ff5f54aa65255675b54e90cbd17b43c9fc11017264 -size 545913 diff --git a/snapper-0.4.1.tar.bz2 b/snapper-0.4.1.tar.bz2 new file mode 100644 index 0000000..703f158 --- /dev/null +++ b/snapper-0.4.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a3f88194bc2b912a4a3bb1bb7b1426be2066ddaa44400a655a40ab27e9e58e9e +size 570781 diff --git a/snapper-Debian_7.0.dsc b/snapper-Debian_7.0.dsc new file mode 100644 index 0000000..bb7518f --- /dev/null +++ b/snapper-Debian_7.0.dsc @@ -0,0 +1,14 @@ +Format: 1.0 +Source: snapper +Version: 0.4.1 +Binary: snapper +Maintainer: Arvin Schnell +Architecture: any +Build-Depends: debhelper (>= 4.1.16), acl-dev, g++, libboost-dev, libboost-thread-dev, libboost-system-dev, libboost-test-dev, libxml2-dev, libz-dev, libdbus-1-dev, libpam-dev, xsltproc, docbook-xsl, locales-all +# +# The 'Files' line is generated during 'make package': +# Files: +# 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz +# +Files: +b800a3b44e45729b21fc4491b84f72df 570781 snapper-0.4.1.tar.bz2 diff --git a/snapper-Debian_8.0.dsc b/snapper-Debian_8.0.dsc new file mode 100644 index 0000000..bb7518f --- /dev/null +++ b/snapper-Debian_8.0.dsc @@ -0,0 +1,14 @@ +Format: 1.0 +Source: snapper +Version: 0.4.1 +Binary: snapper +Maintainer: Arvin Schnell +Architecture: any +Build-Depends: debhelper (>= 4.1.16), acl-dev, g++, libboost-dev, libboost-thread-dev, libboost-system-dev, libboost-test-dev, libxml2-dev, libz-dev, libdbus-1-dev, libpam-dev, xsltproc, docbook-xsl, locales-all +# +# The 'Files' line is generated during 'make package': +# Files: +# 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz +# +Files: +b800a3b44e45729b21fc4491b84f72df 570781 snapper-0.4.1.tar.bz2 diff --git a/snapper-xUbuntu_14.04.dsc b/snapper-xUbuntu_14.04.dsc new file mode 100644 index 0000000..fd74db7 --- /dev/null +++ b/snapper-xUbuntu_14.04.dsc @@ -0,0 +1,14 @@ +Format: 1.0 +Source: snapper +Version: 0.4.1 +Binary: snapper +Maintainer: Arvin Schnell +Architecture: any +Build-Depends: debhelper (>= 4.1.16), acl-dev, g++, libboost-dev, libboost-thread-dev, libboost-system-dev, libboost-test-dev, libxml2-dev, libz-dev, libdbus-1-dev, libpam-dev, xsltproc, docbook-xsl, language-pack-en, language-pack-de +# +# The 'Files' line is generated during 'make package': +# Files: +# 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz +# +Files: +b800a3b44e45729b21fc4491b84f72df 570781 snapper-0.4.1.tar.bz2 diff --git a/snapper-xUbuntu_14.10.dsc b/snapper-xUbuntu_14.10.dsc new file mode 100644 index 0000000..fd74db7 --- /dev/null +++ b/snapper-xUbuntu_14.10.dsc @@ -0,0 +1,14 @@ +Format: 1.0 +Source: snapper +Version: 0.4.1 +Binary: snapper +Maintainer: Arvin Schnell +Architecture: any +Build-Depends: debhelper (>= 4.1.16), acl-dev, g++, libboost-dev, libboost-thread-dev, libboost-system-dev, libboost-test-dev, libxml2-dev, libz-dev, libdbus-1-dev, libpam-dev, xsltproc, docbook-xsl, language-pack-en, language-pack-de +# +# The 'Files' line is generated during 'make package': +# Files: +# 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz +# +Files: +b800a3b44e45729b21fc4491b84f72df 570781 snapper-0.4.1.tar.bz2 diff --git a/snapper-xUbuntu_15.04.dsc b/snapper-xUbuntu_15.04.dsc new file mode 100644 index 0000000..fd74db7 --- /dev/null +++ b/snapper-xUbuntu_15.04.dsc @@ -0,0 +1,14 @@ +Format: 1.0 +Source: snapper +Version: 0.4.1 +Binary: snapper +Maintainer: Arvin Schnell +Architecture: any +Build-Depends: debhelper (>= 4.1.16), acl-dev, g++, libboost-dev, libboost-thread-dev, libboost-system-dev, libboost-test-dev, libxml2-dev, libz-dev, libdbus-1-dev, libpam-dev, xsltproc, docbook-xsl, language-pack-en, language-pack-de +# +# The 'Files' line is generated during 'make package': +# Files: +# 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz +# +Files: +b800a3b44e45729b21fc4491b84f72df 570781 snapper-0.4.1.tar.bz2 diff --git a/snapper-xUbuntu_15.10.dsc b/snapper-xUbuntu_15.10.dsc new file mode 100644 index 0000000..fd74db7 --- /dev/null +++ b/snapper-xUbuntu_15.10.dsc @@ -0,0 +1,14 @@ +Format: 1.0 +Source: snapper +Version: 0.4.1 +Binary: snapper +Maintainer: Arvin Schnell +Architecture: any +Build-Depends: debhelper (>= 4.1.16), acl-dev, g++, libboost-dev, libboost-thread-dev, libboost-system-dev, libboost-test-dev, libxml2-dev, libz-dev, libdbus-1-dev, libpam-dev, xsltproc, docbook-xsl, language-pack-en, language-pack-de +# +# The 'Files' line is generated during 'make package': +# Files: +# 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz +# +Files: +b800a3b44e45729b21fc4491b84f72df 570781 snapper-0.4.1.tar.bz2 diff --git a/snapper-xUbuntu_16.04.dsc b/snapper-xUbuntu_16.04.dsc new file mode 100644 index 0000000..fd74db7 --- /dev/null +++ b/snapper-xUbuntu_16.04.dsc @@ -0,0 +1,14 @@ +Format: 1.0 +Source: snapper +Version: 0.4.1 +Binary: snapper +Maintainer: Arvin Schnell +Architecture: any +Build-Depends: debhelper (>= 4.1.16), acl-dev, g++, libboost-dev, libboost-thread-dev, libboost-system-dev, libboost-test-dev, libxml2-dev, libz-dev, libdbus-1-dev, libpam-dev, xsltproc, docbook-xsl, language-pack-en, language-pack-de +# +# The 'Files' line is generated during 'make package': +# Files: +# 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz +# +Files: +b800a3b44e45729b21fc4491b84f72df 570781 snapper-0.4.1.tar.bz2 diff --git a/snapper-xUbuntu_16.10.dsc b/snapper-xUbuntu_16.10.dsc new file mode 100644 index 0000000..fd74db7 --- /dev/null +++ b/snapper-xUbuntu_16.10.dsc @@ -0,0 +1,14 @@ +Format: 1.0 +Source: snapper +Version: 0.4.1 +Binary: snapper +Maintainer: Arvin Schnell +Architecture: any +Build-Depends: debhelper (>= 4.1.16), acl-dev, g++, libboost-dev, libboost-thread-dev, libboost-system-dev, libboost-test-dev, libxml2-dev, libz-dev, libdbus-1-dev, libpam-dev, xsltproc, docbook-xsl, language-pack-en, language-pack-de +# +# The 'Files' line is generated during 'make package': +# Files: +# 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz +# +Files: +b800a3b44e45729b21fc4491b84f72df 570781 snapper-0.4.1.tar.bz2 diff --git a/snapper.changes b/snapper.changes index ee50b0c..8727e06 100644 --- a/snapper.changes +++ b/snapper.changes @@ -1,3 +1,26 @@ +------------------------------------------------------------------- +Wed Dec 21 10:29:57 CET 2016 - aschnell@suse.com + +- fixed --root option (bsc#1016633) +- version 0.4.1 + +------------------------------------------------------------------- +Thu Dec 15 21:36:23 CET 2016 - aschnell@suse.com + +- support option --no-dbus for all snapper commands (fate#319404, + fate#321049) +- version 0.4.0 + +------------------------------------------------------------------- +Fri Nov 04 16:28:49 CET 2016 - aschnell@suse.com + +- catch exception if setting default subvolume fails (bsc#1008544) + +------------------------------------------------------------------- +Wed Nov 02 22:17:16 CET 2016 - aschnell@suse.com + +- fixed use of getpwuid_r, getpwnam_r and getgrnam_r + ------------------------------------------------------------------- Tue Aug 09 21:53:02 CEST 2016 - aschnell@suse.com diff --git a/snapper.spec b/snapper.spec index 9af562e..b4ffdea 100644 --- a/snapper.spec +++ b/snapper.spec @@ -1,7 +1,7 @@ # # spec file for package snapper # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: snapper -Version: 0.3.3 +Version: 0.4.1 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: snapper-%{version}.tar.bz2 @@ -34,10 +34,23 @@ BuildRequires: libbtrfs-devel %if 0%{?suse_version} > 1310 BuildRequires: libmount-devel >= 2.24 %endif +%if 0%{?fedora_version} >= 23 +BuildRequires: pkgconfig +%else BuildRequires: pkg-config +%endif +%if 0%{?fedora_version} >= 24 +BuildRequires: glibc-langpack-de +BuildRequires: glibc-langpack-en +%endif %if ! 0%{?mandriva_version} +%if 0%{?fedora_version} >= 23 +BuildRequires: dbus-devel +BuildRequires: docbook-style-xsl +%else BuildRequires: dbus-1-devel BuildRequires: docbook-xsl-stylesheets +%endif BuildRequires: libxslt %else BuildRequires: docbook-dtd45-xml @@ -50,7 +63,7 @@ BuildRequires: libzypp(plugin:commit) %endif BuildRequires: pam-devel Requires: diffutils -Requires: libsnapper3 = %version +Requires: libsnapper4 = %version %if 0%{?suse_version} Recommends: cron logrotate snapper-zypp-plugin Supplements: btrfsprogs @@ -84,6 +97,9 @@ autoconf --docdir=%{prefix}/share/doc/packages/snapper \ %if 0%{?suse_version} <= 1310 --disable-rollback \ +%endif +%if 0%{?suse_version} <= 1320 + --disable-btrfs-quota \ %endif --disable-silent-rules --disable-ext4 make %{?jobs:-j%jobs} @@ -110,12 +126,16 @@ rm -rf "$RPM_BUILD_ROOT" %defattr(-,root,root) %{prefix}/bin/snapper %{prefix}/sbin/snapperd +%if 0%{?suse_version} > 1310 %{prefix}/sbin/mksubvolume +%endif %{prefix}/lib/snapper %doc %{_mandir}/*/snapper.8* %doc %{_mandir}/*/snapperd.8* %doc %{_mandir}/*/snapper-configs.5* +%if 0%{?suse_version} > 1310 %doc %{_mandir}/*/mksubvolume.8* +%endif %config(noreplace) %{_sysconfdir}/logrotate.d/snapper /etc/cron.hourly/suse.de-snapper /etc/cron.daily/suse.de-snapper @@ -123,7 +143,7 @@ rm -rf "$RPM_BUILD_ROOT" %config /etc/dbus-1/system.d/org.opensuse.Snapper.conf %{prefix}/share/dbus-1/system-services/org.opensuse.Snapper.service -%package -n libsnapper3 +%package -n libsnapper4 Summary: Library for filesystem snapshot management Group: System/Libraries Requires: util-linux @@ -131,16 +151,16 @@ Requires: util-linux PreReq: %fillup_prereq %endif # expands to Obsoletes: libsnapper1 libsnapper2 libsnapper3... -Obsoletes: %(echo `seq -s " " -f "libsnapper%.f" $((3 - 1))`) +Obsoletes: %(echo `seq -s " " -f "libsnapper%.f" $((4 - 1))`) -%description -n libsnapper3 +%description -n libsnapper4 This package contains libsnapper, a library for filesystem snapshot management. Authors: -------- Arvin Schnell -%files -n libsnapper3 +%files -n libsnapper4 %defattr(-,root,root) %{_libdir}/libsnapper.so.* %dir %{_sysconfdir}/snapper @@ -158,20 +178,20 @@ Authors: %config(noreplace) %{_sysconfdir}/sysconfig/snapper %endif -%post -n libsnapper3 +%post -n libsnapper4 /sbin/ldconfig %if 0%{?suse_version} %{fillup_only -n snapper} %endif -%postun -n libsnapper3 +%postun -n libsnapper4 /sbin/ldconfig %package -n libsnapper-devel Requires: boost-devel Requires: gcc-c++ Requires: libacl-devel -Requires: libsnapper3 = %version +Requires: libsnapper4 = %version Requires: libstdc++-devel Requires: libxml2-devel %if 0%{?suse_version} > 1230