Hello community, here is the log from the commit of package snapper for openSUSE:Factory checked in at 2017-03-31 15:04:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/snapper (Old) and /work/SRC/openSUSE:Factory/.snapper.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "snapper" Fri Mar 31 15:04:19 2017 rev:92 rq:482180 version:0.4.4 Changes: -------- --- /work/SRC/openSUSE:Factory/snapper/snapper.changes 2017-02-07 11:58:57.383954417 +0100 +++ /work/SRC/openSUSE:Factory/.snapper.new/snapper.changes 2017-03-31 15:04:20.704005161 +0200 @@ -1,0 +2,7 @@ +Wed Mar 22 16:47:56 CET 2017 - [email protected] + +- remove read-only mount option for new fstab entry in mksubvolume + (bsc#1030257) +- version 0.4.4 + +------------------------------------------------------------------- Old: ---- snapper-0.4.3.tar.bz2 New: ---- snapper-0.4.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ snapper.spec ++++++ --- /var/tmp/diff_new_pack.wSLR6z/_old 2017-03-31 15:04:21.851842892 +0200 +++ /var/tmp/diff_new_pack.wSLR6z/_new 2017-03-31 15:04:21.851842892 +0200 @@ -17,12 +17,18 @@ Name: snapper -Version: 0.4.3 +Version: 0.4.4 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 +BuildRequires: libboost_thread-devel +%else BuildRequires: boost-devel +%endif BuildRequires: e2fsprogs-devel BuildRequires: gcc-c++ BuildRequires: libacl-devel @@ -188,7 +194,11 @@ /sbin/ldconfig %package -n libsnapper-devel +%if 0%{?suse_version} > 1325 +Requires: libboost_headers-devel +%else Requires: boost-devel +%endif Requires: gcc-c++ Requires: libacl-devel Requires: libsnapper4 = %version ++++++ debian.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/debian/rules new/debian/rules --- old/debian/rules 2017-01-13 19:37:56.822678000 +0100 +++ new/debian/rules 2017-02-28 18:12:18.607366317 +0100 @@ -21,3 +21,5 @@ override_dh_auto_install: dh_auto_install install -D -m 644 data/sysconfig.snapper $$(pwd)/debian/tmp/etc/sysconfig/snapper + mv $$(pwd)/debian/tmp/etc/cron.hourly/suse.de-snapper $$(pwd)/debian/tmp/etc/cron.hourly/snapper + mv $$(pwd)/debian/tmp/etc/cron.daily/suse.de-snapper $$(pwd)/debian/tmp/etc/cron.daily/snapper diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/debian/snapper.install new/debian/snapper.install --- old/debian/snapper.install 2017-01-13 19:37:56.822678000 +0100 +++ new/debian/snapper.install 2017-02-28 18:12:18.607366317 +0100 @@ -1,5 +1,5 @@ -etc/cron.daily/suse.de-snapper etc/cron.daily/snapper -etc/cron.hourly/suse.de-snapper etc/cron.hourly/snapper +etc/cron.daily/snapper +etc/cron.hourly/snapper etc/dbus-1/system.d/org.opensuse.Snapper.conf etc/logrotate.d/snapper usr/bin/snapper diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/debian/snapper.preinst new/debian/snapper.preinst --- old/debian/snapper.preinst 1970-01-01 01:00:00.000000000 +0100 +++ new/debian/snapper.preinst 2017-03-09 15:07:17.379493398 +0100 @@ -0,0 +1,35 @@ +#!/bin/sh +set -e + +action=$1 +version=$2 + +# This is a cleanup script for removing the fallout of bug +# https://github.com/openSUSE/snapper/issues/328 +# +# Normally the /etc/cron.daily/snapper item should be a file, +# but due to that bug it was a directory for a while. +# +# We need to handle upgrading from the broken package specifically +# and move the cron files to the correct location. +# +# TODO: This script can be removed after some time, it is just needed +# to overcome the temporary upgrade issue. The following package upgrades +# will not need this. + +if [ "$action" = upgrade ]; then + # move /etc/cron.daily/snapper/suse.de-snapper to the correct location + if [ -e /etc/cron.daily/snapper/suse.de-snapper ]; then + mv /etc/cron.daily/snapper/suse.de-snapper /etc/cron.daily/snapper.cron + rm -rf /etc/cron.daily/snapper + mv /etc/cron.daily/snapper.cron /etc/cron.daily/snapper + fi + # move /etc/cron.hourly/snapper/suse.de-snapper to the correct location + if [ -e /etc/cron.hourly/snapper/suse.de-snapper ]; then + mv /etc/cron.hourly/snapper/suse.de-snapper /etc/cron.hourly/snapper.cron + rm -rf /etc/cron.hourly/snapper + mv /etc/cron.hourly/snapper.cron /etc/cron.hourly/snapper + fi +fi + +exit 0 ++++++ snapper-0.4.3.tar.bz2 -> snapper-0.4.4.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.4.3/VERSION new/snapper-0.4.4/VERSION --- old/snapper-0.4.3/VERSION 2017-02-03 13:42:08.000000000 +0100 +++ new/snapper-0.4.4/VERSION 2017-03-23 11:37:14.000000000 +0100 @@ -1 +1 @@ -0.4.3 +0.4.4 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.4.3/client/mksubvolume.cc new/snapper-0.4.4/client/mksubvolume.cc --- old/snapper-0.4.3/client/mksubvolume.cc 2016-01-18 11:03:24.000000000 +0100 +++ new/snapper-0.4.4/client/mksubvolume.cc 2017-03-23 11:37:14.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) [2015] SUSE LLC + * Copyright (c) [2015-2017] SUSE LLC * * All Rights Reserved. * @@ -63,7 +63,7 @@ if (!subvol_option.empty()) mnt_context_set_options(cxt, ("subvol=" + subvol_option).c_str()); else - mnt_context_set_options(cxt, "subvolid=5"); // 5 is the btrfs initial top-level subvolume + mnt_context_set_options(cxt, "subvolid=5"); // 5 is the btrfs top-level subvolume int ret = mnt_context_mount(cxt); if (ret != 0) @@ -139,6 +139,7 @@ char* options = mnt_fs_strdup_options(x); mnt_optstr_remove_option(&options, "defaults"); + mnt_optstr_remove_option(&options, "ro"); mnt_optstr_set_option(&options, "subvol", full_subvol_option.c_str()); mnt_fs_set_options(x, options); free(options); @@ -202,7 +203,7 @@ bool is_subvol_mount(const string& fs_options) { - list<string> tmp1; + vector<string> tmp1; boost::split(tmp1, fs_options, boost::is_any_of(","), boost::token_compress_on); for (const string& tmp2 : tmp1) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.4.3/config.guess new/snapper-0.4.4/config.guess --- old/snapper-0.4.3/config.guess 2017-02-06 15:58:30.000000000 +0100 +++ new/snapper-0.4.4/config.guess 2017-03-23 11:38:33.000000000 +0100 @@ -1013,7 +1013,7 @@ echo powerpcle-${VENDOR}-linux-${LIBC} exit ;; s390:Linux:*:* | s390x:Linux:*:*) - echo ${UNAME_MACHINE}-ibm-linux-${LIBC} + echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC} exit ;; sh64*:Linux:*:*) echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.4.3/config.sub new/snapper-0.4.4/config.sub --- old/snapper-0.4.3/config.sub 2017-02-06 15:58:30.000000000 +0100 +++ new/snapper-0.4.4/config.sub 2017-03-23 11:38:33.000000000 +0100 @@ -1058,12 +1058,18 @@ rtpc | rtpc-*) basic_machine=romp-ibm ;; - s390 | s390-*) + s390) basic_machine=s390-ibm ;; - s390x | s390x-*) + s390-*) + basic_machine=s390-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + s390x) basic_machine=s390x-ibm ;; + s390x-*) + basic_machine=s390x-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; sa29200) basic_machine=a29k-amd os=-udi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.4.3/doc/snapper.xml.in new/snapper-0.4.4/doc/snapper.xml.in --- old/snapper-0.4.3/doc/snapper.xml.in 2016-12-16 13:22:14.000000000 +0100 +++ new/snapper-0.4.4/doc/snapper.xml.in 2017-03-14 19:02:16.000000000 +0100 @@ -577,7 +577,7 @@ </listitem> <listitem> <para>With a number, a first read-only snapshot of the current - system in created. A second read-write snapshot is created of + system is created. A second read-write snapshot is created of <replaceable>number</replaceable>. The system is set to boot from the second snapshot.</para> </listitem> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.4.3/snapper.spec.in new/snapper-0.4.4/snapper.spec.in --- old/snapper-0.4.3/snapper.spec.in 2017-02-02 15:07:10.000000000 +0100 +++ new/snapper-0.4.4/snapper.spec.in 2017-02-28 10:57:11.000000000 +0100 @@ -22,7 +22,13 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: snapper-%{version}.tar.bz2 Prefix: /usr +%if 0%{?suse_version} > 1325 +BuildRequires: libboost_system-devel +BuildRequires: libboost_thread-devel +BuildRequires: libboost_test-devel +%else BuildRequires: boost-devel +%endif BuildRequires: gcc-c++ BuildRequires: libacl-devel BuildRequires: libtool @@ -188,7 +194,11 @@ /sbin/ldconfig %package -n libsnapper-devel +%if 0%{?suse_version} > 1325 +Requires: libboost_headers-devel +%else Requires: boost-devel +%endif Requires: gcc-c++ Requires: libacl-devel Requires: libsnapper@LIBVERSION_MAJOR@ = %version ++++++ snapper-Debian_7.0.dsc ++++++ --- /var/tmp/diff_new_pack.wSLR6z/_old 2017-03-31 15:04:22.307778436 +0200 +++ /var/tmp/diff_new_pack.wSLR6z/_new 2017-03-31 15:04:22.307778436 +0200 @@ -1,6 +1,6 @@ Format: 1.0 Source: snapper -Version: 0.4.3 +Version: 0.4.4 Binary: snapper Maintainer: Arvin Schnell <[email protected]> Architecture: any @@ -11,4 +11,4 @@ # 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz # Files: -cbb00dd1a74a65b05e41851a111173f9 571049 snapper-0.4.3.tar.bz2 +86ed13ea87432c1b66763e6f30b4b8eb 571143 snapper-0.4.4.tar.bz2 ++++++ snapper-Debian_8.0.dsc ++++++ --- /var/tmp/diff_new_pack.wSLR6z/_old 2017-03-31 15:04:22.327775610 +0200 +++ /var/tmp/diff_new_pack.wSLR6z/_new 2017-03-31 15:04:22.327775610 +0200 @@ -1,6 +1,6 @@ Format: 1.0 Source: snapper -Version: 0.4.3 +Version: 0.4.4 Binary: snapper Maintainer: Arvin Schnell <[email protected]> Architecture: any @@ -11,4 +11,4 @@ # 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz # Files: -cbb00dd1a74a65b05e41851a111173f9 571049 snapper-0.4.3.tar.bz2 +86ed13ea87432c1b66763e6f30b4b8eb 571143 snapper-0.4.4.tar.bz2 ++++++ snapper-xUbuntu_14.04.dsc ++++++ --- /var/tmp/diff_new_pack.wSLR6z/_old 2017-03-31 15:04:22.351772217 +0200 +++ /var/tmp/diff_new_pack.wSLR6z/_new 2017-03-31 15:04:22.355771651 +0200 @@ -1,6 +1,6 @@ Format: 1.0 Source: snapper -Version: 0.4.3 +Version: 0.4.4 Binary: snapper Maintainer: Arvin Schnell <[email protected]> Architecture: any @@ -11,4 +11,4 @@ # 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz # Files: -cbb00dd1a74a65b05e41851a111173f9 571049 snapper-0.4.3.tar.bz2 +86ed13ea87432c1b66763e6f30b4b8eb 571143 snapper-0.4.4.tar.bz2 ++++++ snapper-xUbuntu_14.10.dsc ++++++ --- /var/tmp/diff_new_pack.wSLR6z/_old 2017-03-31 15:04:22.375768825 +0200 +++ /var/tmp/diff_new_pack.wSLR6z/_new 2017-03-31 15:04:22.379768259 +0200 @@ -1,6 +1,6 @@ Format: 1.0 Source: snapper -Version: 0.4.3 +Version: 0.4.4 Binary: snapper Maintainer: Arvin Schnell <[email protected]> Architecture: any @@ -11,4 +11,4 @@ # 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz # Files: -cbb00dd1a74a65b05e41851a111173f9 571049 snapper-0.4.3.tar.bz2 +86ed13ea87432c1b66763e6f30b4b8eb 571143 snapper-0.4.4.tar.bz2 ++++++ snapper-xUbuntu_15.04.dsc ++++++ --- /var/tmp/diff_new_pack.wSLR6z/_old 2017-03-31 15:04:22.399765432 +0200 +++ /var/tmp/diff_new_pack.wSLR6z/_new 2017-03-31 15:04:22.399765432 +0200 @@ -1,6 +1,6 @@ Format: 1.0 Source: snapper -Version: 0.4.3 +Version: 0.4.4 Binary: snapper Maintainer: Arvin Schnell <[email protected]> Architecture: any @@ -11,4 +11,4 @@ # 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz # Files: -cbb00dd1a74a65b05e41851a111173f9 571049 snapper-0.4.3.tar.bz2 +86ed13ea87432c1b66763e6f30b4b8eb 571143 snapper-0.4.4.tar.bz2 ++++++ snapper-xUbuntu_15.10.dsc ++++++ --- /var/tmp/diff_new_pack.wSLR6z/_old 2017-03-31 15:04:22.423762040 +0200 +++ /var/tmp/diff_new_pack.wSLR6z/_new 2017-03-31 15:04:22.423762040 +0200 @@ -1,6 +1,6 @@ Format: 1.0 Source: snapper -Version: 0.4.3 +Version: 0.4.4 Binary: snapper Maintainer: Arvin Schnell <[email protected]> Architecture: any @@ -11,4 +11,4 @@ # 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz # Files: -cbb00dd1a74a65b05e41851a111173f9 571049 snapper-0.4.3.tar.bz2 +86ed13ea87432c1b66763e6f30b4b8eb 571143 snapper-0.4.4.tar.bz2 ++++++ snapper-xUbuntu_16.04.dsc ++++++ --- /var/tmp/diff_new_pack.wSLR6z/_old 2017-03-31 15:04:22.447758648 +0200 +++ /var/tmp/diff_new_pack.wSLR6z/_new 2017-03-31 15:04:22.447758648 +0200 @@ -1,6 +1,6 @@ Format: 1.0 Source: snapper -Version: 0.4.3 +Version: 0.4.4 Binary: snapper Maintainer: Arvin Schnell <[email protected]> Architecture: any @@ -11,4 +11,4 @@ # 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz # Files: -cbb00dd1a74a65b05e41851a111173f9 571049 snapper-0.4.3.tar.bz2 +86ed13ea87432c1b66763e6f30b4b8eb 571143 snapper-0.4.4.tar.bz2 ++++++ snapper-xUbuntu_16.10.dsc ++++++ --- /var/tmp/diff_new_pack.wSLR6z/_old 2017-03-31 15:04:22.467755820 +0200 +++ /var/tmp/diff_new_pack.wSLR6z/_new 2017-03-31 15:04:22.471755255 +0200 @@ -1,6 +1,6 @@ Format: 1.0 Source: snapper -Version: 0.4.3 +Version: 0.4.4 Binary: snapper Maintainer: Arvin Schnell <[email protected]> Architecture: any @@ -11,4 +11,4 @@ # 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz # Files: -cbb00dd1a74a65b05e41851a111173f9 571049 snapper-0.4.3.tar.bz2 +86ed13ea87432c1b66763e6f30b4b8eb 571143 snapper-0.4.4.tar.bz2
