packages: libopensync/libopensync.spec, libopensync/python-noarch-plugins.p...
glen
glen at pld-linux.org
Wed Feb 23 12:13:02 CET 2011
Author: glen Date: Wed Feb 23 11:13:02 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- load python plugins from noarch location
- update cmake macros
---- Files affected:
packages/libopensync:
libopensync.spec (1.62 -> 1.63) , python-noarch-plugins.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: packages/libopensync/libopensync.spec
diff -u packages/libopensync/libopensync.spec:1.62 packages/libopensync/libopensync.spec:1.63
--- packages/libopensync/libopensync.spec:1.62 Sun Aug 22 11:48:58 2010
+++ packages/libopensync/libopensync.spec Wed Feb 23 12:12:56 2011
@@ -1,18 +1,20 @@
# $Revision$, $Date$
+#
# Conditional build:
%bcond_without python # don't build python binding
-#
+
Summary: Data synchronization framework
Summary(pl.UTF-8): Szkielet do synchronizacji danych
Name: libopensync
Version: 0.39
-Release: 4
+Release: 6
Epoch: 1
License: LGPL v2.1+
Group: Libraries
Source0: http://www.opensync.org/download/releases/0.39/%{name}-%{version}.tar.bz2
# Source0-md5: 733211e82b61e2aa575d149dda17d475
Patch0: python-syntax.patch
+Patch1: python-noarch-plugins.patch
URL: http://www.opensync.org/
BuildRequires: autoconf
BuildRequires: automake
@@ -24,13 +26,12 @@
BuildRequires: libxml2-devel >= 1:2.6
BuildRequires: libxslt-devel
BuildRequires: pkgconfig
-BuildRequires: rpmbuild(macros) >= 1.385
+BuildRequires: rpmbuild(macros) >= 1.600
BuildRequires: sqlite3-devel >= 3.3
%if %{with python}
BuildRequires: python-devel
BuildRequires: python-modules
BuildRequires: rpm-pythonprov
-BuildRequires: rpmbuild(macros) >= 1.219
BuildRequires: swig-python
%endif
# no such opensync plugins (yet?)
@@ -100,12 +101,8 @@
mkdir build
cd build
%cmake \
- -DCMAKE_INSTALL_PREFIX=%{_prefix} \
-DPYTHON_VERSION=%{py_ver} \
-%if "%{_lib}" == "lib64"
- -DLIB_SUFFIX=64 \
-%endif
- ../
+ ..
%{__make}
@@ -121,6 +118,7 @@
%py_postclean
install -d $RPM_BUILD_ROOT%{_datadir}/libopensync1/defaults
+install -d $RPM_BUILD_ROOT%{_datadir}/libopensync1/python-plugins
install -d $RPM_BUILD_ROOT%{_libdir}/libopensync1/plugins
install -d $RPM_BUILD_ROOT%{_libdir}/libopensync1/formats
@@ -162,6 +160,7 @@
%defattr(644,root,root,755)
%attr(755,root,root) %{py_sitedir}/_opensync.so
%{py_sitedir}/opensync.py[co]
+%{_datadir}/libopensync1/python-plugins
%endif
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -170,6 +169,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.63 2011/02/23 11:12:56 glen
+- load python plugins from noarch location
+- update cmake macros
+
Revision 1.62 2010/08/22 09:48:58 glen
- fix python package
- package libopensync1/formats dir
================================================================
Index: packages/libopensync/python-noarch-plugins.patch
diff -u /dev/null packages/libopensync/python-noarch-plugins.patch:1.1
--- /dev/null Wed Feb 23 12:13:02 2011
+++ packages/libopensync/python-noarch-plugins.patch Wed Feb 23 12:12:56 2011
@@ -0,0 +1,11 @@
+--- libopensync-0.39/cmake/OpenSyncDefaults.cmake~ 2009-09-20 23:14:18.000000000 +0300
++++ libopensync-0.39/cmake/OpenSyncDefaults.cmake 2011-02-23 12:37:28.672742882 +0200
+@@ -29,7 +29,7 @@
+ SET( OPENSYNC_API_DIR "libopensync${OPENSYNC_LIBVERSION_SOVERSION}" )
+ SET( OPENSYNC_PLUGINDIR "${LIB_INSTALL_DIR}/${OPENSYNC_API_DIR}/plugins" CACHE PATH "OpenSync plugin directory" )
+ SET( OPENSYNC_FORMATSDIR "${LIB_INSTALL_DIR}/${OPENSYNC_API_DIR}/formats" CACHE PATH "OpenSync format plugin directory" )
+-SET( OPENSYNC_PYTHON_PLUGINDIR "${LIB_INSTALL_DIR}/${OPENSYNC_API_DIR}/python-plugins" CACHE PATH "OpenSync python plugin directory" )
++SET( OPENSYNC_PYTHON_PLUGINDIR "${SHARE_INSTALL_DIR}/${OPENSYNC_API_DIR}/python-plugins" CACHE PATH "OpenSync python plugin directory" )
+
+ SET( OPENSYNC_CAPABILITIESDIR "${SHARE_INSTALL_DIR}/${OPENSYNC_API_DIR}/capabilities" CACHE PATH "OpenSync capabilities directory" )
+ SET( OPENSYNC_CONFIGDIR "${SHARE_INSTALL_DIR}/${OPENSYNC_API_DIR}/defaults" CACHE PATH "OpenSync plugin configuration directory" )
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libopensync/libopensync.spec?r1=1.62&r2=1.63&f=u
More information about the pld-cvs-commit
mailing list