Working on a solution on all bugs coused by SuSEconfig

OBS-URL: https://build.opensuse.org/package/show/server:mail/postfix?expand=0&rev=149
This commit is contained in:
Peter Varkoly 2012-11-07 10:19:52 +00:00 committed by Git OBS Bridge
parent 423ba78ec2
commit 4fa7c6c4ce
2 changed files with 10 additions and 17 deletions

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:57e9c1298ab13ac7298e71c9551712da44514e06b812ab112e30c9f2cb646b65
size 24106
oid sha256:dbdedc55f16a0fd2c6640a343ab2d97dc127b91620ad7eb3723024dd26448f04
size 24645

View File

@ -223,7 +223,6 @@ mkdir -p $RPM_BUILD_ROOT/var/adm/fillup-templates
rm -f $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.%{name}
sed -e 's;@lib@;%{_lib};g' %{name}-SuSE/sysconfig.%{name} > $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.%{name}
install -m 644 %{name}-SuSE/sysconfig.mail-%{name} $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.mail-%{name}
test -e $RPM_BUILD_ROOT/sbin/conf.d/SuSEconfig.%{name} && rm -f $RPM_BUILD_ROOT/sbin/conf.d/SuSEconfig.%{name}
sed -e 's;@lib@;%{_lib};g' \
-e 's;@conf_backup_dir@;%{conf_backup_dir};' \
-e 's;@daemon_directory@;%{pf_daemon_directory};' \
@ -234,9 +233,9 @@ sed -e 's;@lib@;%{_lib};g' \
-e 's;@manpage_directory@;%{_mandir};' \
-e 's;@newaliases_path@;%{pf_newaliases_path};' \
-e 's;@sample_directory@;%{pf_sample_directory};' \
-e 's;@mailq_path@;%{pf_mailq_path};' %{name}-SuSE/SuSEconfig.%{name} \
> $RPM_BUILD_ROOT/usr/sbin/SuSEconfig.%{name}
chmod 755 $RPM_BUILD_ROOT/usr/sbin/SuSEconfig.%{name}
-e 's;@mailq_path@;%{pf_mailq_path};' %{name}-SuSE/config.%{name} \
> $RPM_BUILD_ROOT/usr/sbin/config.%{name}
chmod 755 $RPM_BUILD_ROOT/usr/sbin/config.%{name}
install -m 644 %{name}-SuSE/dynamicmaps.cf $RPM_BUILD_ROOT/etc/%{name}/dynamicmaps.cf
install -m 644 %{name}-SuSE/ldap_aliases.cf $RPM_BUILD_ROOT/etc/%{name}/ldap_aliases.cf
install -m 644 %{name}-SuSE/helo_access $RPM_BUILD_ROOT/etc/postfix/helo_access
@ -258,7 +257,7 @@ cat<<EOF
#
# -----------------------------------------------------------------------
# NOTE: Many parameters have already been added to the end of this file
# by SuSEconfig.postfix. So take care that you don't uncomment
# by config.postfix. So take care that you don't uncomment
# and set a parameter without checking whether it has been added
# to the end of this file.
# -----------------------------------------------------------------------
@ -301,6 +300,7 @@ cp -a auxiliary/ $RPM_BUILD_ROOT%{pf_docdir}/
mkdir -p %{buildroot}/lib/systemd/system
mkdir -p %{buildroot}/etc/postfix/system
install -m 0644 %{name}-SuSE/postfix.service %{buildroot}/lib/systemd/system/
install -m 0755 %{name}-SuSE/config_postfix.systemd %{buildroot}/etc/postfix/system/config_postfix
install -m 0755 %{name}-SuSE/update_chroot.systemd %{buildroot}/etc/postfix/system/update_chroot
install -m 0755 %{name}-SuSE/update_postmaps.systemd %{buildroot}/etc/postfix/system/update_postmaps
install -m 0755 %{name}-SuSE/wait_qmgr.systemd %{buildroot}/etc/postfix/system/wait_qmgr
@ -396,12 +396,8 @@ fi
# We only start postfix own upgrade-configuration by update
/usr/sbin/postfix set-permissions
if [ ${1:-0} -gt 1 ]; then
touch /var/adm/postfix.configured
/usr/sbin/postfix upgrade-configuration || :
else
if [ ! -e /sbin/conf.d/SuSEconfig.postfix ]
then
ln -s /usr/sbin/SuSEconfig.postfix /sbin/conf.d/SuSEconfig.postfix
fi
fi
%{fillup_and_insserv -y postfix}
%{fillup_only -an mail}
@ -446,7 +442,7 @@ rm -rf $RPM_BUILD_ROOT
%config /etc/pam.d/*
/var/adm/fillup-templates/sysconfig.%{name}
/var/adm/fillup-templates/sysconfig.mail-%{name}
/usr/sbin/SuSEconfig.%{name}
/usr/sbin/config.%{name}
%config(noreplace) %{omc_dir}/%{name}.xml
%dir /etc/%{name}
%config /etc/%{name}/main.cf.default
@ -481,10 +477,7 @@ rm -rf $RPM_BUILD_ROOT
%config %attr(0755,root,root) /etc/init.d/%{name}
%if 0%{?suse_version} >= 1140
%dir /etc/postfix/system
%config %attr(0755,root,root) /etc/postfix/system/update_chroot
%config %attr(0755,root,root) /etc/postfix/system/update_postmaps
%config %attr(0755,root,root) /etc/postfix/system/wait_qmgr
%config %attr(0755,root,root) /etc/postfix/system/cond_slp
%config %attr(0755,root,root) /etc/postfix/system/*
%config /lib/systemd/system/postfix.service
%endif
/usr/bin/mailq