--- a/ChangeLog	Tue Jan 24 10:14:12 2006 +0000
+++ b/ChangeLog	Tue Jan 24 10:32:32 2006 +0000
@@ -1,3 +1,7 @@
+2006-01-24  Halton Huo <[email protected]>
+
+	* evolution-jescs.spec: Remove hard code evo_major_version and eds_api_version.
+
 2006-01-24  Halton Huo <[email protected]>
 
 	* evolution-jescs.spec: Bump to 2.5.0.

--- a/Solaris/ChangeLog	Tue Jan 24 10:14:12 2006 +0000
+++ b/Solaris/ChangeLog	Tue Jan 24 10:32:32 2006 +0000
@@ -1,3 +1,8 @@
+2006-01-24  Halton Huo <[email protected]>
+
+	* SUNWevolution-jescs.spec: Remove hard code %{evojescs.eds_api_version},
+	  Remove *.la under /usr/lib when install.
+
 2006-01-24  Halton Huo <[email protected]>
 
 	* SUNWevolution-jescs.spec: 

--- a/Solaris/SUNWevolution-jescs.spec	Tue Jan 24 10:14:12 2006 +0000
+++ b/Solaris/SUNWevolution-jescs.spec	Tue Jan 24 10:32:32 2006 +0000
@@ -60,6 +60,7 @@
 
 %install
 %evojescs.install -d %name-%version
+find $RPM_BUILD_ROOT%{_libdir} -name "*.la" -exec rm -rf {} \;
 
 %if %build_l10n
 %else
@@ -77,7 +78,7 @@
 %dir %attr (0755, root, bin) %{_libdir}
 %{_libdir}/bonobo
 %{_libdir}/evolution
-%{_libdir}/evolution-data-server-%{evojescs.eds_api_version}
+%{_libdir}/evolution-data-server-*
 
 %files share
 %defattr (0755, root, other)
@@ -94,6 +95,10 @@
 
 %changelog
 * Tue Jan 24 2006 - [email protected]
+- Remove hard code %{evojescs.eds_api_version}.
+- Remove *.la under /usr/lib when install.
+
+* Tue Jan 24 2006 - [email protected]
 - s/evolution-data-server-1.2/evolution-data-server-%{evojescs.eds_api_version}/g
 
 * Wed Dec  7 2005 - [email protected]

--- a/evolution-jescs.spec	Tue Jan 24 10:14:12 2006 +0000
+++ b/evolution-jescs.spec	Tue Jan 24 10:32:32 2006 +0000
@@ -6,11 +6,6 @@
 # package are under the same license as the package itself.
 #
 
-%define evo_major_version 2.6
-%define eds_api_version 1.2
-
-%define evolution_libdir %(echo `PKG_CONFIG_PATH=%{_libdir}/pkgconfig:/usr/lib/pkgconfig pkg-config --variable privlibdir evolution-shell-%{evo_major_version}`)
-
 Name:         evolution-jescs
 License:      GPL
 Group:        System/Libraries/GNOME
@@ -80,8 +75,6 @@
 
 %install
 make -i install DESTDIR=$RPM_BUILD_ROOT
-rm $RPM_BUILD_ROOT%{_libdir}/evolution-data-server-%{eds_api_version}/camel-providers/libcamelsunone.la
-rm $RPM_BUILD_ROOT%{evolution_libdir}/libwcapcalendar.la
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -99,6 +92,9 @@
 
 %changelog
 * Tue Jan 24 2006 - [email protected]
+- Remove hard code evo_major_version and eds_api_version.
+
+* Tue Jan 24 2006 - [email protected]
 - Bump to 2.5.0.
 - Add define evo_major_version and eds_api_version.
 - Remove define evolution_imagesdir.