Hello community, here is the log from the commit of package libkolabxml for openSUSE:Factory checked in at 2013-04-24 15:56:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libkolabxml (Old) and /work/SRC/openSUSE:Factory/.libkolabxml.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libkolabxml", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/libkolabxml/libkolabxml.changes 2013-03-01 07:25:13.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libkolabxml.new/libkolabxml.changes 2013-04-24 15:56:21.000000000 +0200 @@ -1,0 +2,29 @@ +Mon Apr 22 14:28:40 UTC 2013 - [email protected] + +- Added fix_uuid_includes_SLE.diff +- removed sed command to fix uuid includes +- Patch only sles_version == 11 + +------------------------------------------------------------------- +Tue Mar 19 14:04:36 UTC 2013 - [email protected] + +- Enable mono bindings for SLE 11 SP 2 + +------------------------------------------------------------------- +Tue Mar 19 12:45:39 UTC 2013 - [email protected] + +- Use devel:tools:building when building SLE 11 SP2 (cmake, swig) +- Removed cmake cxx flag -Wno-maybe-uninitialized +- Fix php bindings for SLE 11 SP2 + +------------------------------------------------------------------- +Wed Mar 13 00:02:21 UTC 2013 - [email protected] + +- Also include .pyo and .pyc files in python-kolabformat + +------------------------------------------------------------------- +Fri Mar 1 15:11:24 UTC 2013 - [email protected] + +- Updated spec fix SLE 11 SP2 build + +------------------------------------------------------------------- New: ---- fix_uuid_includes_SLE.diff libkolabxml-0.8.4.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libkolabxml.spec ++++++ --- /var/tmp/diff_new_pack.dUPdhi/_old 2013-04-24 15:56:23.000000000 +0200 +++ /var/tmp/diff_new_pack.dUPdhi/_new 2013-04-24 15:56:23.000000000 +0200 @@ -27,6 +27,8 @@ Source: http://mirror.kolabsys.com/pub/releases/%{name}-%{version}.tar.gz # PATCH-FIX-OPENSUSE fix_php5_bindings.diff Patch0: fix_php5_bindings.diff +# Fix uuid.h path on SLE* 11 +Patch1: fix_uuid_includes_SLE.diff BuildRequires: boost-devel BuildRequires: cmake >= 2.6 BuildRequires: gcc-c++ @@ -34,17 +36,15 @@ BuildRequires: java-openjdk BuildRequires: libcurl-devel BuildRequires: libqt4-devel +%if 0%{?sles_version} == 11 +BuildRequires: uuid-devel = 1.6.2 +%endif BuildRequires: libxerces-c-devel BuildRequires: mono-devel -# ToDo: Fix SLE_11_SP2 CSHARP and PHP bindings -#%%if 0%{?sles_version} == 0 -BuildRequires: php5-devel -#%%else -#BuildRequires: php53-devel -#%%endif +BuildRequires: php-devel >= 5.3 BuildRequires: pkgconfig BuildRequires: python-devel -BuildRequires: swig +BuildRequires: swig >= 2.0 BuildRequires: xsd BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -173,6 +173,9 @@ %prep %setup -q %patch0 -p0 +%if 0%{?sles_version} == 11 +%patch1 -p0 +%endif %build export CXXFLAGS="%{optflags}" @@ -185,10 +188,8 @@ -DLIB_INSTALL_DIR=%{_lib} \ -DCMAKE_SKIP_RPATH=TRUE \ -DJAVA_BINDINGS=TRUE -DJAVA_INSTALL_DIR=%{_jnidir} \ -%if 0%{?sles_version} == 0 -DCSHARP_BINDINGS=TRUE -DCSHARP_INSTALL_DIR=%{_prefix}/lib/mono/ \ -DPHP_BINDINGS=TRUE \ -%endif -DPYTHON_BINDINGS=TRUE -DPYTHON_INSTALL_DIR=%{python_sitearch} \ .. @@ -198,7 +199,6 @@ cd build make DESTDIR=%{buildroot} install -%if 0%{?sles_version} == 0 %define php_extension_dir %( %{_bindir}/php-config --extension-dir | sed -e 's#\\n##' ) %define php_inidir /etc/php5/conf.d @@ -209,9 +209,12 @@ cat >%{buildroot}/%{php_inidir}/kolabformat.ini <<EOF extension=kolabformat.so EOF -%endif + +%clean +rm -r %{buildroot} %post -n %{name}%{soname} -p /sbin/ldconfig + %postun -n %{name}%{soname} -p /sbin/ldconfig %files -n %{name}%{soname} @@ -223,32 +226,29 @@ %defattr(-,root,root) %doc COPYING %{python_sitearch}/_kolabformat.so -%{python_sitearch}/kolabformat.py +%{python_sitearch}/kolabformat.py* -%if 0%{?sles_version} == 0 %files -n php-%{name}%{soname} %defattr(-,root,root) %doc COPYING %config(noreplace) %{php_inidir}/kolabformat.ini %{_datadir}/php5/kolabformat.php %{php_extension_dir}/kolabformat.so -%endif %files -n java-%{name}%{soname} %defattr(-,root,root) %doc COPYING %{_libdir}/java/* -%if 0%{?sles_version} == 0 %files -n mono-%{name}%{soname} %defattr(-,root,root) %doc COPYING %{_prefix}/lib/mono/* -%endif %files devel %defattr(-,root,root) %doc DEVELOPMENT +%dir %{_libdir}/cmake/ %{_libdir}/cmake/Libkolabxml/ %{_libdir}/libkolabxml.so %{_includedir}/kolabxml/ ++++++ fix_php5_bindings.diff ++++++ --- /var/tmp/diff_new_pack.dUPdhi/_old 2013-04-24 15:56:23.000000000 +0200 +++ /var/tmp/diff_new_pack.dUPdhi/_new 2013-04-24 15:56:23.000000000 +0200 @@ -15,7 +15,7 @@ if (APPLE) set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -flat_namespace -undefined suppress" ) endif() -+set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-variable -Wno-unused-label -Wno-maybe-uninitialized -Wno-unused-function" ) ++set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-variable -Wno-unused-label -Wno-unused-function" ) + +# Try to find PHP5 +find_path(PHP_INCLUDE_DIR NAMES main/php.h PATH_SUFFIXES php php5) ++++++ fix_uuid_includes_SLE.diff ++++++ diff -Ppru src/utils.cpp src/utils.cpp --- src/utils.cpp 2013-02-26 12:31:37.000000000 +0100 +++ src/utils.cpp 2013-04-22 16:16:20.244099388 +0200 @@ -26,7 +26,7 @@ #include <boost/uuid/uuid_io.hpp> #include <boost/uuid/uuid_generators.hpp> #else -#include <uuid.h> +#include <ossp/uuid.h> #endif #include <boost/lexical_cast.hpp> -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
