4 commits - configure.ac .gitignore kolab-libs.spec.in libkolabxml.spec.in libkolabxml/tests Makefile.am
Jeroen van Meeuwen
vanmeeuwen at kolabsys.com
Fri Mar 23 17:06:46 CET 2012
.gitignore | 3
Makefile.am | 2
configure.ac | 8 +-
kolab-libs.spec.in | 121 +++++++++++++++++++++++++++++++++++++++
libkolabxml.spec.in | 121 ---------------------------------------
libkolabxml/tests/CMakeLists.txt | 27 +++++---
6 files changed, 147 insertions(+), 135 deletions(-)
New commits:
commit f763e50735eb30427d46620cbeb536296e5811bd
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date: Fri Mar 23 17:06:31 2012 +0100
Only build bindingstest if kdebug.h can be found
diff --git a/libkolabxml/tests/CMakeLists.txt b/libkolabxml/tests/CMakeLists.txt
index 562b4fd..dcb5597 100644
--- a/libkolabxml/tests/CMakeLists.txt
+++ b/libkolabxml/tests/CMakeLists.txt
@@ -1,15 +1,15 @@
include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/.. )
include_directories(${CMAKE_CURRENT_BINARY_DIR})
-find_path(KDE_LIBS_INCLUDE_DIR kdebug.h PATH_SUFFIXES kde4)
+find_path(KDELIBS_INCLUDE_DIR kdebug.h PATH_SUFFIXES kde4)
include_directories(${QT_INCLUDES} ${QT_INCLUDE_DIR} QtCore)
set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wl,--no-undefined" )
if (QT4_FOUND)
- if (KDE_LIBS_INCLUDE_DIR)
- include_directories(KDE_LIBS_INCLUDE_DIR)
+ if (KDELIBS_INCLUDE_DIR)
+ include_directories(${KDELIBS_INCLUDE_DIR})
message("Buildings tests")
QT4_AUTOMOC(bindingstest.cpp)
add_executable(bindingstest bindingstest.cpp ${CMAKE_CURRENT_BINARY_DIR}/${BINDINGSTEST_MOC})
@@ -18,9 +18,9 @@ if (QT4_FOUND)
QT4_AUTOMOC(conversiontest.cpp)
add_executable(conversiontest conversiontest.cpp ${CMAKE_CURRENT_BINARY_DIR}/${CONVERSIONTEST_MOC})
target_link_libraries(conversiontest ${QT_QTTEST_LIBRARY} ${QT_QTCORE_LIBRARY} kolabxml ${XERCES_C})
- else (KDE_LIBS_INCLUDE_DIR)
+ else (KDELIBS_INCLUDE_DIR)
message(WARNING "Could not build tests because kdelibs-devel is missing")
- endif (KDE_LIBS_INCLUDE_DIR)
+ endif (KDELIBS_INCLUDE_DIR)
else (QT4_FOUND)
message(WARNING "Could not build tests because qt is missing")
endif (QT4_FOUND)
commit 4611a3612b6cabe946d4ca1a1f37437c130560b5
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date: Fri Mar 23 16:56:15 2012 +0100
Handle libkolabxml -> kolab-libs.spec rename
diff --git a/Makefile.am b/Makefile.am
index 4c25de2..d0c5114 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,7 +20,7 @@ EXTRA_DIST = \
$(PACKAGE).spec.in
SUBDIRS = \
- c++ \
+ libkolabxml \
pykolab \
schemas
diff --git a/configure.ac b/configure.ac
index 2463fef..8d6a2cc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
-AC_INIT([libkolabxml], 0.2)
+AC_INIT([kolab-libs], 0.2)
AC_SUBST([RELEASE], 0.1)
-AC_CONFIG_SRCDIR(libkolabxml.spec.in)
+AC_CONFIG_SRCDIR(kolab-libs.spec.in)
AM_INIT_AUTOMAKE
AM_MAINTAINER_MODE
@@ -13,8 +13,8 @@ AC_SUBST(DATESTAMP,`date +"%a %b %d %Y"`)
AC_CONFIG_FILES([
Makefile
-c++/Makefile
-libkolabxml.spec
+kolab-libs.spec
+libkolabxml/Makefile
pykolab/format/Makefile
pykolab/Makefile
schemas/Makefile
commit 32ecf677384e756d2209554ee1faa3e1db8c479c
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date: Fri Mar 23 16:55:53 2012 +0100
Update libkolabxml -> kolab-libs rename
diff --git a/.gitignore b/.gitignore
index 2325ff8..e16a321 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,6 +13,9 @@ Makefile.in
ChangeLog
autom4te.cache
aclocal.m4
+kolab-libs-*.tar.gz
+kolab-libs-*.*/
+kolab-libs.spec
libkolabxml-*.tar.gz
libkolabxml-*.*/
libkolabxml.spec
diff --git a/kolab-libs.spec.in b/kolab-libs.spec.in
new file mode 100644
index 0000000..a4c9d23
--- /dev/null
+++ b/kolab-libs.spec.in
@@ -0,0 +1,121 @@
+Name: kolab-libs
+Version: @VERSION@
+Release: @RELEASE@%{?dist}
+Summary: Kolab XML format collection parser library
+
+Group: System/Libraries
+License: LGPLv3+
+URL: http://www.kolab.org
+Source0: http://git.kolab.org/libkolabxml/snapshot/%{name}-%{version}.tar.gz
+BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+
+# Does not build for RHEL 5, because of kdepimlibs-devel requirement
+%if 0%{?rhel} < 6 && 0%{?fedora} < 15
+BuildRequires: boost141-devel >= 1.4.1
+%else
+BuildRequires: boost-devel >= 1.4.1
+%endif
+BuildRequires: cmake >= 2.6
+BuildRequires: gcc-c++
+BuildRequires: gettext
+BuildRequires: intltool
+#BuildRequires: kdelibs-devel
+#BuildRequires: kdepimlibs-devel
+BuildRequires: php-devel
+BuildRequires: python-devel
+BuildRequires: qt-devel >= 3
+BuildRequires: swig
+BuildRequires: xerces-c-devel
+BuildRequires: xsd
+#Requires:
+
+%description
+The libkolabxml parsing library interprets Kolab XML formats (xCal, xCard) with
+bindings for Python, PHP and other languages. The language bindings are available
+through sub-packages.
+
+%package devel
+Summary: Kolab XML library development headers
+Group: System/Libraries
+Requires: %{name} = %{version}-%{release}
+
+%description devel
+Development headers for the Kolab XML libraries
+
+%package -n pykolab-format
+Summary: Python bindings for libkolabxml
+Group: System/Libraries
+Requires: %{name} = %{version}-%{release}
+
+%description -n pykolab-format
+The PyKolab format package offers a comprehensive Python library using the
+bindings provided through libkolabxml.
+
+%package -n php-kolabformat
+Summary: PHP bindings for libkolabxml
+Group: System/Libraries
+Requires: %{name} = %{version}-%{release}
+
+%description -n php-kolabformat
+The PHP kolabformat package offers a comprehensible PHP library using the
+bindings provided through libkolabxml.
+
+%prep
+%setup -q
+
+%build
+%configure
+%if 0%{?rhel} < 6 && 0%{?fedora} < 15
+export BOOST_INCLUDEDIR=/usr/include/boost141/
+%endif
+
+make %{?_smp_mflags}
+
+%install
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
+
+# Workaround for https://issues.kolab.org/643
+%ifnarch %{ix86}
+mv %{buildroot}/%{_exec_prefix}/lib %{buildroot}/%{_libdir}
+%endif
+
+# Workaround for https://issues.kolab.org/644
+mkdir -p %{buildroot}/%{php_extdir}/
+mv `find %{buildroot}/ -type d -name phpbindings`/*kolabformat* %{buildroot}/%{php_extdir}/.
+mkdir -p %{buildroot}/%{python_sitearch}/
+mv `find %{buildroot}/ -type d -name pythonbindings`/*kolabformat* %{buildroot}/%{python_sitearch}/.
+rm -rf %{buildroot}/home
+
+#%check
+#export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:%{_builddir}/%{name}-%{version}/c++/build/lib
+#export PYTHON_PATH=$PYTHON_PATH:%{builddir}/%{name}-%{version}/
+#make quicktest
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr(-,root,root,-)
+%doc c++/README DEVELOPMENT INSTALL
+%{_libdir}/*.so.*
+
+%files devel
+%defattr(-,root,root,-)
+%{_includedir}
+%{_libdir}/*.so
+
+%files -n php-kolabformat
+%defattr(-,root,root,-)
+%{php_extdir}/kolabformat.php
+%{php_extdir}/kolabformat.so
+
+%files -n pykolab-format
+%defattr(-,root,root,-)
+%{python_sitearch}/pykolab
+%{python_sitearch}/kolabformat.py*
+%{python_sitearch}/_kolabformat.so
+
+%changelog
+* Fri Feb 17 2012 Jeroen van Meeuwen <vanmeeuwen at kolabsys.com> - 0.2-0.1
+- First package
diff --git a/libkolabxml.spec.in b/libkolabxml.spec.in
deleted file mode 100644
index ea6d757..0000000
--- a/libkolabxml.spec.in
+++ /dev/null
@@ -1,121 +0,0 @@
-Name: libkolabxml
-Version: @VERSION@
-Release: @RELEASE@%{?dist}
-Summary: Kolab XML format collection parser library
-
-Group: System/Libraries
-License: LGPLv3+
-URL: http://www.kolab.org
-Source0: http://git.kolab.org/libkolabxml/snapshot/%{name}-%{version}.tar.gz
-BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-
-# Does not build for RHEL 5, because of kdepimlibs-devel requirement
-%if 0%{?rhel} < 6 && 0%{?fedora} < 15
-BuildRequires: boost141-devel >= 1.4.1
-%else
-BuildRequires: boost-devel >= 1.4.1
-%endif
-BuildRequires: cmake >= 2.6
-BuildRequires: gcc-c++
-BuildRequires: gettext
-BuildRequires: intltool
-#BuildRequires: kdelibs-devel
-#BuildRequires: kdepimlibs-devel
-BuildRequires: php-devel
-BuildRequires: python-devel
-BuildRequires: qt-devel >= 3
-BuildRequires: swig
-BuildRequires: xerces-c-devel
-BuildRequires: xsd
-#Requires:
-
-%description
-The libkolabxml parsing library interprets Kolab XML formats (xCal, xCard) with
-bindings for Python, PHP and other languages. The language bindings are available
-through sub-packages.
-
-%package devel
-Summary: Kolab XML library development headers
-Group: System/Libraries
-Requires: %{name} = %{version}-%{release}
-
-%description devel
-Development headers for the Kolab XML libraries
-
-%package -n pykolab-format
-Summary: Python bindings for libkolabxml
-Group: System/Libraries
-Requires: %{name} = %{version}-%{release}
-
-%description -n pykolab-format
-The PyKolab format package offers a comprehensive Python library using the
-bindings provided through libkolabxml.
-
-%package -n php-kolabformat
-Summary: PHP bindings for libkolabxml
-Group: System/Libraries
-Requires: %{name} = %{version}-%{release}
-
-%description -n php-kolabformat
-The PHP kolabformat package offers a comprehensible PHP library using the
-bindings provided through libkolabxml.
-
-%prep
-%setup -q
-
-%build
-%configure
-%if 0%{?rhel} < 6 && 0%{?fedora} < 15
-export BOOST_INCLUDEDIR=/usr/include/boost141/
-%endif
-
-make %{?_smp_mflags}
-
-%install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
-
-# Workaround for https://issues.kolab.org/643
-%ifnarch %{ix86}
-mv %{buildroot}/%{_exec_prefix}/lib %{buildroot}/%{_libdir}
-%endif
-
-# Workaround for https://issues.kolab.org/644
-mkdir -p %{buildroot}/%{php_extdir}/
-mv `find %{buildroot}/ -type d -name phpbindings`/*kolabformat* %{buildroot}/%{php_extdir}/.
-mkdir -p %{buildroot}/%{python_sitearch}/
-mv `find %{buildroot}/ -type d -name pythonbindings`/*kolabformat* %{buildroot}/%{python_sitearch}/.
-rm -rf %{buildroot}/home
-
-#%check
-#export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:%{_builddir}/%{name}-%{version}/c++/build/lib
-#export PYTHON_PATH=$PYTHON_PATH:%{builddir}/%{name}-%{version}/
-#make quicktest
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%files
-%defattr(-,root,root,-)
-%doc c++/README DEVELOPMENT INSTALL
-%{_libdir}/*.so.*
-
-%files devel
-%defattr(-,root,root,-)
-%{_includedir}
-%{_libdir}/*.so
-
-%files -n php-kolabformat
-%defattr(-,root,root,-)
-%{php_extdir}/kolabformat.php
-%{php_extdir}/kolabformat.so
-
-%files -n pykolab-format
-%defattr(-,root,root,-)
-%{python_sitearch}/pykolab
-%{python_sitearch}/kolabformat.py*
-%{python_sitearch}/_kolabformat.so
-
-%changelog
-* Fri Feb 17 2012 Jeroen van Meeuwen <vanmeeuwen at kolabsys.com> - 0.2-0.1
-- First package
commit ae3c5d211379e4dcc0418f9c66227be42b181823
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date: Fri Mar 23 16:54:29 2012 +0100
Only build the tests if the required kdebug.h can be found
diff --git a/libkolabxml/tests/CMakeLists.txt b/libkolabxml/tests/CMakeLists.txt
index ecaa0ae..562b4fd 100644
--- a/libkolabxml/tests/CMakeLists.txt
+++ b/libkolabxml/tests/CMakeLists.txt
@@ -1,17 +1,26 @@
include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/.. )
include_directories(${CMAKE_CURRENT_BINARY_DIR})
+find_path(KDE_LIBS_INCLUDE_DIR kdebug.h PATH_SUFFIXES kde4)
+
include_directories(${QT_INCLUDES} ${QT_INCLUDE_DIR} QtCore)
+
set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wl,--no-undefined" )
+
if (QT4_FOUND)
- message("Buildings tests")
- QT4_AUTOMOC(bindingstest.cpp)
- add_executable(bindingstest bindingstest.cpp ${CMAKE_CURRENT_BINARY_DIR}/${BINDINGSTEST_MOC})
- target_link_libraries(bindingstest ${QT_QTTEST_LIBRARY} ${QT_QTCORE_LIBRARY} kolabxml ${XERCES_C})
+ if (KDE_LIBS_INCLUDE_DIR)
+ include_directories(KDE_LIBS_INCLUDE_DIR)
+ message("Buildings tests")
+ QT4_AUTOMOC(bindingstest.cpp)
+ add_executable(bindingstest bindingstest.cpp ${CMAKE_CURRENT_BINARY_DIR}/${BINDINGSTEST_MOC})
+ target_link_libraries(bindingstest ${QT_QTTEST_LIBRARY} ${QT_QTCORE_LIBRARY} kolabxml ${XERCES_C})
- QT4_AUTOMOC(conversiontest.cpp)
- add_executable(conversiontest conversiontest.cpp ${CMAKE_CURRENT_BINARY_DIR}/${CONVERSIONTEST_MOC})
- target_link_libraries(conversiontest ${QT_QTTEST_LIBRARY} ${QT_QTCORE_LIBRARY} kolabxml ${XERCES_C})
-else()
+ QT4_AUTOMOC(conversiontest.cpp)
+ add_executable(conversiontest conversiontest.cpp ${CMAKE_CURRENT_BINARY_DIR}/${CONVERSIONTEST_MOC})
+ target_link_libraries(conversiontest ${QT_QTTEST_LIBRARY} ${QT_QTCORE_LIBRARY} kolabxml ${XERCES_C})
+ else (KDE_LIBS_INCLUDE_DIR)
+ message(WARNING "Could not build tests because kdelibs-devel is missing")
+ endif (KDE_LIBS_INCLUDE_DIR)
+else (QT4_FOUND)
message(WARNING "Could not build tests because qt is missing")
-endif()
+endif (QT4_FOUND)
More information about the commits
mailing list