[mimedefang] - Added build requirement to perl(ExtUtils::MakeMaker) - Reflected changed parameters to disable bin

Robert Scheck robert at fedoraproject.org
Sat Oct 8 21:15:05 UTC 2011


commit 1da2a72e111921328bf410f6b4a530f025aacd99
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Sat Oct 8 23:15:00 2011 +0200

    - Added build requirement to perl(ExtUtils::MakeMaker)
    - Reflected changed parameters to disable binary stripping

 mimedefang.spec |   23 ++++++++++++++---------
 1 files changed, 14 insertions(+), 9 deletions(-)
---
diff --git a/mimedefang.spec b/mimedefang.spec
index 6b99b72..3ee3c2c 100644
--- a/mimedefang.spec
+++ b/mimedefang.spec
@@ -1,7 +1,7 @@
 Summary:           E-Mail filtering framework using Sendmail's Milter interface
 Name:              mimedefang
 Version:           2.72
-Release:           1%{?dist}
+Release:           2%{?dist}
 License:           GPLv2+
 Group:             System Environment/Daemons
 URL:               http://www.mimedefang.org/
@@ -13,7 +13,7 @@ Requires(pre):     shadow-utils
 Requires(post):    /sbin/chkconfig, perl(Digest::SHA1)
 Requires(preun):   /sbin/service, /sbin/chkconfig
 Requires(postun):  /sbin/service
-BuildRequires:     sendmail-devel >= 8.12.0
+BuildRequires:     sendmail-devel >= 8.12.0, perl(ExtUtils::MakeMaker)
 BuildRoot:         %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -30,26 +30,27 @@ could cause problems, for example, with encrypted or signed messages.
 
 %prep
 %setup -q
-cp -f %{SOURCE1} .
+cp -pf %{SOURCE1} .
 
 %build
 %configure --with-milterlib=%{_libdir} --with-user=defang --disable-check-perl-modules --disable-anti-virus
-make %{?_smp_mflags} DONT_STRIP=1
+make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make DESTDIR=$RPM_BUILD_ROOT install-redhat
+make DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p' INSTALL_STRIP_FLAG='' install-redhat
 
 # Fix config file, initscript, create log directory and remove duplicate
-sed -i '1d' $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/%{name}
-sed -i 's/2345/-/' $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/%{name}
+sed -e '1d' -i $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/%{name}
+sed -e 's/2345/-/' -i $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/%{name}
 mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log/%{name}
 rm -f $RPM_BUILD_ROOT%{_sysconfdir}/mail/sa-mimedefang.cf.example
 
 # Create a dummy file and install perl script for later executing
 touch $RPM_BUILD_ROOT%{_sysconfdir}/mail/mimedefang-ip-key
-install -m 755 gen-ip-validator.pl $RPM_BUILD_ROOT%{_bindir}/gen-ip-validator.pl
-sed -i '1s@^@#!%{_bindir}/perl\n@' $RPM_BUILD_ROOT%{_bindir}/gen-ip-validator.pl
+sed -e '1s@^@#!%{_bindir}/perl\n@' gen-ip-validator.pl > gen-ip-validator.pl.new
+install -m 755 gen-ip-validator.pl.new $RPM_BUILD_ROOT%{_bindir}/gen-ip-validator.pl
+touch -c -r gen-ip-validator.pl $RPM_BUILD_ROOT%{_bindir}/gen-ip-validator.pl
 
 # Convert everything to UTF-8
 iconv -f iso-8859-1 -t utf-8 -o Changelog.utf8 Changelog
@@ -103,6 +104,10 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
 
 %changelog
+* Sat Oct 08 2011 Robert Scheck <robert at fedoraproject.org> 2.72-2
+- Added build requirement to perl(ExtUtils::MakeMaker)
+- Reflected changed parameters to disable binary stripping
+
 * Sat Oct 08 2011 Robert Scheck <robert at fedoraproject.org> 2.72-1
 - Upgrade to 2.72
 


More information about the scm-commits mailing list