- lib64 fix

Changed files:
    amavisd-new-lib64.patch -> 1.1
    amavisd-new.spec -> 1.60

diff --git a/amavisd-new-lib64.patch b/amavisd-new-lib64.patch
new file mode 100644 (file)
index 0000000..9e79965
--- /dev/null
+++ b/amavisd-new-lib64.patch
@@ -0,0 +1,22 @@
+diff -dur amavisd-new-20040701.orig/helper-progs/configure.in amavisd-new-20040701/helper-progs/configure.in
+--- amavisd-new-20040701.orig/helper-progs/configure.in        2004-04-11 01:51:52.000000000 +0200
++++ amavisd-new-20040701/helper-progs/configure.in     2004-08-02 11:07:56.608560250 +0200
+@@ -138,14 +138,14 @@
+ 
+ dnl find libmilter.a and libsm.a
+ SMPATH=`echo ../sendmail-*/obj.*/libmilter`
+-AC_PATH_PROG(LIBMILTER, libmilter.a, no, $MILTERLIB:$SMPATH:/usr/local/lib:/lib:/usr/lib:/usr/lib/libmilter)
++AC_PATH_PROG(LIBMILTER, libmilter.a, no, $MILTERLIB:$SMPATH:/usr/local/lib64:/lib64:/usr/lib64:/usr/lib64/libmilter)
+ SMPATH=`echo ../sendmail-*/obj.*/libsm`
+-AC_PATH_PROG(LIBSM, libsm.a, no, $SMPATH:/usr/local/lib:/lib:/usr/lib:/usr/lib/libmilter)
++AC_PATH_PROG(LIBSM, libsm.a, no, $SMPATH:/usr/local/lib64:/lib64:/usr/lib64:/usr/lib64/libmilter)
+ if test "$LIBSM" = "no" ; then
+       # try libsmutil
+       unset ac_cv_path_LIBSM
+       SMPATH=`echo ../sendmail-*/obj.*/libsmutil`
+-      AC_PATH_PROG(LIBSM, libsmutil.a, no, $SMPATH:/usr/local/lib:/lib:/usr/lib:/usr/lib/libmilter)
++      AC_PATH_PROG(LIBSM, libsmutil.a, no, $SMPATH:/usr/local/lib64:/lib64:/usr/lib64:/usr/lib64/libmilter)
+ fi
+ 
+ dnl find Sendmail
+Only in amavisd-new-20040701/helper-progs: configure.in~

diff --git a/amavisd-new.spec b/amavisd-new.spec
index 7ca7271fdcbc54ea5c8026beeb17d46a92fa624f..f93e4ff783eb7738e9052031035d44331d3992d3 100644 (file)
--- a/amavisd-new.spec
+++ b/amavisd-new.spec
@@ -7,7 +7,7 @@ Summary:        A Mail Virus Scanner with SpamAssassin support - daemon
 Summary(pl):   Antywirusowy skaner poczty elektronicznej z obs³ug± SpamAssasina - demon
 Name:          amavisd-new
 Version:       20040701
-Release:       1
+Release:       2
 License:       GPL
 Group:         Applications/Mail
 Source0:       http://www.ijs.si/software/amavisd/%{name}-%{version}.tar.gz
@@ -16,7 +16,8 @@ Source1:      %{name}.init
 Source2:       %{name}-milter.init
 Patch0:                %{name}-config.patch
 Patch1:                %{name}-dirperms.patch
-#Patch2:               http://www.ijs.si/software/amavisd/amavisd-new-20030616-p8a.patch
+Patch2:                %{name}-lib64.patch
+#Patch3:               http://www.ijs.si/software/amavisd/amavisd-new-20030616-p8a.patch
 URL:           http://www.ijs.si/software/amavisd/
 BuildRequires: arc
 BuildRequires: autoconf
@@ -105,9 +106,13 @@ Pakiet ten zawiera back-end dla sendmaila.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%if "%{_lib}" == "lib64"
+%patch2 -p1
+%endif
 
 %build
 cd helper-progs
+autoconf
 ./configure --with-sendmail=/usr/sbin/sendmail \
        --with-runtime-dir=/var/spool/amavis/runtime \
        --with-sockname=/var/spool/amavis/runtime/amavisd.sock