SHA256
1
0
forked from pool/snapper

- Replace references to /var/adm/fillup-templates with new

%_fillupdir macro (boo#1069468)

OBS-URL: https://build.opensuse.org/package/show/filesystems:snapper/snapper?expand=0&rev=127
This commit is contained in:
YaST Team Bot 2017-12-07 12:50:03 +00:00 committed by Git OBS Bridge
parent 4dc33fd9e3
commit bec21e5328
13 changed files with 26 additions and 15 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:a9f774cc7601e13383a13402280504ad7c06546af9dff8c3fa911e12d7323c1b oid sha256:40326904850149cf6780a1f69559945d68e436c0354b921a898d62eb4cf2470d
size 3078 size 3059

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:8e1624d0a04c34f9ae2ddfee310eb515504a8dbf788bc413a52f4d1444b869aa oid sha256:c2f539e67716b3ec6a4973aa575e1a30f9757493aedd8309545ecabdbb3989de
size 572319 size 571953

View File

@ -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:
a681bf77fd7d0c6005fb812e0bc6c6d9 572319 snapper-0.5.2.tar.bz2 327feb9c9a8eff12fee33d524e2cd3bf 571953 snapper-0.5.2.tar.bz2

View File

@ -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:
a681bf77fd7d0c6005fb812e0bc6c6d9 572319 snapper-0.5.2.tar.bz2 327feb9c9a8eff12fee33d524e2cd3bf 571953 snapper-0.5.2.tar.bz2

View File

@ -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:
a681bf77fd7d0c6005fb812e0bc6c6d9 572319 snapper-0.5.2.tar.bz2 327feb9c9a8eff12fee33d524e2cd3bf 571953 snapper-0.5.2.tar.bz2

View File

@ -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:
a681bf77fd7d0c6005fb812e0bc6c6d9 572319 snapper-0.5.2.tar.bz2 327feb9c9a8eff12fee33d524e2cd3bf 571953 snapper-0.5.2.tar.bz2

View File

@ -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:
a681bf77fd7d0c6005fb812e0bc6c6d9 572319 snapper-0.5.2.tar.bz2 327feb9c9a8eff12fee33d524e2cd3bf 571953 snapper-0.5.2.tar.bz2

View File

@ -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:
a681bf77fd7d0c6005fb812e0bc6c6d9 572319 snapper-0.5.2.tar.bz2 327feb9c9a8eff12fee33d524e2cd3bf 571953 snapper-0.5.2.tar.bz2

View File

@ -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:
a681bf77fd7d0c6005fb812e0bc6c6d9 572319 snapper-0.5.2.tar.bz2 327feb9c9a8eff12fee33d524e2cd3bf 571953 snapper-0.5.2.tar.bz2

View File

@ -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:
a681bf77fd7d0c6005fb812e0bc6c6d9 572319 snapper-0.5.2.tar.bz2 327feb9c9a8eff12fee33d524e2cd3bf 571953 snapper-0.5.2.tar.bz2

View File

@ -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:
a681bf77fd7d0c6005fb812e0bc6c6d9 572319 snapper-0.5.2.tar.bz2 327feb9c9a8eff12fee33d524e2cd3bf 571953 snapper-0.5.2.tar.bz2

View File

@ -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 Wed Sep 6 09:53:12 CEST 2017 - aschnell@suse.com

View File

@ -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 Name: snapper
Version: 0.5.2 Version: 0.5.2
Release: 0 Release: 0
@ -105,7 +110,7 @@ make %{?_smp_mflags}
rm -f "%{buildroot}/%{_libdir}"/*.la "%{buildroot}/%{_lib}/security/pam_snapper.la" rm -f "%{buildroot}/%{_libdir}"/*.la "%{buildroot}/%{_lib}/security/pam_snapper.la"
%if 0%{?suse_version} %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 %else
install -D -m 644 data/sysconfig.snapper "%{buildroot}/etc/sysconfig/snapper" install -D -m 644 data/sysconfig.snapper "%{buildroot}/etc/sysconfig/snapper"
%endif %endif
@ -162,7 +167,7 @@ This package contains libsnapper, a library for filesystem snapshot management.
%doc %{_defaultdocdir}/snapper/AUTHORS %doc %{_defaultdocdir}/snapper/AUTHORS
%doc %{_defaultdocdir}/snapper/COPYING %doc %{_defaultdocdir}/snapper/COPYING
%if 0%{?suse_version} %if 0%{?suse_version}
/var/adm/fillup-templates/sysconfig.snapper %{_fillupdir}/sysconfig.snapper
%else %else
%config(noreplace) %{_sysconfdir}/sysconfig/snapper %config(noreplace) %{_sysconfdir}/sysconfig/snapper
%endif %endif