packages: libopensync/libopensync.spec, libopensync/python-syntax.patch (NE...

[glen]

Author: glen                         Date: Sun Aug 22 09:49:03 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fix python package
- package libopensync1/formats dir
- rel 4

---- Files affected:
packages/libopensync:
   libopensync.spec (1.61 -> 1.62) , python-syntax.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/libopensync/libopensync.spec
diff -u packages/libopensync/libopensync.spec:1.61 packages/libopensync/libopensync.spec:1.62
--- packages/libopensync/libopensync.spec:1.61	Sat Jul 17 22:27:35 2010
+++ packages/libopensync/libopensync.spec	Sun Aug 22 11:48:58 2010
@@ -6,12 +6,13 @@
 Summary(pl.UTF-8):	Szkielet do synchronizacji danych
 Name:		libopensync
 Version:	0.39
-Release:	3
+Release:	4
 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
 URL:		http://www.opensync.org/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -29,6 +30,7 @@
 BuildRequires:	python-devel
 BuildRequires:	python-modules
 BuildRequires:	rpm-pythonprov
+BuildRequires:	rpmbuild(macros) >= 1.219
 BuildRequires:	swig-python
 %endif
 # no such opensync plugins (yet?)
@@ -89,29 +91,38 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
-%build
+# broken, use fixed from cmake itself
 rm cmake/modules/*Python*.cmake
+
+%build
 mkdir build
 cd build
 %cmake \
 	-DCMAKE_INSTALL_PREFIX=%{_prefix} \
 	-DPYTHON_VERSION=%{py_ver} \
-%if "%{_lib}" != "lib"
+%if "%{_lib}" == "lib64"
 	-DLIB_SUFFIX=64 \
 %endif
 	../
 
 %{__make}
 
+%py_lint
+
 %install
 rm -rf $RPM_BUILD_ROOT
-
 %{__make} -C build install \
 	DESTDIR=$RPM_BUILD_ROOT
 
+%py_ocomp $RPM_BUILD_ROOT%{py_sitedir}
+%py_comp $RPM_BUILD_ROOT%{py_sitedir}
+%py_postclean
+
 install -d $RPM_BUILD_ROOT%{_datadir}/libopensync1/defaults
 install -d $RPM_BUILD_ROOT%{_libdir}/libopensync1/plugins
+install -d $RPM_BUILD_ROOT%{_libdir}/libopensync1/formats
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -129,8 +140,9 @@
 %attr(755,root,root) %ghost %{_libdir}/libopensync.so.1
 %dir %{_libdir}/libopensync1
 %dir %{_libdir}/libopensync1/plugins
-%dir %{_datadir}/libopensync1
+%dir %{_libdir}/libopensync1/formats
 %attr(755,root,root) %{_libdir}/libopensync1/osplugin
+%dir %{_datadir}/libopensync1
 %{_datadir}/libopensync1/capabilities
 %{_datadir}/libopensync1/defaults
 %{_datadir}/libopensync1/descriptions
@@ -149,7 +161,7 @@
 %files -n python-opensync
 %defattr(644,root,root,755)
 %attr(755,root,root) %{py_sitedir}/_opensync.so
-%{py_sitedir}/opensync.py
+%{py_sitedir}/opensync.py[co]
 %endif
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -158,6 +170,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.62  2010/08/22 09:48:58  glen
+- fix python package
+- package libopensync1/formats dir
+- rel 4
+
 Revision 1.61  2010/07/17 20:27:35  glen
 - cmake >= 2.8.2-2 for python 2.7 support
 

================================================================
Index: packages/libopensync/python-syntax.patch
diff -u /dev/null packages/libopensync/python-syntax.patch:1.1
--- /dev/null	Sun Aug 22 11:49:03 2010
+++ packages/libopensync/python-syntax.patch	Sun Aug 22 11:48:58 2010
@@ -0,0 +1,26 @@
+--- libopensync-0.39/wrapper/opensync-group.i~	2009-09-20 23:14:18.000000000 +0300
++++ libopensync-0.39/wrapper/opensync-group.i	2010-08-22 12:41:26.427055426 +0300
+@@ -213,9 +213,7 @@
+ 	__oldinit = __init__
+ 	def __init__(self, *args):
+ 		self.__oldinit(*args)
+-                /*
+-		self.filters = _ListWrapper(self.num_filters, self.nth_filter)
+-                */
++		#self.filters = _ListWrapper(self.num_filters, self.nth_filter)
+ %}
+ }
+ 
+--- libopensync-0.39/wrapper/opensync-format.i~	2009-09-20 23:14:18.000000000 +0300
++++ libopensync-0.39/wrapper/opensync-format.i	2010-08-22 12:41:34.620377794 +0300
+@@ -278,9 +278,7 @@
+ 	__oldinit = __init__
+ 	def __init__(self, *args):
+ 		self.__oldinit(*args)
+-                /*
+-		self.filters = _ListWrapper(self.num_filters, self.nth_filter)
+-                */
++		#self.filters = _ListWrapper(self.num_filters, self.nth_filter)
+ %}
+ }
+ 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libopensync/libopensync.spec?r1=1.61&r2=1.62&f=u