- apply reorder libs patch from asneeded.patch

Changed files:
    cyrus-imapd-shared.patch -> 1.18
    cyrus-imapd.spec -> 1.147

diff --git a/cyrus-imapd-shared.patch b/cyrus-imapd-shared.patch
index 97c8d33117fe8a4be9595d10803f412b37988a19..d4a7143dc6e44736e8c0c795a9c84d9e32d6ea9b 100644 (file)
--- a/cyrus-imapd-shared.patch
+++ b/cyrus-imapd-shared.patch
@@ -905,7 +905,7 @@
  
  sieved: sieved.lo libsieve.la $(DEPLIBS)
 -      $(CC) $(LDFLAGS) -o $@ $? $(LIBS)
-+      $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? $(LIBS)
++      $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ sieved.lo libsieve.la $(LIBS) $(DEPLIBS)
  
  
  sieve_interface.h: sieve_err.h

diff --git a/cyrus-imapd.spec b/cyrus-imapd.spec
index 29bd0ae98e4fcc8576dd460ca81e490ed8428599..1507abc737f982ebb6b286a9f06f1dab37ee9c63 100644 (file)
--- a/cyrus-imapd.spec
+++ b/cyrus-imapd.spec
@@ -78,9 +78,6 @@ BuildRoot:    %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _libexecdir     %{_libdir}/cyrus
 
-# mixing .a and .la and .so fails here, blame shared patch?
-%define                filterout_ld    -Wl,--no-copy-dt-needed-entries
-
 %description
 The Cyrus IMAP server is a scalable enterprise mail system designed
 for use from small to large enterprise environments using