OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 28-Dec-2006 21:12:34
Branch: HEAD Handle: 2006122820123400
Modified files:
openpkg-src/sendmail sendmail.spec
Log:
make with_milter=yes just build the MILTER server-side into Sendmail,
but no longer build and install the client-side (libmilter) as this
will be soon provided by a separate 'milter' package
Summary:
Revision Changes Path
1.135 +1 -25 openpkg-src/sendmail/sendmail.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/sendmail/sendmail.spec
============================================================================
$ cvs diff -u -r1.134 -r1.135 sendmail.spec
--- openpkg-src/sendmail/sendmail.spec 22 Oct 2006 18:01:29 -0000
1.134
+++ openpkg-src/sendmail/sendmail.spec 28 Dec 2006 20:12:34 -0000
1.135
@@ -33,7 +33,7 @@
Group: Mail
License: BSD
Version: 8.13.8
-Release: 20061022
+Release: 20061228
# package options
%option with_fsl yes
@@ -195,7 +195,6 @@
%endif
%if "%{with_milter}" == "yes"
echo "APPENDDEF(\`conf_sendmail_ENVDEF', \`-DMILTER=1')dnl"
- echo "APPENDDEF(\`conf_libmilter_ENVDEF',
\`-D_FFR_MILTER_ROOT_UNSAFE')dnl"
%else
echo "APPENDDEF(\`conf_sendmail_ENVDEF', \`-DMILTER=0')dnl"
%endif
@@ -211,7 +210,6 @@
%endif
%if "%{with_ipv6}" == "yes"
echo "APPENDDEF(\`conf_sendmail_ENVDEF', \`-DNETINET6')dnl"
- echo "APPENDDEF(\`conf_libmilter_ENVDEF', \`-DNETINET6')dnl"
%endif
echo "APPENDDEF(\`conf_sendmail_ENVDEF', \`-DPICKY_HELO_CHECK')dnl"
%if "%{with_socketmap}" == "yes"
@@ -222,13 +220,6 @@
# build Sendmail package
%{l_make} %{l_mflags}
-%if "%{with_milter}" == "yes"
- # have to separately invoke "Build" script in libmilter dir
- ( cd libmilter
- ./Build
- ) || exit $?
-%endif
-
%install
rm -rf $RPM_BUILD_ROOT
@@ -256,21 +247,6 @@
mv $RPM_BUILD_ROOT%{l_prefix}/bin/rmail \
$RPM_BUILD_ROOT%{l_prefix}/sbin/rmail
-%if "%{with_milter}" == "yes"
- # install libraries and includes for building milters
- %{l_shtool} mkdir -f -p -m 755 \
- $RPM_BUILD_ROOT%{l_prefix}/include/libmilter
- %{l_shtool} install -c -m 644 \
- include/libmilter/*.h \
- $RPM_BUILD_ROOT%{l_prefix}/include/libmilter/
- %{l_shtool} install -c -m 644 \
- obj.*/libsm/libsm.a \
- obj.*/libsmutil/libsmutil.a \
- obj.*/libsmdb/libsmdb.a \
- obj.*/libmilter/libmilter.a \
- $RPM_BUILD_ROOT%{l_prefix}/lib/
-%endif
-
# remember the Sendmail M4 stuff for re-configuration
( %{l_tar} cf $RPM_BUILD_ROOT%{l_prefix}/etc/sendmail/cf.tar cf ) ||
exit $?
%{l_gzip} $RPM_BUILD_ROOT%{l_prefix}/etc/sendmail/cf.tar
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
