Author: glen Date: Sun Nov 11 18:17:28 2007 GMT Module: SPECS Tag: DEVEL ---- Log message: - 0.43, build system switched to cmake
---- Files affected: SPECS: libopensync.spec (1.34 -> 1.34.2.1) ---- Diffs: ================================================================ Index: SPECS/libopensync.spec diff -u SPECS/libopensync.spec:1.34 SPECS/libopensync.spec:1.34.2.1 --- SPECS/libopensync.spec:1.34 Tue Sep 4 14:29:19 2007 +++ SPECS/libopensync.spec Sun Nov 11 19:17:23 2007 @@ -1,31 +1,28 @@ # $Revision$, $Date$ -# TODO -# - (not all) CFLAGS not passed from spec -# # 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.31 -Release: 1 +Version: 0.34 +Release: 0.1 License: LGPL v2.1+ Group: Libraries -Source0: http://www.opensync.org/attachment/wiki/download/%{name}-%{version}.tar.bz2?format=raw -# Source0-md5: caf4fd1b174f4863ba79ab074a29b054 +Source0: http://www.opensync.org/download/releases/0.34/%{name}-%{version}.tar.bz2 +# Source0-md5: bf18a1d79c44c7e6714e3f75548e11de URL: http://www.opensync.org/ -Patch0: %{name}-opt.patch -Patch1: %{name}-wrap.patch -Patch2: %{name}-noerror.patch +#Patch0: %{name}-opt.patch +#Patch1: %{name}-wrap.patch +#Patch2: %{name}-noerror.patch BuildRequires: autoconf BuildRequires: automake +BuildRequires: cmake 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 %if %{with python} BuildRequires: python-devel @@ -89,26 +86,31 @@ %prep %setup -q -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 +#%patch0 -p1 +#%patch1 -p1 +#%patch2 -p1 %build -%scons \ - prefix=%{_prefix} \ - %{?with_python:enable_python=1} +%cmake \ + -DCMAKE_INSTALL_PREFIX=%{_prefix} \ +%if "%{_lib}" != "lib" + -DLIB_SUFFIX=64 \ +%endif + . + +%{__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 + +#%py_ocomp $RPM_BUILD_ROOT%{py_sitedir} +#%py_comp $RPM_BUILD_ROOT%{py_sitedir} +#%py_postclean %clean rm -rf $RPM_BUILD_ROOT @@ -136,13 +138,17 @@ %attr(755,root,root) %{_libdir}/libopensync.so %{_includedir}/opensync-1.0 %{_pkgconfigdir}/opensync-1.0.pc -%{_pkgconfigdir}/osengine-1.0.pc +#%{_pkgconfigdir}/osengine-1.0.pc + +%dir %{_datadir}/opensync/cmake +%dir %{_datadir}/opensync/cmake/modules +%{_datadir}/opensync/cmake/modules/*.cmake %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] +#%{py_sitedir}/opensync.py[co] %endif %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -151,6 +157,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.34.2.1 2007-11-11 18:17:23 glen +- 0.43, build system switched to cmake + Revision 1.34 2007-09-04 12:29:19 shadzik - reverted last change ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/libopensync.spec?r1=1.34&r2=1.34.2.1&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
