- 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
This commit is contained in:
YaST Team Bot 2019-12-17 15:00:13 +00:00 committed by Git OBS Bridge
parent 611785b260
commit 108b6014ca
20 changed files with 58 additions and 48 deletions

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:ba246adb802f997bacbf2171198448881e6be12c58d5d1c6175c3b6d2c970ffb oid sha256:9699570be62a8e8baa38f35e359562d2c2f95a3e1bb45956da0f965e38ea3c61
size 2862 size 2925

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e7527e6a4be82fbaf113e5c317c297c43511872cc40402653361606691326feb
size 607094

3
snapper-0.8.7.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:0007ebc16cd775e94ec9d080163623d3185ba9da9078d01d54779b3cfba59156
size 622425

View File

@ -1,6 +1,6 @@
Format: 1.0 Format: 1.0
Source: snapper Source: snapper
Version: 0.8.6 Version: 0.8.7
Binary: snapper Binary: snapper
Maintainer: Arvin Schnell <aschnell@suse.com> Maintainer: Arvin Schnell <aschnell@suse.com>
Architecture: any 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 # 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz
# #
Files: Files:
7d64389c9459cd68a21829e40e660c95 607094 snapper-0.8.6.tar.bz2 0118144c95a6b23a85741bf35d11bb9b 622425 snapper-0.8.7.tar.bz2

View File

@ -1,6 +1,6 @@
Format: 1.0 Format: 1.0
Source: snapper Source: snapper
Version: 0.8.6 Version: 0.8.7
Binary: snapper Binary: snapper
Maintainer: Arvin Schnell <aschnell@suse.com> Maintainer: Arvin Schnell <aschnell@suse.com>
Architecture: any 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 # 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz
# #
Files: Files:
7d64389c9459cd68a21829e40e660c95 607094 snapper-0.8.6.tar.bz2 0118144c95a6b23a85741bf35d11bb9b 622425 snapper-0.8.7.tar.bz2

View File

@ -1,6 +1,6 @@
Format: 1.0 Format: 1.0
Source: snapper Source: snapper
Version: 0.8.6 Version: 0.8.7
Binary: snapper Binary: snapper
Maintainer: Arvin Schnell <aschnell@suse.com> Maintainer: Arvin Schnell <aschnell@suse.com>
Architecture: any 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 # 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz
# #
Files: Files:
7d64389c9459cd68a21829e40e660c95 607094 snapper-0.8.6.tar.bz2 0118144c95a6b23a85741bf35d11bb9b 622425 snapper-0.8.7.tar.bz2

View File

@ -1,6 +1,6 @@
Format: 1.0 Format: 1.0
Source: snapper Source: snapper
Version: 0.8.6 Version: 0.8.7
Binary: snapper Binary: snapper
Maintainer: Arvin Schnell <aschnell@suse.com> Maintainer: Arvin Schnell <aschnell@suse.com>
Architecture: any 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 # 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz
# #
Files: Files:
7d64389c9459cd68a21829e40e660c95 607094 snapper-0.8.6.tar.bz2 0118144c95a6b23a85741bf35d11bb9b 622425 snapper-0.8.7.tar.bz2

View File

@ -1,6 +1,6 @@
Format: 1.0 Format: 1.0
Source: snapper Source: snapper
Version: 0.8.6 Version: 0.8.7
Binary: snapper Binary: snapper
Maintainer: Arvin Schnell <aschnell@suse.com> Maintainer: Arvin Schnell <aschnell@suse.com>
Architecture: any 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 # 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz
# #
Files: Files:
7d64389c9459cd68a21829e40e660c95 607094 snapper-0.8.6.tar.bz2 0118144c95a6b23a85741bf35d11bb9b 622425 snapper-0.8.7.tar.bz2

View File

@ -1,6 +1,6 @@
Format: 1.0 Format: 1.0
Source: snapper Source: snapper
Version: 0.8.6 Version: 0.8.7
Binary: snapper Binary: snapper
Maintainer: Arvin Schnell <aschnell@suse.com> Maintainer: Arvin Schnell <aschnell@suse.com>
Architecture: any 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 # 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz
# #
Files: Files:
7d64389c9459cd68a21829e40e660c95 607094 snapper-0.8.6.tar.bz2 0118144c95a6b23a85741bf35d11bb9b 622425 snapper-0.8.7.tar.bz2

View File

@ -1,6 +1,6 @@
Format: 1.0 Format: 1.0
Source: snapper Source: snapper
Version: 0.8.6 Version: 0.8.7
Binary: snapper Binary: snapper
Maintainer: Arvin Schnell <aschnell@suse.com> Maintainer: Arvin Schnell <aschnell@suse.com>
Architecture: any 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 # 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz
# #
Files: Files:
7d64389c9459cd68a21829e40e660c95 607094 snapper-0.8.6.tar.bz2 0118144c95a6b23a85741bf35d11bb9b 622425 snapper-0.8.7.tar.bz2

