rpms/evolution-exchange/devel evolution-exchange-2.29.3-add-ldap-libs.patch, 1.2, 1.3 evolution-exchange.spec, 1.83, 1.84

[Milan Crha]

Author: mcrha

Update of /cvs/pkgs/rpms/evolution-exchange/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18157

Modified Files:
	evolution-exchange-2.29.3-add-ldap-libs.patch 
	evolution-exchange.spec 
Log Message:
Fix xxx_LIBS in Makefile.am and delete camel's .la file.


evolution-exchange-2.29.3-add-ldap-libs.patch:
 addressbook/Makefile.am |    1 +
 server/lib/Makefile.am  |    7 +++++++
 2 files changed, 8 insertions(+)

Index: evolution-exchange-2.29.3-add-ldap-libs.patch
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-exchange/devel/evolution-exchange-2.29.3-add-ldap-libs.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- evolution-exchange-2.29.3-add-ldap-libs.patch	1 Dec 2009 12:01:18 -0000	1.2
+++ evolution-exchange-2.29.3-add-ldap-libs.patch	1 Dec 2009 17:39:35 -0000	1.3
@@ -18,10 +18,10 @@ diff -up evolution-exchange-2.29.3/serve
  
 +libexchange_la_LIBADD = \
 +	$(LDAP_LIBS) \
-+	$(KRB5_LIBSS) \
-+	$(SOUP_LIBSS) \
-+	$(GNOME_PLATFORM_LIBSS) \
-+	$(EVOLUTION_DATA_SERVER_LIBSS)
++	$(KRB5_LIBS) \
++	$(SOUP_LIBS) \
++	$(GNOME_PLATFORM_LIBS) \
++	$(EVOLUTION_DATA_SERVER_LIBS)
 +
  libexchange_la_SOURCES = \
  	$(MARSHAL_GENERATED) \


Index: evolution-exchange.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-exchange/devel/evolution-exchange.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -p -r1.83 -r1.84
--- evolution-exchange.spec	1 Dec 2009 11:48:11 -0000	1.83
+++ evolution-exchange.spec	1 Dec 2009 17:39:35 -0000	1.84
@@ -93,6 +93,7 @@ make DESTDIR=$RPM_BUILD_ROOT install
 rm -f $RPM_BUILD_ROOT/%{_libdir}/evolution-data-server-1.2/extensions/libebookbackendexchange.la
 rm -f $RPM_BUILD_ROOT/%{_libdir}/evolution-data-server-1.2/extensions/libecalbackendexchange.la
 rm -f $RPM_BUILD_ROOT/%{_libdir}/evolution-data-server-1.2/camel-providers/*.a
+rm -f $RPM_BUILD_ROOT/%{_libdir}/evolution-data-server-1.2/camel-providers/libcamelexchange.la
 rm -f $RPM_BUILD_ROOT/%{_libdir}/evolution/%{evo_major}/plugins/liborg-gnome-exchange-operations.la
 
 %find_lang evolution-exchange-%{evo_major}
@@ -111,7 +112,6 @@ gconftool-2 --makefile-install-rule %{_s
 %doc docs/http
 %{_bindir}/exchange-connector-setup-%{evo_major}
 %{_libdir}/evolution-data-server-1.2/camel-providers/libcamelexchange.so
-%{_libdir}/evolution-data-server-1.2/camel-providers/libcamelexchange.la
 %{_libdir}/evolution-data-server-1.2/camel-providers/libcamelexchange.urls
 %{_libdir}/evolution-data-server-1.2/extensions/libebookbackendexchange.so
 %{_libdir}/evolution-data-server-1.2/extensions/libecalbackendexchange.so