From e3a8fab66a2540e1e5f39e2cb99cc9ffce9b8a76fcc83512f6a9051cd90aa090 Mon Sep 17 00:00:00 2001
From: Lars Vogdt <lrupp@suse.com>
Date: Mon, 5 Sep 2011 14:16:44 +0000
Subject: [PATCH] Accepting request 80798 from server:mail

- Fix build with no-add-needed (forwarded request 80797 from elvigia)

OBS-URL: https://build.opensuse.org/request/show/80798
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/alpine?expand=0&rev=19
---
 alpine-no-add-needed.patch | 24 ++++++++++++++++++++++++
 alpine.changes             |  5 +++++
 alpine.spec                |  6 +++---
 3 files changed, 32 insertions(+), 3 deletions(-)
 create mode 100644 alpine-no-add-needed.patch

diff --git a/alpine-no-add-needed.patch b/alpine-no-add-needed.patch
new file mode 100644
index 0000000..ffae4e7
--- /dev/null
+++ b/alpine-no-add-needed.patch
@@ -0,0 +1,24 @@
+--- alpine/Makefile.am.orig
++++ alpine/Makefile.am
+@@ -35,7 +35,7 @@ BUILT_SOURCES = date.c
+ LDADD = ../pico/libpico.a ../pico/osdep/libpicoosd.a \
+ 	../pith/libpith.a ../pith/osdep/libpithosd.a  \
+ 	../pith/charconv/libpithcc.a \
+-	osdep/libpineosd.a ../c-client/c-client.a
++	osdep/libpineosd.a ../c-client/c-client.a -lkrb5 -lcrypto
+ 
+ AM_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include -DLOCALEDIR=\"$(localedir)\"
+ 
+--- configure.ac.orig
++++ configure.ac
+@@ -37,8 +37,9 @@ WEB_BUILD=web/src/alpined.d
+ 
+ dnl CHECK PROGRAMS
+ 
+-AC_PROG_CC
+ AC_PROG_CC_STDC
++AC_USE_SYSTEM_EXTENSIONS
++AC_SYS_LARGEFILE
+ AC_PROG_INSTALL
+ AC_PROG_MAKE_SET
+ AC_PROG_LN_S
diff --git a/alpine.changes b/alpine.changes
index 4462656..049075f 100644
--- a/alpine.changes
+++ b/alpine.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sat Sep  3 18:53:17 UTC 2011 - crrodriguez@opensuse.org
+
+- Fix build with no-add-needed 
+
 -------------------------------------------------------------------
 Tue Nov  3 19:09:05 UTC 2009 - coolo@novell.com
 
diff --git a/alpine.spec b/alpine.spec
index 59ebb45..0e6ff52 100644
--- a/alpine.spec
+++ b/alpine.spec
@@ -86,6 +86,7 @@ Patch609:       chappa-streamlock.patch.gz
 Patch610:       chappa-filterflagbug.patch.gz
 Patch611:       chappa-nlinfobug.patch.gz
 Patch612:       chappa-unverified.patch.gz
+Patch613:       alpine-no-add-needed.patch
 
 %description
 Though originally designed for inexperienced email users, Alpine
@@ -164,6 +165,7 @@ fi
 %patch610 -p1
 %patch611 -p1
 %patch612 -p1
+%patch613
 #
 # SuSE patches - warning fixes, etc:
 #
@@ -180,8 +182,6 @@ fi
 %endif # End of "if !{build_vanilla}"
 
 %build
-# Needed because of alpine-2.00-as_needed.patch
-autoreconf -fi
 # Workaround for older distros which slashed the gnu:
 %if %{suse_version} <= 1010
 %define _host_os %{_os}%{?_gnu}
@@ -233,7 +233,7 @@ export EXTRALDFLAGS="-lmudflap"
 #export EXTRALDFLAGS="-lmudflapir"
 LDFLAGS="$LDFLAGS $EXTRALDFLAGS"
 %endif
-:
+autoreconf -fiv
 %configure \
 %if %{use_mudflap}
 	%( : 'mudflap(th) does not work with with threads:' )\