pool/postfix
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 544715 from home:RBrownSUSE:branches:server:mail

Browse Source 
Replace references to /var/adm/fillup-templates with new %_fillupdir macro (boo#1069468)

OBS-URL: https://build.opensuse.org/request/show/544715
OBS-URL: https://build.opensuse.org/package/show/server:mail/postfix?expand=0&rev=288
This commit is contained in:
Dirk Mueller 2017-11-24 09:59:20 +00:00 committed by Git OBS Bridge
parent 77d8915a9e
commit b7b86bea6f
2 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
postfix.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Nov 23 13:43:17 UTC 2017 - rbrown@suse.com
- Replace references to /var/adm/fillup-templates with new
%_fillupdir macro (boo#1069468)
-------------------------------------------------------------------
Wed Nov 8 13:32:28 CET 2017 - kukuk@suse.de

17
postfix.spec
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
%if 0%{?suse_version} >= 1320 || ( 0%{?suse_version} == 1315 && 0%{?is_opensuse} )
%bcond_without lmdb
%bcond_without libnsl
@ -304,10 +309,10 @@ mkdir -p %{buildroot}%{_includedir}/%{name}
mkdir -p %{buildroot}%{_sysconfdir}/pam.d
install -m 644 %{name}-SuSE/smtp %{buildroot}%{_sysconfdir}/pam.d/smtp
#mkdir samples
mkdir -p %{buildroot}%{_localstatedir}/adm/fillup-templates
rm -f %{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.%{name}
sed -e 's;@lib@;%{_lib};g' %{name}-SuSE/sysconfig.%{name} > %{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.%{name}
install -m 644 %{name}-SuSE/sysconfig.mail-%{name} %{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.mail-%{name}
mkdir -p %{buildroot}%{_fillupdir}
rm -f %{buildroot}%{_fillupdir}/sysconfig.%{name}
sed -e 's;@lib@;%{_lib};g' %{name}-SuSE/sysconfig.%{name} > %{buildroot}%{_fillupdir}/sysconfig.%{name}
install -m 644 %{name}-SuSE/sysconfig.mail-%{name} %{buildroot}%{_fillupdir}/sysconfig.mail-%{name}
sed -e 's;@lib@;%{_lib};g' \
-e 's;@conf_backup_dir@;%{conf_backup_dir};' \
-e 's;@daemon_directory@;%{pf_daemon_directory};' \
@ -576,8 +581,8 @@ fi
%defattr(-,root,root)
%doc LICENSE
%config %{_sysconfdir}/pam.d/*
%{_localstatedir}/adm/fillup-templates/sysconfig.%{name}
%{_localstatedir}/adm/fillup-templates/sysconfig.mail-%{name}
%{_fillupdir}/sysconfig.%{name}
%{_fillupdir}/sysconfig.mail-%{name}
%{_sbindir}/config.%{name}
%config(noreplace) %{omc_dir}/%{name}.xml
%dir %{_sysconfdir}/%{name}