rpms/evolution-connector/devel evolution-exchange-2.11.2-fix-library-order.patch, NONE, 1.1 evolution-connector.spec, 1.102, 1.103

[Matthew Barnes (mbarnes)]

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution-connector/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27434

Modified Files:
	evolution-connector.spec 
Added Files:
	evolution-exchange-2.11.2-fix-library-order.patch 
Log Message:

* Fri Jun 01 2007 Matthew Barnes <mbarnes at redhat.com> - 2.11.2-2.fc8
- List static ldap libraries in the proper order.
- Compile with -Werror.


evolution-exchange-2.11.2-fix-library-order.patch:

--- NEW FILE evolution-exchange-2.11.2-fix-library-order.patch ---
--- evolution-exchange-2.10.2/storage/Makefile.am.fix-library-order	2007-06-01 12:50:45.000000000 -0400
+++ evolution-exchange-2.10.2/storage/Makefile.am	2007-06-01 12:51:35.000000000 -0400
@@ -43,9 +43,9 @@ evolution_exchange_storage_LDADD =				\
 	$(top_builddir)/addressbook/libexchangeaddressbook.la	\
 	$(top_builddir)/calendar/libexchangecalendar.la		\
 	$(top_builddir)/camel/camel-stub-marshal.lo		\
-	$(LDAP_LIBS)						\
 	$(EXCHANGE_STORAGE_LIBS)				\
-	$(LIBEXCHANGE_LIBS)
+	$(LIBEXCHANGE_LIBS)					\
+	$(LDAP_LIBS)						
 
 
 exchange_connector_setup_SOURCES =				\
@@ -55,9 +55,9 @@ exchange_connector_setup_SOURCES =				\
 	exchange-autoconfig-wizard.c
 
 exchange_connector_setup_LDADD =				\
-	$(LDAP_LIBS)						\
 	$(EXCHANGE_STORAGE_LIBS)				\
-	$(LIBEXCHANGE_LIBS)
+	$(LIBEXCHANGE_LIBS)					\
+	$(LDAP_LIBS)
 
 install-exec-local: exchange-connector-setup
 	$(mkinstalldirs) $(DESTDIR)$(bindir)
@@ -71,9 +71,9 @@ migr_test_SOURCES =						\
 	exchange-migrate.h
 
 migr_test_LDADD = 						\
-	$(LDAP_LIBS)						\
 	$(EXCHANGE_STORAGE_LIBS)				\
-	$(LIBEXCHANGE_LIBS)
+	$(LIBEXCHANGE_LIBS)					\
+	$(LDAP_LIBS)
 
 serverdir = $(libdir)/bonobo/servers
 server_in_files = GNOME_Evolution_Exchange_Storage.server.in.in


Index: evolution-connector.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-connector/devel/evolution-connector.spec,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- evolution-connector.spec	19 May 2007 03:09:08 -0000	1.102
+++ evolution-connector.spec	1 Jun 2007 17:45:18 -0000	1.103
@@ -24,7 +24,7 @@
 
 Name: evolution-connector
 Version: 2.11.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: Applications/Productivity
 Summary: Evolution plugin to interact with MS Exchange Server
@@ -44,6 +44,9 @@
 # GNOME bug #439579
 Patch14: evolution-exchange-2.11.2-deprecated-eds.patch
 
+# List libraries in the correct order.
+Patch15: evolution-exchange-2.11.2-fix-library-order.patch
+
 ### Dependencies ###
 
 Requires: db4
@@ -82,6 +85,7 @@
 #%patch12 -p1 -b .fix-marshaller
 %patch13 -p1 -b .no_gnome_common
 %patch14 -p1 -b .deprecated-eds
+%patch15 -p1 -b .fix-library-order
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS -DLDAP_DEPRECATED"
@@ -111,7 +115,8 @@
 	-DGNOME_DISABLE_DEPRECATED=1 \
 	-DEDS_DISABLE_DEPRECATED=1 \
 	-Wdeclaration-after-statement \
-	-Werror-implicit-function-declaration"
+	-Werror-implicit-function-declaration \
+	-Werror"
 %endif
 
 # Regenerate configure to pick up acinclude.m4 changes
@@ -155,6 +160,10 @@
 %{_sysconfdir}/gconf/schemas/apps_exchange_addressbook-%{evo_major}.schemas
 
 %changelog
+* Fri Jun 01 2007 Matthew Barnes <mbarnes at redhat.com> - 2.11.2-2.fc8
+- List static ldap libraries in the proper order.
+- Compile with -Werror.
+
 * Fri May 18 2007 Matthew Barnes <mbarnes at redhat.com> - 2.11.2-1.fc8
 - Update to 2.11.2
 - Bump evo_version to 2.11.0, eds_version to 1.11.0, and evo_major to 2.12.