From f0e271b045f3c822eb6c98b43c74ec7795ffbbdf3f63e05febf0f6adec2adf36 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 22 Nov 2021 22:08:08 +0000 Subject: [PATCH] https://bugzilla.opensuse.org/show_bug.cgi?id=1192940 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/snapper?expand=0&rev=133 --- debian.tar.gz | 4 ++-- snapper-0.9.0.tar.bz2 | 3 +++ snapper-0.9.1.tar.bz2 | 3 --- snapper-Debian_10.0.dsc | 4 ++-- snapper-Debian_11.0.dsc | 14 -------------- snapper-Debian_9.0.dsc | 4 ++-- snapper-Debian_Unstable.dsc | 4 ++-- snapper-Raspbian_10.dsc | 2 +- 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-xUbuntu_19.10.dsc | 4 ++-- snapper-xUbuntu_20.04.dsc | 4 ++-- snapper-xUbuntu_20.10.dsc | 4 ++-- snapper-xUbuntu_21.04.dsc | 4 ++-- snapper-xUbuntu_21.10.dsc | 14 -------------- snapper.changes | 7 ------- snapper.spec | 37 ++++++------------------------------- 20 files changed, 36 insertions(+), 96 deletions(-) create mode 100644 snapper-0.9.0.tar.bz2 delete mode 100644 snapper-0.9.1.tar.bz2 delete mode 100644 snapper-Debian_11.0.dsc delete mode 100644 snapper-xUbuntu_21.10.dsc diff --git a/debian.tar.gz b/debian.tar.gz index 4be26e0..b2e7269 100644 --- a/debian.tar.gz +++ b/debian.tar.gz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c682cf1e6012e7021f9c2d8fba3ad575d29dcba55bc74860753bae9bfb53b1e7 -size 3463 +oid sha256:531fc8b06c319c8c9331aff726b068965a6ffc2a6db30878c3f8c1796521f5f1 +size 3442 diff --git a/snapper-0.9.0.tar.bz2 b/snapper-0.9.0.tar.bz2 new file mode 100644 index 0000000..425a820 --- /dev/null +++ b/snapper-0.9.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b6741cdc87fce0144ef3334a3e7a38afde1c0810f1736982b6005b678ff03a8b +size 638839 diff --git a/snapper-0.9.1.tar.bz2 b/snapper-0.9.1.tar.bz2 deleted file mode 100644 index e3a6d6c..0000000 --- a/snapper-0.9.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:13e0ff1f9340e528422c28e475b8e4de379c96d6311295e41bf0124c0e558cd2 -size 639804 diff --git a/snapper-Debian_10.0.dsc b/snapper-Debian_10.0.dsc index 0c5b745..f981010 100644 --- a/snapper-Debian_10.0.dsc +++ b/snapper-Debian_10.0.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: snapper -Version: 0.9.1-1 +Version: 0.9.0-1 Binary: snapper Maintainer: Arvin Schnell Architecture: any @@ -11,4 +11,4 @@ Build-Depends: debhelper (>= 4.1.16), acl-dev, dbus, g++, libboost-dev, libboost # 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz # Files: -9207fe474f5af47d0621faae026547e2 639804 snapper-0.9.1.tar.bz2 +2eef45af33426414604d8f03467c0e6c 638839 snapper-0.9.0.tar.bz2 diff --git a/snapper-Debian_11.0.dsc b/snapper-Debian_11.0.dsc deleted file mode 100644 index 0c5b745..0000000 --- a/snapper-Debian_11.0.dsc +++ /dev/null @@ -1,14 +0,0 @@ -Format: 1.0 -Source: snapper -Version: 0.9.1-1 -Binary: snapper -Maintainer: Arvin Schnell -Architecture: any -Build-Depends: debhelper (>= 4.1.16), acl-dev, dbus, g++, libboost-dev, libboost-thread-dev, libboost-system-dev, libboost-test-dev, libxml2-dev, libz-dev, libdbus-1-dev, libjson-c-dev, libpam-dev, xsltproc, docbook-xsl, locales-all, ncurses-dev -# -# The 'Files' line is generated during 'make package': -# Files: -# 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz -# -Files: -9207fe474f5af47d0621faae026547e2 639804 snapper-0.9.1.tar.bz2 diff --git a/snapper-Debian_9.0.dsc b/snapper-Debian_9.0.dsc index 0c5b745..f981010 100644 --- a/snapper-Debian_9.0.dsc +++ b/snapper-Debian_9.0.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: snapper -Version: 0.9.1-1 +Version: 0.9.0-1 Binary: snapper Maintainer: Arvin Schnell Architecture: any @@ -11,4 +11,4 @@ Build-Depends: debhelper (>= 4.1.16), acl-dev, dbus, g++, libboost-dev, libboost # 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz # Files: -9207fe474f5af47d0621faae026547e2 639804 snapper-0.9.1.tar.bz2 +2eef45af33426414604d8f03467c0e6c 638839 snapper-0.9.0.tar.bz2 diff --git a/snapper-Debian_Unstable.dsc b/snapper-Debian_Unstable.dsc index 0c5b745..f981010 100644 --- a/snapper-Debian_Unstable.dsc +++ b/snapper-Debian_Unstable.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: snapper -Version: 0.9.1-1 +Version: 0.9.0-1 Binary: snapper Maintainer: Arvin Schnell Architecture: any @@ -11,4 +11,4 @@ Build-Depends: debhelper (>= 4.1.16), acl-dev, dbus, g++, libboost-dev, libboost # 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz # Files: -9207fe474f5af47d0621faae026547e2 639804 snapper-0.9.1.tar.bz2 +2eef45af33426414604d8f03467c0e6c 638839 snapper-0.9.0.tar.bz2 diff --git a/snapper-Raspbian_10.dsc b/snapper-Raspbian_10.dsc index d75a4b3..aa71a78 100644 --- a/snapper-Raspbian_10.dsc +++ b/snapper-Raspbian_10.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: snapper -Version: 0.9.1-1 +Version: 0.9.0-1 Binary: snapper Maintainer: Arvin Schnell Architecture: any diff --git a/snapper-xUbuntu_17.04.dsc b/snapper-xUbuntu_17.04.dsc index 3372141..87cf1e7 100644 --- a/snapper-xUbuntu_17.04.dsc +++ b/snapper-xUbuntu_17.04.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: snapper -Version: 0.9.1-1 +Version: 0.9.0-1 Binary: snapper Maintainer: Arvin Schnell Architecture: any @@ -11,4 +11,4 @@ Build-Depends: debhelper (>= 4.1.16), acl-dev, dbus, g++, libboost-dev, libboost # 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz # Files: -9207fe474f5af47d0621faae026547e2 639804 snapper-0.9.1.tar.bz2 +2eef45af33426414604d8f03467c0e6c 638839 snapper-0.9.0.tar.bz2 diff --git a/snapper-xUbuntu_17.10.dsc b/snapper-xUbuntu_17.10.dsc index 3372141..87cf1e7 100644 --- a/snapper-xUbuntu_17.10.dsc +++ b/snapper-xUbuntu_17.10.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: snapper -Version: 0.9.1-1 +Version: 0.9.0-1 Binary: snapper Maintainer: Arvin Schnell Architecture: any @@ -11,4 +11,4 @@ Build-Depends: debhelper (>= 4.1.16), acl-dev, dbus, g++, libboost-dev, libboost # 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz # Files: -9207fe474f5af47d0621faae026547e2 639804 snapper-0.9.1.tar.bz2 +2eef45af33426414604d8f03467c0e6c 638839 snapper-0.9.0.tar.bz2 diff --git a/snapper-xUbuntu_18.04.dsc b/snapper-xUbuntu_18.04.dsc index 3372141..87cf1e7 100644 --- a/snapper-xUbuntu_18.04.dsc +++ b/snapper-xUbuntu_18.04.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: snapper -Version: 0.9.1-1 +Version: 0.9.0-1 Binary: snapper Maintainer: Arvin Schnell Architecture: any @@ -11,4 +11,4 @@ Build-Depends: debhelper (>= 4.1.16), acl-dev, dbus, g++, libboost-dev, libboost # 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz # Files: -9207fe474f5af47d0621faae026547e2 639804 snapper-0.9.1.tar.bz2 +2eef45af33426414604d8f03467c0e6c 638839 snapper-0.9.0.tar.bz2 diff --git a/snapper-xUbuntu_18.10.dsc b/snapper-xUbuntu_18.10.dsc index 3372141..87cf1e7 100644 --- a/snapper-xUbuntu_18.10.dsc +++ b/snapper-xUbuntu_18.10.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: snapper -Version: 0.9.1-1 +Version: 0.9.0-1 Binary: snapper Maintainer: Arvin Schnell Architecture: any @@ -11,4 +11,4 @@ Build-Depends: debhelper (>= 4.1.16), acl-dev, dbus, g++, libboost-dev, libboost # 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz # Files: -9207fe474f5af47d0621faae026547e2 639804 snapper-0.9.1.tar.bz2 +2eef45af33426414604d8f03467c0e6c 638839 snapper-0.9.0.tar.bz2 diff --git a/snapper-xUbuntu_19.04.dsc b/snapper-xUbuntu_19.04.dsc index 3372141..87cf1e7 100644 --- a/snapper-xUbuntu_19.04.dsc +++ b/snapper-xUbuntu_19.04.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: snapper -Version: 0.9.1-1 +Version: 0.9.0-1 Binary: snapper Maintainer: Arvin Schnell Architecture: any @@ -11,4 +11,4 @@ Build-Depends: debhelper (>= 4.1.16), acl-dev, dbus, g++, libboost-dev, libboost # 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz # Files: -9207fe474f5af47d0621faae026547e2 639804 snapper-0.9.1.tar.bz2 +2eef45af33426414604d8f03467c0e6c 638839 snapper-0.9.0.tar.bz2 diff --git a/snapper-xUbuntu_19.10.dsc b/snapper-xUbuntu_19.10.dsc index 3372141..87cf1e7 100644 --- a/snapper-xUbuntu_19.10.dsc +++ b/snapper-xUbuntu_19.10.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: snapper -Version: 0.9.1-1 +Version: 0.9.0-1 Binary: snapper Maintainer: Arvin Schnell Architecture: any @@ -11,4 +11,4 @@ Build-Depends: debhelper (>= 4.1.16), acl-dev, dbus, g++, libboost-dev, libboost # 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz # Files: -9207fe474f5af47d0621faae026547e2 639804 snapper-0.9.1.tar.bz2 +2eef45af33426414604d8f03467c0e6c 638839 snapper-0.9.0.tar.bz2 diff --git a/snapper-xUbuntu_20.04.dsc b/snapper-xUbuntu_20.04.dsc index 3372141..87cf1e7 100644 --- a/snapper-xUbuntu_20.04.dsc +++ b/snapper-xUbuntu_20.04.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: snapper -Version: 0.9.1-1 +Version: 0.9.0-1 Binary: snapper Maintainer: Arvin Schnell Architecture: any @@ -11,4 +11,4 @@ Build-Depends: debhelper (>= 4.1.16), acl-dev, dbus, g++, libboost-dev, libboost # 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz # Files: -9207fe474f5af47d0621faae026547e2 639804 snapper-0.9.1.tar.bz2 +2eef45af33426414604d8f03467c0e6c 638839 snapper-0.9.0.tar.bz2 diff --git a/snapper-xUbuntu_20.10.dsc b/snapper-xUbuntu_20.10.dsc index 3372141..87cf1e7 100644 --- a/snapper-xUbuntu_20.10.dsc +++ b/snapper-xUbuntu_20.10.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: snapper -Version: 0.9.1-1 +Version: 0.9.0-1 Binary: snapper Maintainer: Arvin Schnell Architecture: any @@ -11,4 +11,4 @@ Build-Depends: debhelper (>= 4.1.16), acl-dev, dbus, g++, libboost-dev, libboost # 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz # Files: -9207fe474f5af47d0621faae026547e2 639804 snapper-0.9.1.tar.bz2 +2eef45af33426414604d8f03467c0e6c 638839 snapper-0.9.0.tar.bz2 diff --git a/snapper-xUbuntu_21.04.dsc b/snapper-xUbuntu_21.04.dsc index 3372141..87cf1e7 100644 --- a/snapper-xUbuntu_21.04.dsc +++ b/snapper-xUbuntu_21.04.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: snapper -Version: 0.9.1-1 +Version: 0.9.0-1 Binary: snapper Maintainer: Arvin Schnell Architecture: any @@ -11,4 +11,4 @@ Build-Depends: debhelper (>= 4.1.16), acl-dev, dbus, g++, libboost-dev, libboost # 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz # Files: -9207fe474f5af47d0621faae026547e2 639804 snapper-0.9.1.tar.bz2 +2eef45af33426414604d8f03467c0e6c 638839 snapper-0.9.0.tar.bz2 diff --git a/snapper-xUbuntu_21.10.dsc b/snapper-xUbuntu_21.10.dsc deleted file mode 100644 index 3372141..0000000 --- a/snapper-xUbuntu_21.10.dsc +++ /dev/null @@ -1,14 +0,0 @@ -Format: 1.0 -Source: snapper -Version: 0.9.1-1 -Binary: snapper -Maintainer: Arvin Schnell -Architecture: any -Build-Depends: debhelper (>= 4.1.16), acl-dev, dbus, g++, libboost-dev, libboost-thread-dev, libboost-system-dev, libboost-test-dev, libxml2-dev, libz-dev, libdbus-1-dev, libjson-c-dev, libpam-dev, xsltproc, docbook-xsl, language-pack-en, language-pack-de, language-pack-fr, ncurses-dev -# -# The 'Files' line is generated during 'make package': -# Files: -# 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz -# -Files: -9207fe474f5af47d0621faae026547e2 639804 snapper-0.9.1.tar.bz2 diff --git a/snapper.changes b/snapper.changes index 90bd725..b16d211 100644 --- a/snapper.changes +++ b/snapper.changes @@ -1,10 +1,3 @@ -------------------------------------------------------------------- -Tue Sep 21 13:30:29 CEST 2021 - aschnell@suse.com - -- look for most configuration files in /etc/snapper and - /usr/share/snapper (bsc#1189601) -- version 0.9.1 - ------------------------------------------------------------------- Wed Jun 16 11:50:49 CEST 2021 - aschnell@suse.com diff --git a/snapper.spec b/snapper.spec index 1941cc4..82f523f 100644 --- a/snapper.spec +++ b/snapper.spec @@ -32,7 +32,7 @@ %bcond_with coverage Name: snapper -Version: 0.9.1 +Version: 0.9.0 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: snapper-%{version}.tar.bz2 @@ -226,11 +226,10 @@ This package contains libsnapper, a library for filesystem snapshot management. %{_libdir}/libsnapper.so.* %dir %{_sysconfdir}/snapper %dir %{_sysconfdir}/snapper/configs -%dir %{_datadir}/snapper -%dir %{_datadir}/snapper/config-templates -%{_datadir}/snapper/config-templates/default -%dir %{_datadir}/snapper/filters -%{_datadir}/snapper/filters/*.txt +%dir %{_sysconfdir}/snapper/config-templates +%config(noreplace) %{_sysconfdir}/snapper/config-templates/default +%dir %{_sysconfdir}/snapper/filters +%config(noreplace) %{_sysconfdir}/snapper/filters/*.txt %doc %dir %{_defaultdocdir}/snapper %doc %{_defaultdocdir}/snapper/AUTHORS %doc %{_defaultdocdir}/snapper/COPYING @@ -240,18 +239,6 @@ This package contains libsnapper, a library for filesystem snapshot management. %config(noreplace) %{_sysconfdir}/sysconfig/snapper %endif -%pre -n libsnapper5 -# Migration from /etc/snapper to /usr/share/snapper -for i in config-templates/default filters/base.txt filters/lvm.txt filters/x11.txt ; do - test -f /etc/snapper/${i}.rpmsave && mv -v /etc/snapper/${i}.rpmsave /etc/snapper/${i}.rpmsave.old ||: -done - -%posttrans -n libsnapper5 -# Migration from /etc/snapper to /usr/share/snapper -for i in config-templates/default filters/base.txt filters/lvm.txt filters/x11.txt ; do - test -f /etc/snapper/${i}.rpmsave && mv -v /etc/snapper/${i}.rpmsave /etc/snapper/${i} ||: -done - %post -n libsnapper5 /sbin/ldconfig %if 0%{?suse_version} @@ -301,7 +288,7 @@ snapper during commits. %files -n snapper-zypp-plugin %defattr(-,root,root) -%{_datadir}/snapper/zypp-plugin.conf +%config(noreplace) %{_sysconfdir}/snapper/zypp-plugin.conf %if 0%{?suse_version} < 1210 %dir /usr/lib/zypp %dir /usr/lib/zypp/plugins @@ -311,18 +298,6 @@ snapper during commits. %doc %{_mandir}/*/snapper-zypp-plugin.8* %doc %{_mandir}/*/snapper-zypp-plugin.conf.5* -%pre -n snapper-zypp-plugin -# Migration from /etc/snapper to /usr/share/snapper -for i in zypp-plugin.conf ; do - test -f /etc/snapper/${i}.rpmsave && mv -v /etc/snapper/${i}.rpmsave /etc/snapper/${i}.rpmsave.old ||: -done - -%posttrans -n snapper-zypp-plugin -# Migration from /etc/snapper to /usr/share/snapper -for i in zypp-plugin.conf ; do - test -f /etc/snapper/${i}.rpmsave && mv -v /etc/snapper/${i}.rpmsave /etc/snapper/${i} ||: -done - %package -n pam_snapper Requires: pam Requires: snapper = %version