- all 'define' changed to 'global' in spec

- perl interpreter path fixup moved from 'install' to 'prep'
This commit is contained in:
Jaroslav Škarvada 2010-06-14 08:39:48 +00:00
parent 90a31a9b35
commit b056699e1f

View File

@ -1,20 +1,20 @@
# package options # package options
%define with_tls yes %global with_tls yes
%define with_sasl2 yes %global with_sasl2 yes
%define with_milter yes %global with_milter yes
%define with_ldap yes %global with_ldap yes
%define enable_pie yes %global enable_pie yes
%define sendmailcf %{_datadir}/sendmail-cf %global sendmailcf %{_datadir}/sendmail-cf
%define stdir %{_localstatedir}/log/mail %global stdir %{_localstatedir}/log/mail
%define smshell /sbin/nologin %global smshell /sbin/nologin
%define spooldir %{_localstatedir}/spool %global spooldir %{_localstatedir}/spool
%define maildir %{_sysconfdir}/mail %global maildir %{_sysconfdir}/mail
Summary: A widely used Mail Transport Agent (MTA) Summary: A widely used Mail Transport Agent (MTA)
Name: sendmail Name: sendmail
Version: 8.14.4 Version: 8.14.4
Release: 7%{?dist} Release: 8%{?dist}
License: Sendmail License: Sendmail
Group: System Environment/Daemons Group: System Environment/Daemons
URL: http://www.sendmail.org/ URL: http://www.sendmail.org/
@ -166,6 +166,8 @@ for f in RELEASE_NOTES contrib/etrn.0; do
touch -r ${f}{,_} && mv -f ${f}{_,} touch -r ${f}{,_} && mv -f ${f}{_,}
done done
sed -i 's|/usr/local/bin/perl|%{_bindir}/perl|' contrib/*.pl
%build %build
# generate redhat config file # generate redhat config file
cat > redhat.config.m4 << EOF cat > redhat.config.m4 << EOF
@ -196,9 +198,9 @@ EOF
%if "%{enable_pie}" == "yes" %if "%{enable_pie}" == "yes"
%ifarch s390 s390x sparc sparcv9 sparc64 %ifarch s390 s390x sparc sparcv9 sparc64
%define _fpie -fPIE %global _fpie -fPIE
%else %else
%define _fpie -fpie %global _fpie -fpie
%endif %endif
cat >> redhat.config.m4 << EOF cat >> redhat.config.m4 << EOF
APPENDDEF(\`confOPTIMIZE', \`%{_fpie}') APPENDDEF(\`confOPTIMIZE', \`%{_fpie}')
@ -323,7 +325,6 @@ install -p -m 644 libmilter/README %{buildroot}%{_docdir}/sendmail-%{version}/RE
install -p -m 644 cf/README %{buildroot}%{_docdir}/sendmail-%{version}/README.cf install -p -m 644 cf/README %{buildroot}%{_docdir}/sendmail-%{version}/README.cf
install -m 644 %{SOURCE9} %{buildroot}%{_docdir}/sendmail-%{version}/README.redhat install -m 644 %{SOURCE9} %{buildroot}%{_docdir}/sendmail-%{version}/README.redhat
install -p -m 644 contrib/* %{buildroot}%{_docdir}/sendmail-%{version}/contrib install -p -m 644 contrib/* %{buildroot}%{_docdir}/sendmail-%{version}/contrib
sed -i 's|/usr/local/bin/perl|%{_bindir}/perl|' %{buildroot}%{_docdir}/sendmail-%{version}/contrib/*.pl
# install the cf files for the sendmail-cf package. # install the cf files for the sendmail-cf package.
cp -ar cf/* %{buildroot}%{sendmailcf} cp -ar cf/* %{buildroot}%{sendmailcf}
@ -599,6 +600,10 @@ exit 0
%changelog %changelog
* Mon Jun 14 2010 Jaroslav Škarvada <jskarvad@redhat.com> - 8.14.4-8
- all 'define' changed to 'global' in spec
- perl interpreter path fixup moved from 'install' to 'prep'
* Fri Jun 11 2010 Jaroslav Škarvada <jskarvad@redhat.com> - 8.14.4-7 * Fri Jun 11 2010 Jaroslav Škarvada <jskarvad@redhat.com> - 8.14.4-7
- silenced warning about non-existing config in {_libdir}/sasl2 - silenced warning about non-existing config in {_libdir}/sasl2