SPECS (DEVEL): libopensync.spec - updated to 0.40 snap 20081027

paszczus paszczus at pld-linux.org
Mon Oct 27 13:11:58 CET 2008


Author: paszczus                     Date: Mon Oct 27 12:11:58 2008 GMT
Module: SPECS                         Tag: DEVEL
---- Log message:
- updated to 0.40 snap 20081027

---- Files affected:
SPECS:
   libopensync.spec (1.34.2.4 -> 1.34.2.5) 

---- Diffs:

================================================================
Index: SPECS/libopensync.spec
diff -u SPECS/libopensync.spec:1.34.2.4 SPECS/libopensync.spec:1.34.2.5
--- SPECS/libopensync.spec:1.34.2.4	Thu Mar  6 09:14:47 2008
+++ SPECS/libopensync.spec	Mon Oct 27 13:11:52 2008
@@ -1,24 +1,32 @@
 # $Revision$, $Date$
 # Conditional build:
+#
+#
+%define		_snap	20081027
+
 %bcond_without	python		# don't build python binding
 #
 Summary:	Data synchronization framework
 Summary(pl.UTF-8):	Szkielet do synchronizacji danych
 Name:		libopensync
-Version:	0.36
-Release:	0.1
+Version:	0.40
+Release:	0.%{_snap}.1
+Epoch:		1
 License:	LGPL v2.1+
 Group:		Libraries
-Source0:	http://www.opensync.org/download/releases/0.36/%{name}-%{version}.tar.bz2
-# Source0-md5:	d8cc7835663566e3626e959d8fb531bf
+Source0:	%{name}-%{version}-%{_snap}.tar.bz2
+# Source0-md5:	6ffdd16c5deaee95c1d4762c44d57d5a
+Patch0:		%{name}-python_wrapper_update.patch
 URL:		http://www.opensync.org/
 BuildRequires:	autoconf
 BuildRequires:	automake
+BuildRequires:	check
 BuildRequires:	cmake
 BuildRequires:	glib2-devel >= 1:2.10
 BuildRequires:	libint-devel
 BuildRequires:	libtool
 BuildRequires:	libxml2-devel >= 1:2.6
+BuildRequires:	libxslt-devel
 BuildRequires:	pkgconfig
 BuildRequires:	rpmbuild(macros) >= 1.385
 BuildRequires:	sqlite3-devel >= 3.3
@@ -58,10 +66,11 @@
 Summary:	Header files for opensync library
 Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki opensync
 Group:		Development/Libraries
-Requires:	%{name} = %{version}-%{release}
+Requires:	%{name} = %{epoch}:%{version}-%{release}
 Requires:	glib2-devel >= 1:2.10
 Obsoletes:	libopensync-static
 Obsoletes:	multisync-devel
+Conflicts:	libopensync02-devel
 
 %description devel
 Header files for opensync library.
@@ -73,7 +82,7 @@
 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
@@ -83,24 +92,30 @@
 Wiązania Pythona do biblioteki opensync.
 
 %prep
-%setup -q
+%setup -q -n %{name} 
+%patch0 -p1
 
 %build
+mkdir build
+cd build
 %cmake \
 	-DCMAKE_INSTALL_PREFIX=%{_prefix} \
 %if "%{_lib}" != "lib"
 	-DLIB_SUFFIX=64 \
 %endif
-	.
+	../
 
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%{__make} install \
+%{__make} -C build install \
 	DESTDIR=$RPM_BUILD_ROOT
 
