Author: arekm Date: Thu Sep 1 16:54:23 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - drop sa-exim from exim.spec; new sa-exim.spec as local_scan plugin
---- Files affected: SPECS: sa-exim.spec (NONE -> 1.1) (NEW), exim.spec (1.244 -> 1.245) ---- Diffs: ================================================================ Index: SPECS/sa-exim.spec diff -u /dev/null SPECS/sa-exim.spec:1.1 --- /dev/null Thu Sep 1 18:54:23 2005 +++ SPECS/sa-exim.spec Thu Sep 1 18:54:16 2005 @@ -0,0 +1,53 @@ +# $Revision$, $Date$ +Summary: Exim SpamAssassin at SMTP time +Name: sa-exim +Version: 4.2 +Release: 1 +License: GPL +Group: Networking/Daemons +Source0: http://marc.merlins.org/linux/exim/files/%{name}-%{version}.tar.gz +URL: http://marc.merlins.org/linux/exim/sa.html +BuildRequires: exim-devel +Requires: exim >= 2:4.52-4 +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) + +%description +Exim SpamAssassin at SMTP time. + +%prep +%setup -q + +%build +%{__make} \ + SACONF="/etc/mail/sa-exim.conf" \ + EXIM_SRC_LOCAL="%{_includedir}/exim" \ + EXIM_SRC="%{_includedir}/exim" \ + LDFLAGS="-shared -fPIC %{rpmldflags}" \ + CC="%{__cc}" +%{__make} + +%install +rm -rf $RPM_BUILD_ROOT +install -d $RPM_BUILD_ROOT{%{_sysconfdir}/mail,%{_libdir}/exim} + +install sa-exim-*.so $RPM_BUILD_ROOT%{_libdir}/exim/%{name}.so +install sa-exim.conf $RPM_BUILD_ROOT/%{_sysconfdir}/mail/sa-exim.conf + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(644,root,root,755) +%doc contrib/*.txt ACKNOWLEDGEMENTS CHANGELOG README* TODO +%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/mail/sa-exim.conf +%attr(755,root,root) %{_libdir}/exim/%{name}.so + +%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) +%changelog +* %{date} PLD Team <[EMAIL PROTECTED]> +All persons listed below can be reached at <cvs_login>@pld-linux.org + +$Log$ +Revision 1.1 2005/09/01 16:54:16 arekm +- drop sa-exim from exim.spec; new sa-exim.spec as local_scan plugin + ================================================================ Index: SPECS/exim.spec diff -u SPECS/exim.spec:1.244 SPECS/exim.spec:1.245 --- SPECS/exim.spec:1.244 Thu Sep 1 17:48:56 2005 +++ SPECS/exim.spec Thu Sep 1 18:54:16 2005 @@ -9,9 +9,7 @@ %bcond_without spf # without spf support %bcond_without srs # without srs support %bcond_without dkeys # without domainkeys support -%bcond_with saexim # with sa-exim support # -%define saexim_version 4.2 Summary: University of Cambridge Mail Transfer Agent Summary(pl): Agent Transferu Poczty Uniwersytetu w Cambridge Summary(pt_BR): Servidor de correio eletrĂ´nico exim @@ -43,8 +41,6 @@ # Source14-md5: 4b93321938a800caa6127c48ad60a42b Source15: %{name}4-smtp.pamd Source16: %{name}on.png -Source17: http://marc.merlins.org/linux/exim/files/sa-%{name}-%{saexim_version}.tar.gz -# Source17-md5: ad76f73c6b3d01caa88078e3e622745a Patch0: %{name}4-EDITME.patch Patch1: %{name}4-monitor-EDITME.patch Patch2: %{name}4-texinfo.patch @@ -163,7 +159,6 @@ %patch3 -p1 %patch4 -p1 %patch5 -p1 -%{?with_saexim:test -f %{SOURCE17} || exit 1; gzip -d -c %{SOURCE17} | tar -x || exit 1} install %{SOURCE13} doc/FAQ.txt.bz2 install %{SOURCE14} doc/config.samples.tar.bz2 @@ -173,16 +168,6 @@ cp -f exim_monitor/EDITME Local/eximon.conf %build - -%if %{with saexim} - cd sa-exim-%{saexim_version} - %{__make} -j1 sa-exim.h - echo '#define SPAMASSASSIN_CONF "%{_sysconfdir}/mail/spamassassin/local.cf"' >> sa-exim.h - cat sa-exim.c > ../src/local_scan.c - cat sa-exim.h > ../src/sa-exim.h - cd .. -%endif - %{__make} -j1 \ %{?debug:FULLECHO=''} \ CC="%{__cc}" \ @@ -228,8 +213,6 @@ install *.info* $RPM_BUILD_ROOT%{_infodir} install %{SOURCE15} $RPM_BUILD_ROOT/etc/pam.d/smtp -%{?with_saexim:install sa-exim-%{saexim_version}/sa-exim.conf $RPM_BUILD_ROOT/%{_sysconfdir}/mail/sa-exim.conf} - ln -sf %{_bindir}/exim $RPM_BUILD_ROOT%{_sbindir}/sendmail ln -sf %{_bindir}/exim $RPM_BUILD_ROOT%{_prefix}/lib/sendmail ln -sf %{_bindir}/exim $RPM_BUILD_ROOT%{_sbindir}/mailq @@ -297,7 +280,6 @@ %doc README* NOTICE LICENCE analyse-log-errors doc/{ChangeLog,NewStuff,dbm.discuss.txt,filter.txt,spec.txt,Exim*.upgrade,OptionLists.txt,experimental-spec.txt} build-Linux-*/transport-filter.pl %dir %{_sysconfdir}/mail %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/mail/exim.conf -%{?with_saexim:%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/mail/sa-exim.conf} %attr(644,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/mail/aliases %attr(644,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/exim %attr(644,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/exim @@ -349,6 +331,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.245 2005/09/01 16:54:16 arekm +- drop sa-exim from exim.spec; new sa-exim.spec as local_scan plugin + Revision 1.244 2005/09/01 15:48:56 arekm - add devel subpackage for local_scan modules; add dlopened local_scan modules support ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/exim.spec?r1=1.244&r2=1.245&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
