Hello community, here is the log from the commit of package libkolab for openSUSE:Factory checked in at 2014-01-08 20:07:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libkolab (Old) and /work/SRC/openSUSE:Factory/.libkolab.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libkolab" Changes: -------- --- /work/SRC/openSUSE:Factory/libkolab/libkolab.changes 2014-01-05 10:25:01.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libkolab.new/libkolab.changes 2014-01-08 20:07:57.000000000 +0100 @@ -1,0 +2,5 @@ +Wed Jan 8 11:12:38 UTC 2014 - aj@ajaissle.de + +- libkolab-0.5.0_kolab_static.patch - Fix use of static linking in kolabformatchecker + +------------------------------------------------------------------- New: ---- libkolab-0.5.0_kolab_static.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libkolab.spec ++++++ --- /var/tmp/diff_new_pack.b8nEu5/_old 2014-01-08 20:07:57.000000000 +0100 +++ /var/tmp/diff_new_pack.b8nEu5/_new 2014-01-08 20:07:57.000000000 +0100 @@ -33,6 +33,8 @@ Group: Development/Libraries/C and C++ Url: https://kolab.org/about/libkolab Source: http://mirror.kolabsys.com/pub/releases/%{name}-%{version}.tar.gz +# PATCH-FIX-UPSTREAM libkolab-0.5.0_kolab_static.patch -- We do not want to use static linking in kolabformatchecker +Patch0: libkolab-0.5.0_kolab_static.patch BuildRequires: boost-devel BuildRequires: cmake >= 2.6.4 %if ! 0%{?with_kolab} @@ -108,6 +110,7 @@ %prep %setup -q +%patch0 -p0 %build export CXXFLAGS="%{optflags}" @@ -118,6 +121,7 @@ cmake -DCMAKE_INSTALL_PREFIX="%{_prefix}" \ -DLIB_INSTALL_DIR="%{_lib}" \ + -DINCLUDE_INSTALL_DIR="%{_includedir}" \ -DCMAKE_SKIP_RPATH=TRUE \ -DCMAKE_BUILD_TYPE=RELEASE \ -DLibkolabxml_DIR=%{_libdir}/cmake/Libkolabxml \ @@ -128,6 +132,7 @@ %endif -DPHP_BINDINGS=TRUE -DPHP_INSTALL_DIR=%{php_extdir} \ -DPYTHON_BINDINGS=TRUE -DPYTHON_INSTALL_DIR=%{python_sitearch} \ + -DBUILD_TESTS=FALSE \ .. %{__make} %{?_smp_mflags} @@ -176,9 +181,9 @@ %{python_sitearch}/kolab/calendaring.py* %{python_sitearch}/kolab/_icalendar.so %{python_sitearch}/kolab/icalendar.py* -%{python_sitearch}/kolab/_kolabobject.so* +%{python_sitearch}/kolab/_kolabobject.so %{python_sitearch}/kolab/kolabobject.py* -%{python_sitearch}/kolab/_shared.so* +%{python_sitearch}/kolab/_shared.so %{python_sitearch}/kolab/shared.py* %files devel ++++++ libkolab-0.5.0_kolab_static.patch ++++++ diff -Ppru utils/CMakeLists.txt utils/CMakeLists.txt --- utils/CMakeLists.txt 2013-10-14 17:57:12.000000000 +0200 +++ utils/CMakeLists.txt 2013-11-25 10:37:45.053026279 +0100 @@ -2,4 +2,4 @@ find_package(Boost REQUIRED COMPONENTS program_options) add_executable(kolabformatchecker kolabformatchecker.cpp) -target_link_libraries(kolabformatchecker kolab_static ${Boost_LIBRARIES}) +target_link_libraries(kolabformatchecker kolab ${Boost_LIBRARIES}) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org