Author: buchan
Date: Sun Nov 12 18:11:00 2006
New Revision: 83444

Added:
   
packages/cooker/libopensync/current/SOURCES/libopensyc-python-lib-check-lib64.patch
   packages/cooker/libopensync/current/SOURCES/libopensync-0.20.tar.gz   
(contents, props changed)
Removed:
   packages/cooker/libopensync/current/SOURCES/libopensync-0.18.tar.bz2
Modified:
   packages/cooker/libopensync/current/SPECS/libopensync.spec

Log:
-update to 0.20
-fix python library search in configure on x86_64
-buildrequire swig, required for python binding


Added: 
packages/cooker/libopensync/current/SOURCES/libopensyc-python-lib-check-lib64.patch
==============================================================================
--- (empty file)
+++ 
packages/cooker/libopensync/current/SOURCES/libopensyc-python-lib-check-lib64.patch
 Sun Nov 12 18:11:00 2006
@@ -0,0 +1,11 @@
+--- libopensync-0.20/acinclude.m4~     2006-09-07 17:19:40.000000000 +0200
++++ libopensync-0.20/acinclude.m4      2006-11-12 12:49:05.000000000 +0200
+@@ -1129,7 +1129,7 @@
+       # Check for Python library path
+       AC_MSG_CHECKING([for Python library path])
+       python_path=`echo $PYTHON | sed "s,/bin.*$,,"`
+-      for i in "$python_path/lib/python$PYTHON_VERSION/config/" 
"$python_path/lib/python$PYTHON_VERSION/" "$python_path/lib/python/config/" 
"$python_path/lib/python/" "$python_path/" ; do
++      for i in "$python_path/lib*/python$PYTHON_VERSION/config/" 
"$python_path/lib*/python$PYTHON_VERSION/" "$python_path/lib*/python/config/" 
"$python_path/lib*/python/" "$python_path/" ; do
+               python_path=`find $i -type f -name libpython$PYTHON_VERSION.* 
-print | sed "1q"`
+               if test -n "$python_path" ; then
+                       break

Added: packages/cooker/libopensync/current/SOURCES/libopensync-0.20.tar.gz
==============================================================================
Binary file. No diff available.

Modified: packages/cooker/libopensync/current/SPECS/libopensync.spec
==============================================================================
--- packages/cooker/libopensync/current/SPECS/libopensync.spec  (original)
+++ packages/cooker/libopensync/current/SPECS/libopensync.spec  Sun Nov 12 
18:11:00 2006
@@ -1,6 +1,6 @@
 %define name   libopensync
-%define version        0.18
-%define release %mkrel 6
+%define version        0.20
+%define release %mkrel 1
 
 %define major  0
 %define libname %mklibname opensync %major
@@ -10,7 +10,8 @@
 Version:       %{version}
 Release:       %{release}
 
-Source:                %{name}-%{version}.tar.bz2
+Source:                %{name}-%{version}.tar.gz
+Patch:         libopensyc-python-lib-check-lib64.patch
 URL:           http://www.opensync.org/
 License:       GPL
 Group:         System/Libraries
@@ -19,6 +20,7 @@
 BuildRequires: chrpath
 BuildRequires: glib2-devel
 BuildRequires: sqlite3-devel
+BuildRequires: swig
 
 %description
 OpenSync is a synchronization framework that is platform and distribution
@@ -57,9 +59,11 @@
 
 %prep
 %setup -q
+%patch -p1
+autoconf
 
 %build
-%configure2_5x
+%configure2_5x --enable-python
 %make pythondir=%{python_sitearch}
                                                                                
 %install
@@ -67,7 +71,7 @@
 %makeinstall_std pythondir=%{python_sitearch}
 chrpath -d %buildroot/%{_bindir}/*
 chrpath -d %buildroot/%{_libdir}/*.so.%major.?.?
-chrpath -d %buildroot/%{python_sitearch}/_opensync.so.%major.?.?
+chrpath -d %buildroot/%{python_sitearch}/_opensync.so
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -79,6 +83,7 @@
 %defattr(-,root,root)
 %{_bindir}/*
 %{_libdir}/opensync
+%{_libdir}/osplugin
 
 %files -n %{libname}
 %defattr(-,root,root)

Reply via email to