packages: cyrus-imapd/cyrus-imapd-shared.patch, cyrus-imapd/cyrus-imapd.spe...

[glen]

Author: glen                         Date: Tue Nov 30 07:16:34 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- apply reorder libs patch from asneeded.patch

---- Files affected:
packages/cyrus-imapd:
   cyrus-imapd-shared.patch (1.17 -> 1.18) , cyrus-imapd.spec (1.146 -> 1.147) 

---- Diffs:

================================================================
Index: packages/cyrus-imapd/cyrus-imapd-shared.patch
diff -u packages/cyrus-imapd/cyrus-imapd-shared.patch:1.17 packages/cyrus-imapd/cyrus-imapd-shared.patch:1.18
--- packages/cyrus-imapd/cyrus-imapd-shared.patch:1.17	Tue Nov 30 07:43:11 2010
+++ packages/cyrus-imapd/cyrus-imapd-shared.patch	Tue Nov 30 08:16:29 2010
@@ -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

================================================================
Index: packages/cyrus-imapd/cyrus-imapd.spec
diff -u packages/cyrus-imapd/cyrus-imapd.spec:1.146 packages/cyrus-imapd/cyrus-imapd.spec:1.147
--- packages/cyrus-imapd/cyrus-imapd.spec:1.146	Tue Nov 30 08:11:51 2010
+++ packages/cyrus-imapd/cyrus-imapd.spec	Tue Nov 30 08:16:29 2010
@@ -79,9 +79,6 @@
 
 %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
@@ -429,6 +426,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.147  2010/11/30 07:16:29  glen
+- apply reorder libs patch from asneeded.patch
+
 Revision 1.146  2010/11/30 07:11:51  glen
 - add -doc with html docs
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/cyrus-imapd/cyrus-imapd-shared.patch?r1=1.17&r2=1.18&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/cyrus-imapd/cyrus-imapd.spec?r1=1.146&r2=1.147&f=u