--- a/ChangeLog	Thu Dec 29 01:14:09 2005 +0000
+++ b/ChangeLog	Tue Jan 24 11:56:37 2006 +0000
@@ -1,3 +1,9 @@
+2006-01-24  Halton Huo <[email protected]>
+
+	* evolution-jescs.spec: Bump to 2.4.4,
+	  Remove unused define evolution_imagesdir and evolution_libsdir,
+	  Remove hard code 1.2, 2.4.
+
 2005-12-28  Brian Cameron  <[email protected]>
 
 	* gst-plugins.spec, patches/gst-plugins-03-mixer.diff:  Fix

--- a/Solaris/ChangeLog	Thu Dec 29 01:14:09 2005 +0000
+++ b/Solaris/ChangeLog	Tue Jan 24 11:56:37 2006 +0000
@@ -1,3 +1,8 @@
+2006-01-24  Halton Huo <[email protected]>
+
+	* SUNWevolution-jescs.spec: Remove *.la under /usr/lib when install,
+	  s/evolution-data-server-1.2/evolution-data-server-*/g.
+
 2005-12-21  Irene Huang <[email protected]>
 
 	* patches/evolution-data-server-03-libexec.diff: Change install

--- a/Solaris/SUNWevolution-jescs.spec	Thu Dec 29 01:14:09 2005 +0000
+++ b/Solaris/SUNWevolution-jescs.spec	Tue Jan 24 11:56:37 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-1.2
+%{_libdir}/evolution-data-server-*
 
 %files share
 %defattr (0755, root, other)
@@ -93,6 +94,10 @@
 %endif
 
 %changelog
+* Tue Jan 24 2006 - [email protected]
+- Remove *.la under /usr/lib when install.
+- s/evolution-data-server-1.2/evolution-data-server-*/g.
+
 * Wed Dec  7 2005 - [email protected]
 - disable -Bdirect as due to symbol clashes
 

--- a/evolution-jescs.spec	Thu Dec 29 01:14:09 2005 +0000
+++ b/evolution-jescs.spec	Tue Jan 24 11:56:37 2006 +0000
@@ -6,14 +6,10 @@
 # package are under the same license as the package itself.
 #
 
-%define evolution_imagesdir %(echo `PKG_CONFIG_PATH=%{_libdir}/pkgconfig:/usr/lib/pkgconfig pkg-config --variable imagesdir evolution-shell-2.4>/dev/null`)
-
-%define evolution_libdir %(echo `PKG_CONFIG_PATH=%{_libdir}/pkgconfig:/usr/lib/pkgconfig pkg-config --variable privlibdir evolution-shell-2.4>/dev/null`)
-
 Name:         evolution-jescs
 License:      GPL
 Group:        System/Libraries/GNOME
-Version:      2.4.3
+Version:      2.4.4
 Release:      1
 Distribution: Java Desktop System
 Vendor:       Sun Microsystems, Inc.
@@ -79,8 +75,6 @@
 
 %install
 make -i install DESTDIR=$RPM_BUILD_ROOT
-rm $RPM_BUILD_ROOT%{_libdir}/evolution-data-server-1.2/camel-providers/libcamelsunone.la
-rm $RPM_BUILD_ROOT%{_libdir}/evolution/2.4/libwcapcalendar.la
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -91,12 +85,17 @@
 %{_libdir}/bonobo/servers/GNOME_Evolution_SunOne_Storage.server
 %{_libdir}/evolution
 %{_libexecdir}/evolution
-%{_libdir}/evolution-data-server-1.2
+%{_libdir}/evolution-data-server-*
 %{_datadir}/evolution
 %{_datadir}/evolution-jescs
 %{_datadir}/locale/*/LC_MESSAGES/*.mo
 
 %changelog
+* Tue Jan 24 2006 - [email protected]
+- Bump to 2.4.4.
+- Remove unused define evolution_imagesdir and evolution_libsdir.
+- Remove hard code 1.2, 2.4.
+
 * Fri Nov 25 2005 - [email protected]
 - Bump to 2.4.3.