Menu
▾
▴
[Opensync-commits] r383 - in trunk: . misc osengine tools
|
From: <svn...@op...> - 2005-03-21 16:47:16
|
Author: azrael
Date: 2005-03-21 17:47:55 +0100 (Mon, 21 Mar 2005)
New Revision: 383
Added:
trunk/misc/opensync.spec
trunk/misc/opensync.spec.in
Modified:
trunk/Makefile.am
trunk/configure.in
trunk/osengine/Makefile.am
trunk/tools/Makefile.am
Log:
Made opensync compatible with rpm building. Thanks to
Pierre for the patch.
Modified: trunk/Makefile.am
===================================================================
--- trunk/Makefile.am 2005-03-21 16:32:18 UTC (rev 382)
+++ trunk/Makefile.am 2005-03-21 16:47:55 UTC (rev 383)
@@ -1,6 +1,6 @@
## Process this file with automake to produce Makefile.in
-SUBDIRS = opensync $(enginedir) formats $(toolsdir) $(testdir)
+SUBDIRS = opensync osengine formats tests tools
if BUILD_ENGINE
OSENGINE_PC = osengine-1.0.pc
@@ -20,6 +20,8 @@
plugins \
opensync-1.0.pc.in \
osengine-1.0.pc.in \
+ misc/opensync.spec.in \
+ misc/opensync.spec \
misc/buildtest.sh \
misc/doxygen.css
Modified: trunk/configure.in
===================================================================
--- trunk/configure.in 2005-03-21 16:32:18 UTC (rev 382)
+++ trunk/configure.in 2005-03-21 16:47:55 UTC (rev 383)
@@ -42,11 +42,7 @@
ENABLE_ENGINE=$enableval)
if test "x${ENABLE_ENGINE}" = "xyes"; then
AC_DEFINE(BUILD_ENGINE,1,[Stress Testing])
- enginedir="osengine"
-else
- enginedir=""
fi
-AC_SUBST(enginedir)
AC_SUBST(BUILD_ENGINE)
AM_CONDITIONAL(BUILD_ENGINE, test x$ENABLE_ENGINE = xyes)
@@ -83,12 +79,7 @@
AC_ARG_ENABLE(tools,
AS_HELP_STRING([--enable-tools], [enables building of the tools]),
WITH_TOOLS=$enableval)
-if test "x${WITH_TOOLS}" = "xyes"; then
- toolsdir="tools"
-else
- toolsdir=""
-fi
-AC_SUBST(toolsdir)
+AM_CONDITIONAL(ENABLE_TOOLS, test "x${WITH_TOOLS}" = "xyes")
#### Check for libxml ####
PKG_CHECK_MODULES(XML, [libxml-2.0])
@@ -105,10 +96,8 @@
AC_CHECK_HEADER(check.h,HAVE_CHECK=1,HAVE_CHECK=0)
if test "x${HAVE_CHECK}" = "x1"; then
AM_PATH_CHECK(0.9.0)
- testdir="tests"
fi
fi
-AC_SUBST(testdir)
AM_CONDITIONAL(ENABLE_TESTS, test x$HAVE_CHECK = x1)
#### Check for BDB (obsolete now) ####
@@ -183,6 +172,7 @@
osengine-1.0.pc
osengine-1.0-uninstalled.pc
Doxyfile
+misc/opensync.spec
])
Added: trunk/misc/opensync.spec
===================================================================
--- trunk/misc/opensync.spec 2005-03-21 16:32:18 UTC (rev 382)
+++ trunk/misc/opensync.spec 2005-03-21 16:47:55 UTC (rev 383)
@@ -0,0 +1,70 @@
+Summary: Synchronisation framework.
+Name: opensync
+Version: 0.14
+Release: 1
+License: LGPL
+Group: Development/Libraries
+Source: %{name}-%{version}.tar.gz
+BuildRoot: %{_tmppath}/%{name}-%{version}
+Requires: libxml2 glib2 sqlite >= 3.0.0
+BuildRequires: libxml2-devel glib2-devel sqlite-devel >= 3.0.0
+
+%description
+OpenSync is a synchronization framework that is platform and distribution independent.
+It consists of several plugins that can be used to connect to devices, a powerfull sync-engine and the framework itself.
+OpenSync is platform and distribution independent has no dependencies on X related libraries.
+
+%package devel
+Summary: Header files, libraries and development documentation for %{name}
+Group: Development/Libraries
+Requires: %{name} = %{version}
+
+%description devel
+This package contains the header files, static libraries and development
+documentation for %{name}. If you like to develop programs using %{name},
+you will need to install %{name}-devel.
+
+%package tools
+Summary: Tools for %{name}
+Group: Development/Tools
+Requires: %{name}
+
+%description tools
+Tools to test and debug %{name}.
+
+%prep
+%setup -q
+
+%build
+%configure --enable-engine --disable-debug --disable-tracing --disable-profiling --enable-tools --disable-unit-tests --disable-python
+
+%install
+rm -rf %{buildroot}
+make install DESTDIR=%{buildroot}
+rm -f %{buildroot}%{_libdir}/*.la
+rm -f %{buildroot}%{_libdir}/opensync/formats/*.la
+
+%clean
+rm -rf %{buildroot}
+
+%files
+%defattr(-,root,root)
+%{_libdir}/libopensync-xml.so*
+%{_libdir}/libopensync.so*
+%{_libdir}/libosengine.so*
+%{_libdir}/opensync
+
+%files devel
+%defattr(-,root,root)
+%{_includedir}/opensync-1.0
+%{_libdir}/pkgconfig/*.pc
+
+%files tools
+%defattr(-,root,root)
+%{_bindir}/osyncdump
+%{_bindir}/osyncplugin
+%{_bindir}/osyncstress
+
+%changelog
+* Fri Mar 18 2005 Pierre Ossman <dr...@dr...> 0.13-1
+- Initial package
Added: trunk/misc/opensync.spec.in
===================================================================
--- trunk/misc/opensync.spec.in 2005-03-21 16:32:18 UTC (rev 382)
+++ trunk/misc/opensync.spec.in 2005-03-21 16:47:55 UTC (rev 383)
@@ -0,0 +1,70 @@
+Summary: Synchronisation framework.
+Name: @PACKAGE@
+Version: @VERSION@
+Release: 1
+License: LGPL
+Group: Development/Libraries
+Source: %{name}-%{version}.tar.gz
+BuildRoot: %{_tmppath}/%{name}-%{version}
+Requires: libxml2 glib2 sqlite >= 3.0.0
+BuildRequires: libxml2-devel glib2-devel sqlite-devel >= 3.0.0
+
+%description
+OpenSync is a synchronization framework that is platform and distribution independent.
+It consists of several plugins that can be used to connect to devices, a powerfull sync-engine and the framework itself.
+OpenSync is platform and distribution independent has no dependencies on X related libraries.
+
+%package devel
+Summary: Header files, libraries and development documentation for %{name}
+Group: Development/Libraries
+Requires: %{name} = %{version}
+
+%description devel
+This package contains the header files, static libraries and development
+documentation for %{name}. If you like to develop programs using %{name},
+you will need to install %{name}-devel.
+
+%package tools
+Summary: Tools for %{name}
+Group: Development/Tools
+Requires: %{name}
+
+%description tools
+Tools to test and debug %{name}.
+
+%prep
+%setup -q
+
+%build
+%configure --enable-engine --disable-debug --disable-tracing --disable-profiling --enable-tools --disable-unit-tests --disable-python
+
+%install
+rm -rf %{buildroot}
+make install DESTDIR=%{buildroot}
+rm -f %{buildroot}%{_libdir}/*.la
+rm -f %{buildroot}%{_libdir}/opensync/formats/*.la
+
+%clean
+rm -rf %{buildroot}
+
+%files
+%defattr(-,root,root)
+%{_libdir}/libopensync-xml.so*
+%{_libdir}/libopensync.so*
+%{_libdir}/libosengine.so*
+%{_libdir}/opensync
+
+%files devel
+%defattr(-,root,root)
+%{_includedir}/opensync-1.0
+%{_libdir}/pkgconfig/*.pc
+
+%files tools
+%defattr(-,root,root)
+%{_bindir}/osyncdump
+%{_bindir}/osyncplugin
+%{_bindir}/osyncstress
+
+%changelog
+* Fri Mar 18 2005 Pierre Ossman <dr...@dr...> 0.13-1
+- Initial package
Modified: trunk/osengine/Makefile.am
===================================================================
--- trunk/osengine/Makefile.am 2005-03-21 16:32:18 UTC (rev 382)
+++ trunk/osengine/Makefile.am 2005-03-21 16:47:55 UTC (rev 383)
@@ -4,8 +4,11 @@
INCLUDES = -I$(top_srcdir) @PACKAGE_CFLAGS@
+if BUILD_ENGINE
lib_LTLIBRARIES = libosengine.la
+endif
+if BUILD_ENGINE
osengineincludedir = @OPENSYNC_ENGINEHEADERDIR@
osengineinclude_HEADERS = \
engine.h \
@@ -13,6 +16,7 @@
osengine_engine.h \
osengine_status.h \
osengine_debug.h
+endif
libosengine_la_SOURCES = \
osengine_message.c \
Modified: trunk/tools/Makefile.am
===================================================================
--- trunk/tools/Makefile.am 2005-03-21 16:32:18 UTC (rev 382)
+++ trunk/tools/Makefile.am 2005-03-21 16:47:55 UTC (rev 383)
@@ -4,7 +4,9 @@
INCLUDES = -I$(top_srcdir) @PACKAGE_CFLAGS@ @XML_CFLAGS@ -I$(top_srcdir)/osengine
+if ENABLE_TOOLS
bin_PROGRAMS = osyncdump osyncstress osyncplugin
+endif
osyncdump_SOURCES = osyncdump.c
osyncdump_LDFLAGS = @PACKAGE_LIBS@ @XML_LIBS@ -R $(libdir) @GCOV_LDFLAGS@
|
