- added link.patch

- parallel build is broken

Changed files:
    link.patch -> 1.1
    mailutils.spec -> 1.30

diff --git a/link.patch b/link.patch
new file mode 100644 (file)
index 0000000..2bf526e
--- /dev/null
+++ b/link.patch
@@ -0,0 +1,36 @@
+--- mailutils-2.2/libmu_cfg/Makefile.am.orig   2010-11-14 17:43:28.442524932 +0100
++++ mailutils-2.2/libmu_cfg/Makefile.am        2010-11-14 17:45:43.179179479 +0100
+@@ -34,3 +34,5 @@ libmu_cfg_la_SOURCES=\
+  sql.c\
+  tls.c\
+  virtdomain.c
++
++libmu_cfg_la_LIBADD = $(top_builddir)/mailbox/libmailutils.la
+--- mailutils-2.2/libmu_cpp/Makefile.am.orig   2010-11-14 18:50:01.588792244 +0100
++++ mailutils-2.2/libmu_cpp/Makefile.am        2010-11-14 20:01:16.405029320 +0100
+@@ -46,6 +46,10 @@ libmu_cpp_la_SOURCES = \
+  stream.cc\
+  url.cc
+ 
+-libmu_cpp_la_LIBADD = @MU_COMMON_LIBRARIES@
++libmu_cpp_la_LIBADD = @MU_COMMON_LIBRARIES@ \
++                    $(top_builddir)/mailbox/libmailutils.la \
++                    $(top_builddir)/libproto/pop/libmu_pop.la \
++                    $(top_builddir)/libmu_sieve/libmu_sieve.la
++
+ libmu_cpp_la_LDFLAGS = -rpath $(libdir)  -version-info @VI_CURRENT@:@VI_REVISION@:@VI_AGE@
+ 
+--- mailutils-2.2/Makefile.am.orig     2010-11-14 20:10:30.638307733 +0100
++++ mailutils-2.2/Makefile.am  2010-11-14 20:10:38.068306933 +0100
+@@ -101,10 +101,10 @@ SUBDIRS = \
+  lib\
+  libmu_argp\
+  libmu_cfg\
+- $(LIBMU_CPP_DIR)\
+  $(GINT_DIR)\
+  $(LIBMU_SCM_DIR)\
+  libmu_sieve\
++ $(LIBMU_CPP_DIR)\
+  $(PYTHON_DIR)\
+  doc\
+  config\

diff --git a/mailutils.spec b/mailutils.spec
index abcb114b5ca3e157da1f52c70bb6dc1f77b0e2f9..0fdbffbc959ccba4418a626e696826f5564a473c 100644 (file)
--- a/mailutils.spec
+++ b/mailutils.spec
@@ -20,6 +20,7 @@ Source0:      http://ftp.gnu.org/gnu/mailutils/%{name}-%{version}.tar.lzma
 # Source0-md5: 9cd0b3af77df3442665d1a12c329b807
 Patch0:                %{name}-info.patch
 Patch1:                %{name}-tinfo.patch
 # Source0-md5: 9cd0b3af77df3442665d1a12c329b807
 Patch0:                %{name}-info.patch
 Patch1:                %{name}-tinfo.patch

+Patch2:                link.patch

 URL:           http://www.gnu.org/software/mailutils/mailutils.html
 BuildRequires: autoconf >= 2.63
 BuildRequires: automake >= 1:1.11
 URL:           http://www.gnu.org/software/mailutils/mailutils.html
 BuildRequires: autoconf >= 2.63
 BuildRequires: automake >= 1:1.11


@@ -156,6 +157,7 @@ skrzynek pocztowych.
 %setup -q
 %patch0 -p1
 %patch1 -p0
 %setup -q
 %patch0 -p1
 %patch1 -p0

+%patch2 -p1

 
 %{__rm} po/stamp-po
 
 
 %{__rm} po/stamp-po
 


@@ -176,12 +178,12 @@ skrzynek pocztowych.
        --with-odbc=odbc \
        --with-postgres
 
        --with-odbc=odbc \
        --with-postgres
 

-%{__make}
+%{__make} -j1

 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 

-%{__make} install \
+%{__make} -j1 install \

        DESTDIR=$RPM_BUILD_ROOT
 
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/mailutils/*.{la,a}
        DESTDIR=$RPM_BUILD_ROOT
 
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/mailutils/*.{la,a}