rpms/sendmail/devel sendmail.spec,1.112,1.113

[Jaroslav Škarvada]

Author: jskarvad

Update of /cvs/pkgs/rpms/sendmail/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv12967

Modified Files:
	sendmail.spec 
Log Message:
* Mon Jun 14 2010 Jaroslav Škarvada <jskarvad at redhat.com> - 8.14.4-8
- all 'define' changed to 'global' in spec
- perl interpreter path fixup moved from 'install' to 'prep'



Index: sendmail.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sendmail/devel/sendmail.spec,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -p -r1.112 -r1.113
--- sendmail.spec	11 Jun 2010 14:22:33 -0000	1.112
+++ sendmail.spec	14 Jun 2010 08:39:48 -0000	1.113
@@ -1,20 +1,20 @@
 # package options
-%define with_tls	yes
-%define with_sasl2	yes
-%define with_milter	yes
-%define with_ldap	yes
-%define enable_pie	yes
-
-%define sendmailcf %{_datadir}/sendmail-cf
-%define stdir %{_localstatedir}/log/mail
-%define smshell /sbin/nologin
-%define spooldir %{_localstatedir}/spool
-%define maildir %{_sysconfdir}/mail
+%global with_tls	yes
+%global with_sasl2	yes
+%global with_milter	yes
+%global with_ldap	yes
+%global enable_pie	yes
+
+%global sendmailcf %{_datadir}/sendmail-cf
+%global stdir %{_localstatedir}/log/mail
+%global smshell /sbin/nologin
+%global spooldir %{_localstatedir}/spool
+%global maildir %{_sysconfdir}/mail
 
 Summary: A widely used Mail Transport Agent (MTA)
 Name: sendmail
 Version: 8.14.4
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: Sendmail
 Group: System Environment/Daemons
 URL: http://www.sendmail.org/
@@ -166,6 +166,8 @@ for f in RELEASE_NOTES contrib/etrn.0; d
 		touch -r ${f}{,_} && mv -f ${f}{_,}
 done
 
+sed -i 's|/usr/local/bin/perl|%{_bindir}/perl|' contrib/*.pl
+
 %build
 # generate redhat config file
 cat > redhat.config.m4 << EOF
@@ -196,9 +198,9 @@ EOF
 
 %if "%{enable_pie}" == "yes"
 %ifarch s390 s390x sparc sparcv9 sparc64
-%define _fpie -fPIE
+%global _fpie -fPIE
 %else
-%define _fpie -fpie
+%global _fpie -fpie
 %endif
 cat >> redhat.config.m4 << EOF
 APPENDDEF(\`confOPTIMIZE', \`%{_fpie}')
@@ -323,7 +325,6 @@ install -p -m 644 libmilter/README %{bui
 install -p -m 644 cf/README %{buildroot}%{_docdir}/sendmail-%{version}/README.cf
 install -m 644 %{SOURCE9} %{buildroot}%{_docdir}/sendmail-%{version}/README.redhat
 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.
 cp -ar cf/* %{buildroot}%{sendmailcf}
@@ -599,6 +600,10 @@ exit 0
 
 
 %changelog
+* Mon Jun 14 2010 Jaroslav Škarvada <jskarvad at 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 at redhat.com> - 8.14.4-7
 - silenced warning about non-existing config in {_libdir}/sasl2