Author: glen Date: Mon May 25 00:09:25 2009 GMT Module: packages Tag: HEAD ---- Log message: - fix build with am 1.11, am support has always been troublesome in courier projects; rel 3
---- Files affected: packages/maildrop: maildrop.spec (1.57 -> 1.58) , maildrop-am-install.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/maildrop/maildrop.spec diff -u packages/maildrop/maildrop.spec:1.57 packages/maildrop/maildrop.spec:1.58 --- packages/maildrop/maildrop.spec:1.57 Sun Mar 15 23:52:15 2009 +++ packages/maildrop/maildrop.spec Mon May 25 02:09:19 2009 @@ -8,12 +8,13 @@ Summary(pl.UTF-8): maildrop - filtr pocztowy/dostarczyciel poczty Name: maildrop Version: 2.0.4 -Release: 2 +Release: 3 License: GPL v2 + OpenSSL exception Group: Applications/Mail Source0: http://dl.sourceforge.net/courier/%{name}-%{version}.tar.bz2 # Source0-md5: 6a760efe429716ab0be67a1ddc554ed7 Patch0: %{name}-db.patch +Patch1: %{name}-am-install.patch URL: http://www.courier-mta.org/maildrop/ BuildRequires: autoconf >= 2.59 BuildRequires: automake @@ -98,9 +99,12 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 -%build +# confuses libtoolize, old contents not overwritten somewhy +find -name 'aclocal.m4' | xargs rm +%build for d in . numlib liblock unicode rfc822 rfc2045 gdbmobj bdbobj makedat maildir maildrop; do cd $d %{__libtoolize} @@ -110,23 +114,21 @@ cd - done # Change Makefile.am files and force recreate Makefile.in's. -OLDDIR=`pwd` -find -type f -a \( -name configure.in -o -name configure.ac \) | while read FILE; do - cd "`dirname "$FILE"`" +top=$(pwd) +find -type f -a '(' -name configure.in -o -name configure.ac ')' | while read a; do + cd "$top/$(dirname "$a")" if [ -f Makefile.am ]; then sed -i -e '/_[L]DFLAGS=-static/d' Makefile.am fi %{__libtoolize} - %{__aclocal} + %{__aclocal} %{__autoconf} if grep -q AC_CONFIG_HEADER configure.in; then %{__autoheader} fi %{__automake} - - cd "$OLDDIR" done %configure \ @@ -140,9 +142,9 @@ --enable-maildrop-gid=maildrop \ --disable-userdb \ %{!?with_authlib:--disable-authlib} \ - --enable-sendmail=%{_sbindir}/sendmail + --enable-sendmail=/usr/lib/sendmail -%{__make} +%{__make} -j1 %install rm -rf $RPM_BUILD_ROOT @@ -240,6 +242,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.58 2009/05/25 00:09:19 glen +- fix build with am 1.11, am support has always been troublesome in courier projects; rel 3 + Revision 1.57 2009/03/15 22:52:15 hawk - better way for doing autofoo stuff in subdirs (from courier.spec) ================================================================ Index: packages/maildrop/maildrop-am-install.patch diff -u /dev/null packages/maildrop/maildrop-am-install.patch:1.1 --- /dev/null Mon May 25 02:09:25 2009 +++ packages/maildrop/maildrop-am-install.patch Mon May 25 02:09:19 2009 @@ -0,0 +1,11 @@ +--- maildrop-2.0.4/Makefile.am~ 2009-05-24 19:13:52.000000000 +0300 ++++ maildrop-2.0.4/Makefile.am 2009-05-25 01:19:13.482317443 +0300 +@@ -30,7 +30,7 @@ + if INSTALL_DELIVERQUOTA + + DELIVERQUOTAHTML=$(DELIVERQUOTAHTMLSOURCE) +-DELIVERQUOTAMAN=maildirquota.7 deliverquota.8 ++DELIVERQUOTAMAN= + + # Install deliverquota into libdir/bin + # ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/maildrop/maildrop.spec?r1=1.57&r2=1.58&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
