SPECS: libopensync.spec - back to stable 0.2x line. devel 0.3x mov...

Tue Oct 9 11:35:28 CEST 2007

Author: arekm                        Date: Tue Oct  9 09:35:28 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- back to stable 0.2x line. devel 0.3x moved to DEVEL

---- Files affected:
SPECS:
   libopensync.spec (1.34 -> 1.35) 

---- Diffs:

================================================================
Index: SPECS/libopensync.spec
diff -u SPECS/libopensync.spec:1.34 SPECS/libopensync.spec:1.35

--- SPECS/libopensync.spec:1.34	Tue Sep  4 14:29:19 2007
+++ SPECS/libopensync.spec	Tue Oct  9 11:35:23 2007
@@ -1,37 +1,32 @@
 # $Revision$, $Date$
-# TODO
-# - (not all) CFLAGS not passed from spec
 #
 # Conditional build:
 %bcond_without	python		# don't build python binding
+%bcond_without	static_libs	# don't build static library
 #
 Summary:	Data synchronization framework
 Summary(pl.UTF-8):	Szkielet do synchronizacji danych
 Name:		libopensync
-Version:	0.31
-Release:	1
-License:	LGPL v2.1+
+# WARNING: don't go for 0.3x line - it's DEVELopment series
+Version:	0.22
+Release:	2
+Epoch:		1
+License:	LGPL
 Group:		Libraries
 Source0:	http://www.opensync.org/attachment/wiki/download/%{name}-%{version}.tar.bz2?format=raw
-# Source0-md5:	caf4fd1b174f4863ba79ab074a29b054
+# Source0-md5:	f563ce2543312937a9afb4f8445ef932
 URL:		http://www.opensync.org/
-Patch0:		%{name}-opt.patch
-Patch1:		%{name}-wrap.patch
-Patch2:		%{name}-noerror.patch
+Patch0:		%{name}-py-m4.patch
 BuildRequires:	autoconf
 BuildRequires:	automake
-BuildRequires:	glib2-devel >= 1:2.10
 BuildRequires:	libtool
-BuildRequires:	libxml2-devel >= 1:2.6
-BuildRequires:	pkgconfig
-BuildRequires:	rpmbuild(macros) >= 1.385
-BuildRequires:	scons
-BuildRequires:	sqlite3-devel >= 3.3
+BuildRequires:	libxml2-devel
 %if %{with python}
 BuildRequires:	python-devel
 BuildRequires:	python-modules
 BuildRequires:	swig-python
 %endif
+BuildRequires:	sqlite3-devel
 # no such opensync plugins (yet?)
 Obsoletes:	multisync-ldap
 Obsoletes:	multisync-opie
@@ -63,9 +58,7 @@
 Summary:	Header files for opensync library
 Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki opensync
 Group:		Development/Libraries
-Requires:	%{name} = %{version}-%{release}
-Requires:	glib2-devel >= 1:2.10
-Obsoletes:	libopensync-static
+Requires:	%{name} = %{epoch}:%{version}-%{release}
 Obsoletes:	multisync-devel
 
 %description devel
@@ -74,11 +67,23 @@
 %description devel -l pl.UTF-8
 Pliki nagłówkowe biblioteki opensync.
 
+%package static
+Summary:	Static opensync library
+Summary(pl.UTF-8):	Statyczna biblioteka opensync
+Group:		Development/Libraries
+Requires:	%{name}-devel = %{epoch}:%{version}-%{release}
+
+%description static
+Static opensync library.
+
+%description static -l pl.UTF-8
+Statyczna biblioteka opensync.
+
 %package -n python-opensync
 Summary:	Python bindings for opensync library
 Summary(pl.UTF-8):	Wiązania Pythona do biblioteki opensync
 Group:		Libraries/Python
-Requires:	%{name} = %{version}-%{release}
+Requires:	%{name} = %{epoch}:%{version}-%{release}
 %pyrequires_eq  python-libs
 
 %description -n python-opensync
@@ -90,25 +95,33 @@
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
+
+[ -x "%{_bindir}/python%{py_ver}-config" ] && sed -i -e 's#python-config#%{_bindir}/python%{py_ver}-config#g' acinclude.m4
 
 %build