View File

@ -1,6 +1,6 @@
Format: 1.0 Format: 1.0
Source: snapper Source: snapper
Version: 0.8.6 Version: 0.8.7
Binary: snapper Binary: snapper
Maintainer: Arvin Schnell <aschnell@suse.com> Maintainer: Arvin Schnell <aschnell@suse.com>
Architecture: any 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 # 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz
# #
Files: Files:
7d64389c9459cd68a21829e40e660c95 607094 snapper-0.8.6.tar.bz2 0118144c95a6b23a85741bf35d11bb9b 622425 snapper-0.8.7.tar.bz2

View File

@ -1,6 +1,6 @@
Format: 1.0 Format: 1.0
Source: snapper Source: snapper
Version: 0.8.6 Version: 0.8.7
Binary: snapper Binary: snapper
Maintainer: Arvin Schnell <aschnell@suse.com> Maintainer: Arvin Schnell <aschnell@suse.com>
Architecture: any 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 # 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz
# #
Files: Files:
7d64389c9459cd68a21829e40e660c95 607094 snapper-0.8.6.tar.bz2 0118144c95a6b23a85741bf35d11bb9b 622425 snapper-0.8.7.tar.bz2

View File

@ -1,6 +1,6 @@
Format: 1.0 Format: 1.0
Source: snapper Source: snapper
Version: 0.8.6 Version: 0.8.7
Binary: snapper Binary: snapper
Maintainer: Arvin Schnell <aschnell@suse.com> Maintainer: Arvin Schnell <aschnell@suse.com>
Architecture: any 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 # 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz
# #
Files: Files:
7d64389c9459cd68a21829e40e660c95 607094 snapper-0.8.6.tar.bz2 0118144c95a6b23a85741bf35d11bb9b 622425 snapper-0.8.7.tar.bz2

View File

@ -1,6 +1,6 @@
Format: 1.0 Format: 1.0
Source: snapper Source: snapper
Version: 0.8.6 Version: 0.8.7
Binary: snapper Binary: snapper
Maintainer: Arvin Schnell <aschnell@suse.com> Maintainer: Arvin Schnell <aschnell@suse.com>
Architecture: any 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 # 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz
# #
Files: Files:
7d64389c9459cd68a21829e40e660c95 607094 snapper-0.8.6.tar.bz2 0118144c95a6b23a85741bf35d11bb9b 622425 snapper-0.8.7.tar.bz2

View File

@ -1,6 +1,6 @@
Format: 1.0 Format: 1.0
Source: snapper Source: snapper
Version: 0.8.6 Version: 0.8.7
Binary: snapper Binary: snapper
Maintainer: Arvin Schnell <aschnell@suse.com> Maintainer: Arvin Schnell <aschnell@suse.com>
Architecture: any 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 # 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz
# #
Files: Files:
7d64389c9459cd68a21829e40e660c95 607094 snapper-0.8.6.tar.bz2 0118144c95a6b23a85741bf35d11bb9b 622425 snapper-0.8.7.tar.bz2

View File

@ -1,6 +1,6 @@
Format: 1.0 Format: 1.0
Source: snapper Source: snapper
Version: 0.8.6 Version: 0.8.7
Binary: snapper Binary: snapper
Maintainer: Arvin Schnell <aschnell@suse.com> Maintainer: Arvin Schnell <aschnell@suse.com>
Architecture: any 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 # 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz
# #
Files: Files:
7d64389c9459cd68a21829e40e660c95 607094 snapper-0.8.6.tar.bz2 0118144c95a6b23a85741bf35d11bb9b 622425 snapper-0.8.7.tar.bz2

View File

@ -1,6 +1,6 @@
Format: 1.0 Format: 1.0
Source: snapper Source: snapper
Version: 0.8.6 Version: 0.8.7
Binary: snapper Binary: snapper
Maintainer: Arvin Schnell <aschnell@suse.com> Maintainer: Arvin Schnell <aschnell@suse.com>
Architecture: any 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 # 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz
# #
Files: Files:
7d64389c9459cd68a21829e40e660c95 607094 snapper-0.8.6.tar.bz2 0118144c95a6b23a85741bf35d11bb9b 622425 snapper-0.8.7.tar.bz2

View File