+install -d $RPM_BUILD_ROOT%{_datadir}/libopensync1/defaults
+install -d $RPM_BUILD_ROOT%{_libdir}/libopensync1/plugins
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -112,24 +127,26 @@
 %doc AUTHORS README
 %attr(755,root,root) %{_bindir}/*
 %attr(755,root,root) %{_libdir}/libopensync.so.*
-%dir %{_libdir}/opensync-*
-%dir %{_libdir}/opensync-*/formats
-%dir %{_libdir}/opensync-*/osplugin
-%dir %{_datadir}/opensync-*
-%{_datadir}/opensync-*/capabilities
-%{_datadir}/opensync-*/descriptions
-%{_datadir}/opensync-*/schemas
-%attr(755,root,root) %{_libdir}/opensync-*/formats/*.so
+%dir %{_libdir}/libopensync1
+%dir %{_libdir}/libopensync1/formats
+%dir %{_libdir}/libopensync1/plugins
+%dir %{_datadir}/libopensync1
+%attr(755,root,root) %{_libdir}/libopensync1/osplugin
+%{_datadir}/libopensync1/capabilities
+%{_datadir}/libopensync1/defaults
+%{_datadir}/libopensync1/descriptions
+%{_datadir}/libopensync1/schemas
+%attr(755,root,root) %{_libdir}/libopensync1/formats/*.so
 
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libopensync.so
-%{_includedir}/opensync-1.0
-%{_pkgconfigdir}/opensync-1.0.pc
+%{_includedir}/libopensync1
+%{_pkgconfigdir}/libopensync.pc
 
-%dir %{_datadir}/opensync-*/cmake
-%dir %{_datadir}/opensync-*/cmake/modules
-%{_datadir}/opensync-*/cmake/modules/*.cmake
+%dir %{_datadir}/libopensync1/cmake
+%dir %{_datadir}/libopensync1/cmake/modules
+%{_datadir}/libopensync1/cmake/modules/*.cmake
 
 %if %{with python}
 %files -n python-opensync
@@ -144,117 +161,63 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
-Revision 1.34.2.4  2008/03/06 08:14:47  arekm
-- python and symlinks
-
-Revision 1.34.2.3  2008-03-06 08:05:35  arekm
-- up to 0.36
-
-Revision 1.34.2.2  2008-02-10 20:04:18  paszczus
-- BR: libint-devel
-
-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
-
-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.34.2.5  2008/10/27 12:11:52  paszczus
+- updated to 0.40 snap 20081027
 
-Revision 1.29  2007/08/31 19:28:16  arekm
-- fix swig wrapper
+Revision 1.52  2008/10/23 08:24:06  sls
+- added python_wrapper_update.patch
+- defaults directory is back
 
-Revision 1.28  2007/08/31 18:44:19  glen
-- up to 0.31, however build fails with python2.4
+Revision 1.51  2008/10/21 03:06:14  sls
+- osplugin is not a dir
+- fixes for opensync-1.0 -> libopensync1
 
-Revision 1.27  2007/06/17 10:45:20  qboosh
-- macros 1.385 for scons
+Revision 1.50  2008/10/21 02:45:12  sls
+- more BR
 
-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.49  2008/10/15 18:00:56  sls
+- update files
 
-Revision 1.25  2007/06/14 19:05:34  glen
-- update to 0.30
+Revision 1.48  2008/10/15 17:53:54  sls
+- ver. 0.37 (NFY)
 
-Revision 1.24  2007/03/28 23:21:21  wrobell
-- ver. 0.22
+Revision 1.47  2008/07/21 07:14:29  arekm
+- C for each other (libopensync-devel vs libopensync02-devel)
 
-Revision 1.23  2007/03/24 18:06:42  bszx
-- updated to 0.21.1
+Revision 1.46  2008-06-11 15:49:05  hawk
+- release 4
 
-Revision 1.22  2007/02/13 06:46:51  glen
-- tabs in preamble
+Revision 1.45  2008-06-01 17:57:42  patrys
+- ONE of them goes to datadir, the other goes to libdir
+- argh
 
-Revision 1.21  2007/02/12 00:49:03  baggins
-- converted to UTF-8
+Revision 1.44  2008-06-01 17:55:42  patrys
+- need more coffee, these go to datadir
 
-Revision 1.20  2007/01/27 22:41:24  arekm
-- up to 0.20
+Revision 1.43  2008-06-01 17:52:37  patrys
+- add and package default and plugins dirs
+- rel 3
 
-Revision 1.19  2006/11/05 02:05:55  qboosh
-- multisync-syncml Obsoletes moved to new libopensync-plugin-syncml package
+Revision 1.42  2008-05-30 01:08:22  wolvverine
+- rel.2
 
-Revision 1.18  2006/10/23 21:59:28  glen
-- working source0
+Revision 1.41  2008-05-30 00:25:09  wolvverine
+- build
 
-Revision 1.17  2006/10/23 19:43:54  glen
-- added %{_libdir}/osplugin binary
+Revision 1.40  2008-05-16 22:59:55  wolvverine
+- rel.1
 
-Revision 1.16  2006/10/23 19:23:07  glen
-- uploaded to distfiles
+Revision 1.39  2008-03-06 08:28:53  arekm
+- 0.3x series moved here; 0.2x series as libopensync02.spec
 
-Revision 1.15  2006/10/23 19:21:22  glen
-- add py-m4.patch
-
-Revision 1.14  2006/10/23 14:16:43  czarny
-- up to 0.19
-- python patch (0) already in upstream
-
-Revision 1.13  2006/05/03 12:27:03  pluto
-- sources dropped in.
-
-Revision 1.12  2006/05/03 12:14:28  pluto
-- rm formats/*.a
-
-Revision 1.11  2006/04/19 19:31:58  qboosh
-- bcond descs
-
-Revision 1.10  2006/04/16 11:45:26  djurban
-- added 2 bconds (python, static_libs)
-
-Revision 1.9  2006/01/31 21:17:24  patrys
-- missing BR: sqlite3
-
-Revision 1.8  2006/01/24 10:45:07  qboosh
-- -devel Obsoletes: multisync-devel
-- base Obsoletes: multisync-{ldap,opie,syncml} (no such opensync plugins yet)
-
-Revision 1.7  2006/01/23 12:18:23  wrobell
-- added some missing dirs required by plugins
-
-Revision 1.6  2006/01/09 08:35:37  qboosh
-- try this way
-
-Revision 1.5  2006/01/09 08:35:07  qboosh
-- argh, stupid wiki downloads
-
-Revision 1.4  2006/01/09 08:31:48  qboosh
-- fixed md5
+Revision 1.34.2.4  2008-03-06 08:14:47  arekm
+- python and symlinks
 
-Revision 1.3  2006/01/08 23:25:33  qboosh
-- pl, BR: ac,am,lt
+Revision 1.34.2.3  2008-03-06 08:05:35  arekm
+- up to 0.36
 
-Revision 1.2  2005/12/30 11:09:59  wrobell
-- fixed python modules installation, patch sent to author
+Revision 1.34.2.2  2008-02-10 20:04:18  paszczus
+- BR: libint-devel
 
-Revision 1.1  2005/12/30 10:42:07  wrobell
-- based on template
+Revision 1.34.2.1  2007-11-11 18:17:23  glen
+- 0.43, build system switched to cmake
================================================================

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



More information about the pld-cvs-commit mailing list