-%scons \
-	prefix=%{_prefix} \
-	%{?with_python:enable_python=1}
+%{__libtoolize}
+%{__aclocal}
+%{__autoconf}
+%{__autoheader}
+%{__automake}
+%configure \
+	%{!?debug:--disable-debug --disable-tracing} \
+	--%{?with_static_libs:en}%{!?with_static_libs:dis}able-static \
+	--%{?with_python:en}%{!?with_python:dis}able-python
+
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%scons install \
-	DESTDIR=$RPM_BUILD_ROOT
 
 install -d $RPM_BUILD_ROOT%{_libdir}/opensync/plugins \
     $RPM_BUILD_ROOT%{_datadir}/opensync/defaults
 
-%py_ocomp $RPM_BUILD_ROOT%{py_sitedir}
-%py_comp $RPM_BUILD_ROOT%{py_sitedir}
-%py_postclean
+%{__make} install \
+	DESTDIR=$RPM_BUILD_ROOT
+
+rm -f $RPM_BUILD_ROOT%{py_sitedir}/*.{py,la,a}
+rm -f $RPM_BUILD_ROOT%{_libdir}/opensync/formats/*.a
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -118,31 +131,36 @@
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS README
+%doc AUTHORS ChangeLog NEWS README TODO
 %attr(755,root,root) %{_bindir}/*
-%attr(755,root,root) %{_libdir}/libopensync.so.*.*.*
+%attr(755,root,root) %{_libdir}/lib*.so.*.*.*
+%attr(755,root,root) %{_libdir}/osplugin
 %dir %{_libdir}/opensync
 %dir %{_libdir}/opensync/formats
 %dir %{_libdir}/opensync/plugins
 %dir %{_datadir}/opensync
 %dir %{_datadir}/opensync/defaults
-%{_datadir}/opensync/capabilities
-%{_datadir}/opensync/descriptions
-%{_datadir}/opensync/schemas
 %attr(755,root,root) %{_libdir}/opensync/formats/*.so
+%{_libdir}/opensync/formats/*.la
 
 %files devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libopensync.so
-%{_includedir}/opensync-1.0
-%{_pkgconfigdir}/opensync-1.0.pc
-%{_pkgconfigdir}/osengine-1.0.pc
+%attr(755,root,root) %{_libdir}/lib*.so
+%{_libdir}/lib*.la
+%{_includedir}/opensync*
+%{_pkgconfigdir}/*.pc
+
+%if %{with static_libs}
+%files static
+%defattr(644,root,root,755)
+%{_libdir}/lib*.a
+%endif
 
 %if %{with python}
 %files -n python-opensync
 %defattr(644,root,root,755)
-%attr(755,root,root) %{py_sitedir}/_opensync.so
-%{py_sitedir}/opensync.py[co]
+%attr(755,root,root) %{py_sitedir}/*.so
+%{py_sitedir}/*.py[co]
 %endif
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -151,34 +169,8 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
-Revision 1.34  2007/09/04 12:29:19  shadzik
-- reverted last change
-
-Revision 1.32  2007/09/02 11:46:10  qboosh
-- -devel R: glib2-devel
-- LGPL v2.1+
-
-Revision 1.31  2007/08/31 19:39:27  glen
-- builds on Ac
-
-Revision 1.30  2007/08/31 19:37:04  glen
-- remove -Werror from python bindings build
-
-Revision 1.29  2007/08/31 19:28:16  arekm
-- fix swig wrapper
-
-Revision 1.28  2007/08/31 18:44:19  glen
-- up to 0.31, however build fails with python2.4
-
-Revision 1.27  2007/06/17 10:45:20  qboosh
-- macros 1.385 for scons
-
-Revision 1.26  2007/06/14 20:37:14  glen
-- try to standardize the way cc/optflags are passed (at least in PLD)
-- static libs are no more built
-
-Revision 1.25  2007/06/14 19:05:34  glen
-- update to 0.30
+Revision 1.35  2007/10/09 09:35:23  arekm
+- back to stable 0.2x line. devel 0.3x moved to DEVEL
 
 Revision 1.24  2007/03/28 23:21:21  wrobell
 - ver. 0.22
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/libopensync.spec?r1=1.34&r2=1.35&f=u

