Accepting request 556698 from filesystems:snapper

We needed this in Factory >20 days ago for the fillup-templates change. Manually submitting. OBS-URL: https://build.opensuse.org/request/show/556698 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/snapper?expand=0&rev=96
2017-12-16 19:46:51 +00:00 · 2017-12-16 19:46:51 +00:00 · 42a065fa89
commit 42a065fa89
parent 2cf8a0dea2 233d31a713
13 changed files with 26 additions and 15 deletions
--- a/debian.tar.gz
+++ b/debian.tar.gz
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:df9809a0ba4e1b1b28079bd48db9fa085bff0b86f6ed33d733cb4b366b5927e2
-size 3045
+oid sha256:c480ae90610bf3e55344948beae5c9484fceb576117eff01c3821e2c4d52e037
+size 3053
--- a/snapper-0.5.2.tar.bz2
+++ b/snapper-0.5.2.tar.bz2
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8b4ff7766e8d02a54bad2d54b02e92840c7b2ae22790ece1d15c8914676f71b6
-size 571883
+oid sha256:df54da980fd2fd31d46bce880be0a2c9f867a23394106acb38f1c060bb3e78b6
+size 571670
--- a/snapper-Debian_7.0.dsc
+++ b/snapper-Debian_7.0.dsc
@ -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:
-4129fcadbc5407a448bf3f649b72dfc2 571883 snapper-0.5.2.tar.bz2
+0bbe0351479be03d56415c4287050ead 571670 snapper-0.5.2.tar.bz2
--- a/snapper-Debian_8.0.dsc
+++ b/snapper-Debian_8.0.dsc
@ -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:
-4129fcadbc5407a448bf3f649b72dfc2 571883 snapper-0.5.2.tar.bz2
+0bbe0351479be03d56415c4287050ead 571670 snapper-0.5.2.tar.bz2
--- a/snapper-xUbuntu_14.04.dsc
+++ b/snapper-xUbuntu_14.04.dsc
@ -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:
-4129fcadbc5407a448bf3f649b72dfc2 571883 snapper-0.5.2.tar.bz2
+0bbe0351479be03d56415c4287050ead 571670 snapper-0.5.2.tar.bz2
--- a/snapper-xUbuntu_14.10.dsc
+++ b/snapper-xUbuntu_14.10.dsc
@ -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:
-4129fcadbc5407a448bf3f649b72dfc2 571883 snapper-0.5.2.tar.bz2
+0bbe0351479be03d56415c4287050ead 571670 snapper-0.5.2.tar.bz2
--- a/snapper-xUbuntu_15.04.dsc
+++ b/snapper-xUbuntu_15.04.dsc
@ -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:
-4129fcadbc5407a448bf3f649b72dfc2 571883 snapper-0.5.2.tar.bz2
+0bbe0351479be03d56415c4287050ead 571670 snapper-0.5.2.tar.bz2
--- a/snapper-xUbuntu_15.10.dsc
+++ b/snapper-xUbuntu_15.10.dsc
@ -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:
-4129fcadbc5407a448bf3f649b72dfc2 571883 snapper-0.5.2.tar.bz2
+0bbe0351479be03d56415c4287050ead 571670 snapper-0.5.2.tar.bz2
--- a/snapper-xUbuntu_16.04.dsc
+++ b/snapper-xUbuntu_16.04.dsc
@ -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:
-4129fcadbc5407a448bf3f649b72dfc2 571883 snapper-0.5.2.tar.bz2
+0bbe0351479be03d56415c4287050ead 571670 snapper-0.5.2.tar.bz2
--- a/snapper-xUbuntu_16.10.dsc
+++ b/snapper-xUbuntu_16.10.dsc
@ -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:
-4129fcadbc5407a448bf3f649b72dfc2 571883 snapper-0.5.2.tar.bz2
+0bbe0351479be03d56415c4287050ead 571670 snapper-0.5.2.tar.bz2
--- a/snapper-xUbuntu_17.04.dsc
+++ b/snapper-xUbuntu_17.04.dsc
@ -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:
-4129fcadbc5407a448bf3f649b72dfc2 571883 snapper-0.5.2.tar.bz2
+0bbe0351479be03d56415c4287050ead 571670 snapper-0.5.2.tar.bz2
--- a/snapper.changes
+++ b/snapper.changes
@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Nov 23 13:51:45 UTC 2017 - rbrown@suse.com
+
+- Replace references to /var/adm/fillup-templates with new 
+  %_fillupdir macro (boo#1069468)
+
 -------------------------------------------------------------------
 Wed Sep  6 09:53:12 CEST 2017 - aschnell@suse.com

--- a/snapper.spec
+++ b/snapper.spec
@ -16,6 +16,11 @@
 #


+#Compat macro for new _fillupdir macro introduced in Nov 2017
+%if ! %{defined _fillupdir}
+  %define _fillupdir /var/adm/fillup-templates
+%endif
+
 Name:           snapper
 Version:        0.5.2
 Release:        0
@ -105,7 +110,7 @@ make %{?_smp_mflags}
 rm -f "%{buildroot}/%{_libdir}"/*.la "%{buildroot}/%{_lib}/security/pam_snapper.la"

 %if 0%{?suse_version}
-install -D -m 644 data/sysconfig.snapper "%{buildroot}/var/adm/fillup-templates/sysconfig.snapper"
+install -D -m 644 data/sysconfig.snapper "%{buildroot}%{_fillupdir}/sysconfig.snapper"
 %else
 install -D -m 644 data/sysconfig.snapper "%{buildroot}/etc/sysconfig/snapper"
 %endif
@ -162,7 +167,7 @@ This package contains libsnapper, a library for filesystem snapshot management.
 %doc %{_defaultdocdir}/snapper/AUTHORS
 %doc %{_defaultdocdir}/snapper/COPYING
 %if 0%{?suse_version}
-/var/adm/fillup-templates/sysconfig.snapper
+%{_fillupdir}/sysconfig.snapper
 %else
 %config(noreplace) %{_sysconfdir}/sysconfig/snapper
 %endif