@ -1,6 +1,6 @@
Format: 1.0 Format: 1.0
Source: snapper Source: snapper
Version: 0.8.6 Version: 0.8.7
Binary: snapper Binary: snapper
Maintainer: Arvin Schnell <aschnell@suse.com> Maintainer: Arvin Schnell <aschnell@suse.com>
Architecture: any 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 # 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz
# #
Files: Files:
7d64389c9459cd68a21829e40e660c95 607094 snapper-0.8.6.tar.bz2 0118144c95a6b23a85741bf35d11bb9b 622425 snapper-0.8.7.tar.bz2

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Fri Dec 6 10:12:42 UTC 2019 - Martin Vidner <mvidner@suse.com>
- 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 <jlopez@suse.com> Wed Oct 23 13:00:36 UTC 2019 - José Iván López González <jlopez@suse.com>

View File

@ -22,7 +22,7 @@
%endif %endif
Name: snapper Name: snapper
Version: 0.8.6 Version: 0.8.7
Release: 0 Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source: snapper-%{version}.tar.bz2 Source: snapper-%{version}.tar.bz2
@ -72,8 +72,13 @@ BuildRequires: xsltproc
BuildRequires: libzypp(plugin:commit) BuildRequires: libzypp(plugin:commit)
%endif %endif
BuildRequires: pam-devel BuildRequires: pam-devel
%if 0%{?fedora_version}
BuildRequires: json-c-devel
%else
BuildRequires: libjson-c-devel
%endif
Requires: diffutils Requires: diffutils
Requires: libsnapper4 = %version Requires: libsnapper5 = %version
%if 0%{?suse_version} %if 0%{?suse_version}
Recommends: logrotate snapper-zypp-plugin Recommends: logrotate snapper-zypp-plugin
Supplements: btrfsprogs Supplements: btrfsprogs
@ -171,7 +176,7 @@ fi
%config /etc/dbus-1/system.d/org.opensuse.Snapper.conf %config /etc/dbus-1/system.d/org.opensuse.Snapper.conf
%{_datadir}/dbus-1/system-services/org.opensuse.Snapper.service %{_datadir}/dbus-1/system-services/org.opensuse.Snapper.service
%package -n libsnapper4 %package -n libsnapper5
Summary: Library for filesystem snapshot management Summary: Library for filesystem snapshot management
Group: System/Libraries Group: System/Libraries
Requires: util-linux Requires: util-linux
@ -179,12 +184,12 @@ Requires: util-linux
PreReq: %fillup_prereq PreReq: %fillup_prereq
%endif %endif
# expands to Obsoletes: libsnapper1 libsnapper2 libsnapper3... # 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. This package contains libsnapper, a library for filesystem snapshot management.
%files -n libsnapper4 %files -n libsnapper5
%defattr(-,root,root) %defattr(-,root,root)
%{_libdir}/libsnapper.so.* %{_libdir}/libsnapper.so.*
%dir %{_sysconfdir}/snapper %dir %{_sysconfdir}/snapper
@ -202,13 +207,13 @@ This package contains libsnapper, a library for filesystem snapshot management.
%config(noreplace) %{_sysconfdir}/sysconfig/snapper %config(noreplace) %{_sysconfdir}/sysconfig/snapper
%endif %endif
%post -n libsnapper4 %post -n libsnapper5
/sbin/ldconfig /sbin/ldconfig
%if 0%{?suse_version} %if 0%{?suse_version}
%{fillup_only -n snapper} %{fillup_only -n snapper}
%endif %endif
%postun -n libsnapper4 -p /sbin/ldconfig %postun -n libsnapper5 -p /sbin/ldconfig
%package -n libsnapper-devel %package -n libsnapper-devel
%if 0%{?suse_version} > 1325 %if 0%{?suse_version} > 1325
@ -218,7 +223,7 @@ Requires: boost-devel
%endif %endif
Requires: gcc-c++ Requires: gcc-c++
Requires: libacl-devel Requires: libacl-devel
Requires: libsnapper4 = %version Requires: libsnapper5 = %version
Requires: libstdc++-devel Requires: libstdc++-devel
Requires: libxml2-devel Requires: libxml2-devel
%if 0%{?suse_version} > 1230 %if 0%{?suse_version} > 1230
@ -240,9 +245,6 @@ libsnapper.
%{_includedir}/snapper %{_includedir}/snapper
%package -n snapper-zypp-plugin %package -n snapper-zypp-plugin
BuildArch: noarch
Requires: python3-dbus-python
Requires: python3-zypp-plugin
Requires: snapper = %version Requires: snapper = %version
Requires: libzypp(plugin:commit) = 1 Requires: libzypp(plugin:commit) = 1
Summary: A zypp commit plugin for calling snapper 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
%dir /usr/lib/zypp/plugins/commit %dir /usr/lib/zypp/plugins/commit
%endif %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.8*
%doc %{_mandir}/*/snapper-zypp-plugin.conf.5* %doc %{_mandir}/*/snapper-zypp-plugin.conf.5*