From 108b6014ca8c62f5891e47fa3238f2aa0848ee6e76de8a1c8e01a35e736b2019 Mon Sep 17 00:00:00 2001 From: YaST Team Bot Date: Tue, 17 Dec 2019 15:00:13 +0000 Subject: [PATCH] - snapper-zypp-plugin subpackage rewritten from Python to C++ (jsc#SLE-10500) - added integration tests in snapper-testsuite subpackage - version 0.8.7 OBS-URL: https://build.opensuse.org/package/show/filesystems:snapper/snapper?expand=0&rev=276 --- debian.tar.gz | 4 ++-- snapper-0.8.6.tar.bz2 | 3 --- snapper-0.8.7.tar.bz2 | 3 +++ snapper-Debian_10.0.dsc | 4 ++-- snapper-Debian_7.0.dsc | 4 ++-- snapper-Debian_8.0.dsc | 4 ++-- snapper-Debian_9.0.dsc | 4 ++-- snapper-xUbuntu_14.04.dsc | 4 ++-- snapper-xUbuntu_14.10.dsc | 4 ++-- snapper-xUbuntu_15.04.dsc | 4 ++-- snapper-xUbuntu_15.10.dsc | 4 ++-- snapper-xUbuntu_16.04.dsc | 4 ++-- snapper-xUbuntu_16.10.dsc | 4 ++-- snapper-xUbuntu_17.04.dsc | 4 ++-- snapper-xUbuntu_17.10.dsc | 4 ++-- snapper-xUbuntu_18.04.dsc | 4 ++-- snapper-xUbuntu_18.10.dsc | 4 ++-- snapper-xUbuntu_19.04.dsc | 4 ++-- snapper.changes | 8 ++++++++ snapper.spec | 28 +++++++++++++++------------- 20 files changed, 58 insertions(+), 48 deletions(-) delete mode 100644 snapper-0.8.6.tar.bz2 create mode 100644 snapper-0.8.7.tar.bz2 diff --git a/debian.tar.gz b/debian.tar.gz index 2e23077..dbc7a26 100644 --- a/debian.tar.gz +++ b/debian.tar.gz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ba246adb802f997bacbf2171198448881e6be12c58d5d1c6175c3b6d2c970ffb -size 2862 +oid sha256:9699570be62a8e8baa38f35e359562d2c2f95a3e1bb45956da0f965e38ea3c61 +size 2925 diff --git a/snapper-0.8.6.tar.bz2 b/snapper-0.8.6.tar.bz2 deleted file mode 100644 index 1b8be27..0000000 --- a/snapper-0.8.6.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e7527e6a4be82fbaf113e5c317c297c43511872cc40402653361606691326feb -size 607094 diff --git a/snapper-0.8.7.tar.bz2 b/snapper-0.8.7.tar.bz2 new file mode 100644 index 0000000..f9f2a10 --- /dev/null +++ b/snapper-0.8.7.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0007ebc16cd775e94ec9d080163623d3185ba9da9078d01d54779b3cfba59156 +size 622425 diff --git a/snapper-Debian_10.0.dsc b/snapper-Debian_10.0.dsc index 2a5abbf..9c42b85 100644 --- a/snapper-Debian_10.0.dsc +++ b/snapper-Debian_10.0.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: snapper -Version: 0.8.6 +Version: 0.8.7 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: -7d64389c9459cd68a21829e40e660c95 607094 snapper-0.8.6.tar.bz2 +0118144c95a6b23a85741bf35d11bb9b 622425 snapper-0.8.7.tar.bz2 diff --git a/snapper-Debian_7.0.dsc b/snapper-Debian_7.0.dsc index 2a5abbf..9c42b85 100644 --- a/snapper-Debian_7.0.dsc +++ b/snapper-Debian_7.0.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: snapper -Version: 0.8.6 +Version: 0.8.7 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: -7d64389c9459cd68a21829e40e660c95 607094 snapper-0.8.6.tar.bz2 +0118144c95a6b23a85741bf35d11bb9b 622425 snapper-0.8.7.tar.bz2 diff --git a/snapper-Debian_8.0.dsc b/snapper-Debian_8.0.dsc index 2a5abbf..9c42b85 100644 --- a/snapper-Debian_8.0.dsc +++ b/snapper-Debian_8.0.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: snapper -Version: 0.8.6 +Version: 0.8.7 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: -7d64389c9459cd68a21829e40e660c95 607094 snapper-0.8.6.tar.bz2 +0118144c95a6b23a85741bf35d11bb9b 622425 snapper-0.8.7.tar.bz2 diff --git a/snapper-Debian_9.0.dsc b/snapper-Debian_9.0.dsc index 2a5abbf..9c42b85 100644 --- a/snapper-Debian_9.0.dsc +++ b/snapper-Debian_9.0.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: snapper -Version: 0.8.6 +Version: 0.8.7 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: -7d64389c9459cd68a21829e40e660c95 607094 snapper-0.8.6.tar.bz2 +0118144c95a6b23a85741bf35d11bb9b 622425 snapper-0.8.7.tar.bz2 diff --git a/snapper-xUbuntu_14.04.dsc b/snapper-xUbuntu_14.04.dsc index c6bbe18..982a183 100644 --- a/snapper-xUbuntu_14.04.dsc +++ b/snapper-xUbuntu_14.04.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: snapper -Version: 0.8.6 +Version: 0.8.7 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: -7d64389c9459cd68a21829e40e660c95 607094 snapper-0.8.6.tar.bz2 +0118144c95a6b23a85741bf35d11bb9b 622425 snapper-0.8.7.tar.bz2 diff --git a/snapper-xUbuntu_14.10.dsc b/snapper-xUbuntu_14.10.dsc index c6bbe18..982a183 100644 --- a/snapper-xUbuntu_14.10.dsc +++ b/snapper-xUbuntu_14.10.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: snapper -Version: 0.8.6 +Version: 0.8.7 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: -7d64389c9459cd68a21829e40e660c95 607094 snapper-0.8.6.tar.bz2 +0118144c95a6b23a85741bf35d11bb9b 622425 snapper-0.8.7.tar.bz2 diff --git a/snapper-xUbuntu_15.04.dsc b/snapper-xUbuntu_15.04.dsc index c6bbe18..982a183 100644 --- a/snapper-xUbuntu_15.04.dsc +++ b/snapper-xUbuntu_15.04.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: snapper -Version: 0.8.6 +Version: 0.8.7 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: -7d64389c9459cd68a21829e40e660c95 607094 snapper-0.8.6.tar.bz2 +0118144c95a6b23a85741bf35d11bb9b 622425 snapper-0.8.7.tar.bz2 diff --git a/snapper-xUbuntu_15.10.dsc b/snapper-xUbuntu_15.10.dsc index c6bbe18..982a183 100644 --- a/snapper-xUbuntu_15.10.dsc +++ b/snapper-xUbuntu_15.10.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: snapper -Version: 0.8.6 +Version: 0.8.7 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: -7d64389c9459cd68a21829e40e660c95 607094 snapper-0.8.6.tar.bz2 +0118144c95a6b23a85741bf35d11bb9b 622425 snapper-0.8.7.tar.bz2 diff --git a/snapper-xUbuntu_16.04.dsc b/snapper-xUbuntu_16.04.dsc index c6bbe18..982a183 100644 --- a/snapper-xUbuntu_16.04.dsc +++ b/snapper-xUbuntu_16.04.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: snapper -Version: 0.8.6 +Version: 0.8.7 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: -7d64389c9459cd68a21829e40e660c95 607094 snapper-0.8.6.tar.bz2 +0118144c95a6b23a85741bf35d11bb9b 622425 snapper-0.8.7.tar.bz2 diff --git a/snapper-xUbuntu_16.10.dsc b/snapper-xUbuntu_16.10.dsc index c6bbe18..982a183 100644 --- a/snapper-xUbuntu_16.10.dsc +++ b/snapper-xUbuntu_16.10.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: snapper -Version: 0.8.6 +Version: 0.8.7 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: -7d64389c9459cd68a21829e40e660c95 607094 snapper-0.8.6.tar.bz2 +0118144c95a6b23a85741bf35d11bb9b 622425 snapper-0.8.7.tar.bz2 diff --git a/snapper-xUbuntu_17.04.dsc b/snapper-xUbuntu_17.04.dsc index c6bbe18..982a183 100644 --- a/snapper-xUbuntu_17.04.dsc +++ b/snapper-xUbuntu_17.04.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: snapper -Version: 0.8.6 +Version: 0.8.7 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: -7d64389c9459cd68a21829e40e660c95 607094 snapper-0.8.6.tar.bz2 +0118144c95a6b23a85741bf35d11bb9b 622425 snapper-0.8.7.tar.bz2 diff --git a/snapper-xUbuntu_17.10.dsc b/snapper-xUbuntu_17.10.dsc index c6bbe18..982a183 100644 --- a/snapper-xUbuntu_17.10.dsc +++ b/snapper-xUbuntu_17.10.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: snapper -Version: 0.8.6 +Version: 0.8.7 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: -7d64389c9459cd68a21829e40e660c95 607094 snapper-0.8.6.tar.bz2 +0118144c95a6b23a85741bf35d11bb9b 622425 snapper-0.8.7.tar.bz2 diff --git a/snapper-xUbuntu_18.04.dsc b/snapper-xUbuntu_18.04.dsc index c6bbe18..982a183 100644 --- a/snapper-xUbuntu_18.04.dsc +++ b/snapper-xUbuntu_18.04.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: snapper -Version: 0.8.6 +Version: 0.8.7 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: -7d64389c9459cd68a21829e40e660c95 607094 snapper-0.8.6.tar.bz2 +0118144c95a6b23a85741bf35d11bb9b 622425 snapper-0.8.7.tar.bz2 diff --git a/snapper-xUbuntu_18.10.dsc b/snapper-xUbuntu_18.10.dsc index c6bbe18..982a183 100644 --- a/snapper-xUbuntu_18.10.dsc +++ b/snapper-xUbuntu_18.10.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: snapper -Version: 0.8.6 +Version: 0.8.7 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: -7d64389c9459cd68a21829e40e660c95 607094 snapper-0.8.6.tar.bz2 +0118144c95a6b23a85741bf35d11bb9b 622425 snapper-0.8.7.tar.bz2 diff --git a/snapper-xUbuntu_19.04.dsc b/snapper-xUbuntu_19.04.dsc index c6bbe18..982a183 100644 --- a/snapper-xUbuntu_19.04.dsc +++ b/snapper-xUbuntu_19.04.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: snapper -Version: 0.8.6 +Version: 0.8.7 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: -7d64389c9459cd68a21829e40e660c95 607094 snapper-0.8.6.tar.bz2 +0118144c95a6b23a85741bf35d11bb9b 622425 snapper-0.8.7.tar.bz2 diff --git a/snapper.changes b/snapper.changes index 6a4ee87..f3cba1b 100644 --- a/snapper.changes +++ b/snapper.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Fri Dec 6 10:12:42 UTC 2019 - Martin Vidner + +- snapper-zypp-plugin subpackage rewritten from Python to C++ + (jsc#SLE-10500) +- added integration tests in snapper-testsuite subpackage +- version 0.8.7 + ------------------------------------------------------------------- Wed Oct 23 13:00:36 UTC 2019 - José Iván López González diff --git a/snapper.spec b/snapper.spec index 8dbec62..c88672c 100644 --- a/snapper.spec +++ b/snapper.spec @@ -22,7 +22,7 @@ %endif Name: snapper -Version: 0.8.6 +Version: 0.8.7 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: snapper-%{version}.tar.bz2 @@ -72,8 +72,13 @@ BuildRequires: xsltproc BuildRequires: libzypp(plugin:commit) %endif BuildRequires: pam-devel +%if 0%{?fedora_version} +BuildRequires: json-c-devel +%else +BuildRequires: libjson-c-devel +%endif Requires: diffutils -Requires: libsnapper4 = %version +Requires: libsnapper5 = %version %if 0%{?suse_version} Recommends: logrotate snapper-zypp-plugin Supplements: btrfsprogs @@ -171,7 +176,7 @@ fi %config /etc/dbus-1/system.d/org.opensuse.Snapper.conf %{_datadir}/dbus-1/system-services/org.opensuse.Snapper.service -%package -n libsnapper4 +%package -n libsnapper5 Summary: Library for filesystem snapshot management Group: System/Libraries Requires: util-linux @@ -179,12 +184,12 @@ Requires: util-linux PreReq: %fillup_prereq %endif # expands to Obsoletes: libsnapper1 libsnapper2 libsnapper3... -Obsoletes: %(echo `seq -s " " -f "libsnapper%.f" $((4 - 1))`) +Obsoletes: %(echo `seq -s " " -f "libsnapper%.f" $((5 - 1))`) -%description -n libsnapper4 +%description -n libsnapper5 This package contains libsnapper, a library for filesystem snapshot management. -%files -n libsnapper4 +%files -n libsnapper5 %defattr(-,root,root) %{_libdir}/libsnapper.so.* %dir %{_sysconfdir}/snapper @@ -202,13 +207,13 @@ This package contains libsnapper, a library for filesystem snapshot management. %config(noreplace) %{_sysconfdir}/sysconfig/snapper %endif -%post -n libsnapper4 +%post -n libsnapper5 /sbin/ldconfig %if 0%{?suse_version} %{fillup_only -n snapper} %endif -%postun -n libsnapper4 -p /sbin/ldconfig +%postun -n libsnapper5 -p /sbin/ldconfig %package -n libsnapper-devel %if 0%{?suse_version} > 1325 @@ -218,7 +223,7 @@ Requires: boost-devel %endif Requires: gcc-c++ Requires: libacl-devel -Requires: libsnapper4 = %version +Requires: libsnapper5 = %version Requires: libstdc++-devel Requires: libxml2-devel %if 0%{?suse_version} > 1230 @@ -240,9 +245,6 @@ libsnapper. %{_includedir}/snapper %package -n snapper-zypp-plugin -BuildArch: noarch -Requires: python3-dbus-python -Requires: python3-zypp-plugin Requires: snapper = %version Requires: libzypp(plugin:commit) = 1 Summary: A zypp commit plugin for calling snapper @@ -260,7 +262,7 @@ snapper during commits. %dir /usr/lib/zypp/plugins %dir /usr/lib/zypp/plugins/commit %endif -/usr/lib/zypp/plugins/commit/snapper.py* +/usr/lib/zypp/plugins/commit/snapper-zypp-plugin %doc %{_mandir}/*/snapper-zypp-plugin.8* %doc %{_mandir}/*/snapper-zypp-plugin.conf.5*