rpms/evolution-exchange/F-12 evolution-exchange.spec,1.76,1.77

[Matthew Barnes]

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution-exchange/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29992

Modified Files:
	evolution-exchange.spec 
Log Message:

* Fri Feb 12 2010 Matthew Barnes <mbarnes at redhat.com> - 2.28.2-2.fc12
- Don't install libcamelexchange.la.



Index: evolution-exchange.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-exchange/F-12/evolution-exchange.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -p -r1.76 -r1.77
--- evolution-exchange.spec	14 Dec 2009 15:37:29 -0000	1.76
+++ evolution-exchange.spec	13 Feb 2010 03:47:36 -0000	1.77
@@ -2,7 +2,6 @@
 %define libsoup_version 2.3.0
 
 %define evo_major 2.28
-%define eds_major 1.2
 
 # Make sure the evolution package is upgraded first, or else this variable
 # will come up empty and lead to the following libtool error.
@@ -18,7 +17,7 @@
 
 Name: evolution-exchange
 Version: 2.28.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: Applications/Productivity
 Summary: Evolution plugin to interact with MS Exchange Server
 License: GPLv2+
@@ -88,7 +87,10 @@ make %{?_smp_mflags} LDFLAGS="-R %{plibd
 %install
 [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
-rm -f $RPM_BUILD_ROOT/%{_libdir}/evolution-data-server-%{eds_major}/camel-providers/*.a
+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}
 
 %post
@@ -105,9 +107,8 @@ gconftool-2 --makefile-install-rule %{_s
 %doc docs/http
 %{_bindir}/exchange-connector-setup-%{evo_major}
 %{_libdir}/bonobo/servers/GNOME_Evolution_Exchange_Storage_%{evo_major}.server
-%{_libdir}/evolution-data-server-%{eds_major}/camel-providers/libcamelexchange.so
-%{_libdir}/evolution-data-server-%{eds_major}/camel-providers/libcamelexchange.la
-%{_libdir}/evolution-data-server-%{eds_major}/camel-providers/libcamelexchange.urls
+%{_libdir}/evolution-data-server-1.2/camel-providers/libcamelexchange.so
+%{_libdir}/evolution-data-server-1.2/camel-providers/libcamelexchange.urls
 %{_libexecdir}/evolution/%{evo_major}/evolution-exchange-storage 
 %{_datadir}/gtk-doc/html/evolution-exchange
 %dir %{_datadir}/evolution-exchange
@@ -121,6 +122,9 @@ gconftool-2 --makefile-install-rule %{_s
 %{_sysconfdir}/gconf/schemas/apps_exchange_addressbook-%{evo_major}.schemas
 
 %changelog
+* Fri Feb 12 2010 Matthew Barnes <mbarnes at redhat.com> - 2.28.2-2.fc12
+- Don't install libcamelexchange.la.
+
 * Mon Dec 14 2009 Milan Crha <mcrha at redhat.com> - 2.28.2-1.fc12
 - Update to 2.28.2