[libkolabxml: 8/32] Check in version 0.4.0

[Jeroen van Meeuwen]

commit 7c863acc0ca61b7ae017c841bb96bc8e05e80525
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Wed May 2 11:51:51 2012 +0100

    Check in version 0.4.0

 .gitignore                         |    1 +
 libkolabxml-0.4.0-cmake-woos.patch |   19 +++++++++++++++++++
 libkolabxml.spec                   |   19 ++++++++++---------
 sources                            |    2 +-
 4 files changed, 31 insertions(+), 10 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 1526098..d31b794 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /libkolabxml-0.3.0.tar.gz
+/libkolabxml-0.4.0.tar.gz
diff --git a/libkolabxml-0.4.0-cmake-woos.patch b/libkolabxml-0.4.0-cmake-woos.patch
new file mode 100644
index 0000000..2803327
--- /dev/null
+++ b/libkolabxml-0.4.0-cmake-woos.patch
@@ -0,0 +1,19 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index e8afffc..9901513 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -56,14 +56,8 @@ endif()
+ #C++ is required from here on
+ enable_language(CXX)
+ 
+-# set up install directories. INCLUDE_INSTALL_DIR and LIB_INSTALL_DIR must not be absolute paths
+-set(LIB_INSTALL_DIR_SUFFIX "" CACHE STRING "The directories where to install libraries to")
+-set(LIB_INSTALL_DIR lib${LIB_INSTALL_DIR_SUFFIX} )
+ set(CMAKECONFIG_INSTALL_DIR ${LIB_INSTALL_DIR}/cmake/Libkolabxml )
+ 
+-# Use a versioned install directory for the headers so multiple versions can be installed in parallel
+-set(INCLUDE_INSTALL_DIR include/kolab )
+-
+ configure_file(libkolabxml-version.h.cmake "${CMAKE_BINARY_DIR}/libkolabxml-version.h" @ONLY)
+ 
+ set(Boost_USE_MULTITHREADED ON)
diff --git a/libkolabxml.spec b/libkolabxml.spec
index f364499..350fb97 100644
--- a/libkolabxml.spec
+++ b/libkolabxml.spec
@@ -2,14 +2,16 @@
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           libkolabxml
-Version:        0.4
-Release:        0.1%{?dist}
+Version:        0.4.0
+Release:        1%{?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
+Patch1:         libkolabxml-0.4.0-cmake-woos.patch
+
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 %if 0%{?rhel} < 6 && 0%{?fedora} < 15
@@ -86,6 +88,7 @@ bindings provided through libkolabxml.
 
 %prep
 %setup -q
+%patch1 -p1
 
 %build
 rm -rf build
@@ -100,12 +103,10 @@ pushd build
     -DBoost_ADDITIONAL_VERSIONS="1.41;1.41.0" \
 %endif
     -DPYTHON_INCLUDE_DIRS=%{python_include} \
-    -DKOLAB_CSHARP_INSTALL_DIR=ext/csharp \
-    -DKOLAB_JAVA_INSTALL_DIR=ext/java \
-    -DKOLAB_PHP_INSTALL_DIR=%{php_extdir} \
-    -DKOLAB_PYTHON_INSTALL_DIR=%{python_sitearch} \
     -DPHP_BINDINGS=ON \
+    -DPHP_INSTALL_DIR=%{php_extdir} \
     -DPYTHON_BINDINGS=ON \
+    -DPYTHON_INSTALL_DIR=%{python_sitearch} \
     ..
 make
 popd
@@ -133,7 +134,7 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %{_includedir}
 %{_libdir}/*.so
-%exclude %{_datadir}/apps/cmake/modules/FindKolabInternal.cmake
+%{_libdir}/cmake/Libkolabxml
 
 %files -n php-kolabformat
 %defattr(-,root,root,-)
@@ -146,8 +147,8 @@ rm -rf %{buildroot}
 %{python_sitearch}/_kolabformat.so
 
 %changelog
-* Wed May  2 2012 Jeroen van Meeuwen <vanmeeuwen at kolabsys.com> - 0.4-0.1
-- Package latest upstream from master
+* Wed May  2 2012 Jeroen van Meeuwen <vanmeeuwen at kolabsys.com> - 0.4.0-1
+- New version
 
 * Fri Apr 20 2012 Jeroen van Meeuwen <vanmeeuwen at kolabsys.com> - 0.3.0-1
 - New version
diff --git a/sources b/sources
index bc2945a..2b5c876 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3d0899ab5808b07abdd0c5de7d1f8d70  libkolabxml-0.3.0.tar.gz
+7fcd3f90760026c310f934f902522d8e  libkolabxml-0.4.0.tar.gz