--- a/ChangeLog	Mon Nov 05 06:02:30 2007 +0000
+++ b/ChangeLog	Mon Nov 05 10:46:34 2007 +0000
@@ -1,3 +1,10 @@
+2007-11-05 Jijun Yu <[email protected]>
+
+	* SFElibopensync.spec: add some files into the package.
+	* base-specs/libopensync.spec: bump to 0.34.
+	* patches/libopensync-01-add-glib.diff: removed.
+	* patches/libopensync-01-prefix.diff: added.
+
 2007-11-05  Halton Huo <[email protected]>
 
 	* SFEtracker.spec: revert to 619, add /usr/gnu staff back since

--- a/SFElibopensync.spec	Mon Nov 05 06:02:30 2007 +0000
+++ b/SFElibopensync.spec	Mon Nov 05 10:46:34 2007 +0000
@@ -28,7 +28,7 @@
 Requires: SUNWzlib
 Requires: SFEsqlite
 Requires: SFEswig
-BuildRequires: SFEscons
+BuildRequires: SFEcmake
 BuildRequires: SFEcheck
 
 %package devel
@@ -64,6 +64,9 @@
 %dir %attr (0755, root, bin) %{_libdir}
 %{_libdir}/opensync
 %{_libdir}/*.so*
+%dir %attr (0755, root, bin) %{_libdir}/python2.4
+%dir %attr (0755, root, bin) %{_libdir}/python2.4/site-packages
+%{_libdir}/python2.4/site-packages/*
 %dir %attr (0755, root, sys) %{_datadir}
 %{_datadir}/opensync
 
@@ -76,6 +79,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Mon Nov 05 2007 - [email protected]
+- Add some files into the package.
+
 * Wed Jun 06 2007 - [email protected]
 - Add BuildRequires SFEscons and SFEcheck
 - Change %{_datadir} attr to root:sys

--- a/base-specs/libopensync.spec	Mon Nov 05 06:02:30 2007 +0000
+++ b/base-specs/libopensync.spec	Mon Nov 05 10:46:34 2007 +0000
@@ -11,14 +11,14 @@
 Name:           libopensync
 License:        GPL
 Group:          System/Libraries
-Version:        0.33
+Version:        0.34
 Release:        1
 Distribution:   Java Desktop System
 Vendor:         Sun Microsystems, Inc.
 URL:            http://www.opensync.org/
 Summary:        Data synchronization framework
 Source:         http://www.opensync.org/download/releases/%{version}/%{name}-%{version}.tar.bz2
-Patch1:         %{name}-01-add-glib.diff
+Patch1:         %{name}-01-prefix.diff
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Docdir:         %{_defaultdocdir}/doc
@@ -58,7 +58,7 @@
 
 %prep
 %setup -q
-%patch1 -p1
+%patch1 -p0
 
 %build
 %ifos linux
@@ -72,12 +72,14 @@
   CPUS=1
 fi
 
-scons prefix=%{_prefix}			\
+cmake .
+
+make
 
 %install
 rm -rf $RPM_BUILD_ROOT
 export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
-scons install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
 unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
 find $RPM_BUILD_ROOT -type f -name "*.a" -exec rm -f {} ';'
@@ -107,6 +109,10 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Mon Nov 05 2007 - [email protected]
+- Bump to 0.34
+- Remove libopensync-01-add-glib.diff patch
+- Add libopensync-01-prefix.diff patch 
 * Tue Oct 16 2007 - [email protected]
 - Bump to 0.33, change Source to full URL.
 * Mon Aug 06 2007 - [email protected]

--- a/patches/libopensync-01-add-glib.diff	Mon Nov 05 06:02:30 2007 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-Index: tools/SConscript
-===================================================================
---- libopensync-0.30/tools/SConscript	(revision 2082)
-+++ libopensync-0.30/tools/SConscript	(working copy)
-@@ -1,8 +1,8 @@
- Import('*')
- 
- if testenv.has_key('enable_tools') and testenv['enable_tools'] == 1:
--	binary = testenv.Program('osyncbinary', ['osyncbinary.c'], LIBS = ['opensync'], LIBPATH = '#opensync')
--	dump = testenv.Program('osyncdump', ['osyncdump.c'], LIBS = ['opensync'], LIBPATH = '#opensync')
-+	binary = testenv.Program('osyncbinary', ['osyncbinary.c'], LIBS = ['opensync', 'glib-2.0'], LIBPATH = '#opensync')
-+	dump = testenv.Program('osyncdump', ['osyncdump.c'], LIBS = ['opensync', 'glib-2.0'], LIBPATH = '#opensync')
- 	#testenv.Program('osyncplugin', ['osyncplugin.c'], LIBS = ['opensync'], LIBPATH = '#opensync')
- 	#testenv.Program('osyncstress', ['osyncstress.c'], LIBS = ['opensync'], LIBPATH = '#opensync')
- 	#testenv.Program('osynctest', ['osynctest.c'], LIBS = ['opensync'], LIBPATH = '#opensync')

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/libopensync-01-prefix.diff	Mon Nov 05 10:46:34 2007 +0000
@@ -0,0 +1,10 @@
+--- cmake/OpenSyncPlatforms.cmake.orig	2007-11-05 16:50:53.865960000 +0800
++++ cmake/OpenSyncPlatforms.cmake	2007-11-05 16:51:22.728217000 +0800
+@@ -5,6 +5,7 @@
+ SET( LIB_SUFFIX "" CACHE STRING "The library directory suffix. 32bit empty string, 64 for 64bit." )
+ 
+ IF (NOT WIN32)
++	SET( CMAKE_INSTALL_PREFIX "/usr" )
+ 	SET( LIB_INSTALL_DIR  "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}" )
+ 	SET( LIBEXEC_INSTALL_DIR  "${CMAKE_INSTALL_PREFIX}/libexec" )
+ 	SET( BIN_INSTALL_DIR  "${CMAKE_INSTALL_PREFIX}/bin" )