commit libkolabxml for openSUSE:Factory
Hello community,
here is the log from the commit of package libkolabxml for openSUSE:Factory
checked in at 2020-05-16 22:24:41
Comparing /work/SRC/openSUSE:Factory/libkolabxml (Old)
and /work/SRC/openSUSE:Factory/.libkolabxml.new.2738 (New)
Package is "libkolabxml"
Sat May 16 22:24:41 2020 rev:32 rq:805615 version:1.1.6
Changes:
--- /work/SRC/openSUSE:Factory/libkolabxml/libkolabxml.changes 2020-01-19
20:52:35.403897471 +0100
+++ /work/SRC/openSUSE:Factory/.libkolabxml.new.2738/libkolabxml.changes
2020-05-16 22:24:45.493079043 +0200
@@ -1,0 +2,11 @@
+Thu May 14 14:27:49 UTC 2020 - Fabian Vogt
+
+- Disable mono bindings by default, broken with latest mono changes
+ in TW and not used by anything currently
+
+---
+Thu May 14 14:25:26 UTC 2020 - Christophe Giboudeaux
+
+- Remove more obsolete conditions.
+
+---
Other differences:
--
++ libkolabxml.spec ++
--- /var/tmp/diff_new_pack.2DkAl9/_old 2020-05-16 22:24:46.909081950 +0200
+++ /var/tmp/diff_new_pack.2DkAl9/_new 2020-05-16 22:24:46.913081958 +0200
@@ -19,13 +19,9 @@
%global php_extdir %{_libdir}/php5/extensions
%global php_confdir %{_sysconfdir}/php5/conf.d
%define libname %{name}1
-%if 0%{?suse_version} >= 1330
%bcond_with php
-%else
-%bcond_without php
-%endif
%bcond_without java
-%bcond_without mono
+%bcond_with mono
%bcond_with tests
Name: libkolabxml
Version:1.1.6
@@ -47,12 +43,8 @@
%if %{with php}
BuildRequires: php-devel >= 5.3
%endif
-%if 0%{?suse_version} > 1325
BuildRequires: libboost_system-devel
BuildRequires: libboost_thread-devel
-%else
-BuildRequires: boost-devel >= 1.4.1
-%endif
%if %{with java}
BuildRequires: java-devel
%endif
commit libkolabxml for openSUSE:Factory
Hello community,
here is the log from the commit of package libkolabxml for openSUSE:Factory
checked in at 2020-01-19 20:52:07
Comparing /work/SRC/openSUSE:Factory/libkolabxml (Old)
and /work/SRC/openSUSE:Factory/.libkolabxml.new.26092 (New)
Package is "libkolabxml"
Sun Jan 19 20:52:07 2020 rev:31 rq:764418 version:1.1.6
Changes:
--- /work/SRC/openSUSE:Factory/libkolabxml/libkolabxml.changes 2019-09-18
13:07:54.976734372 +0200
+++ /work/SRC/openSUSE:Factory/.libkolabxml.new.26092/libkolabxml.changes
2020-01-19 20:52:35.403897471 +0100
@@ -1,0 +2,6 @@
+Tue Jan 14 16:27:55 UTC 2020 - Christophe Giboudeaux
+
+- Drop the python bindings package to get rid of the python2 dependency.
+- Remove obsolete conditions.
+
+---
Other differences:
--
++ libkolabxml.spec ++
--- /var/tmp/diff_new_pack.ZRWBs2/_old 2020-01-19 20:52:38.047898860 +0100
+++ /var/tmp/diff_new_pack.ZRWBs2/_new 2020-01-19 20:52:38.051898862 +0100
@@ -1,7 +1,7 @@
#
# spec file for package libkolabxml
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -42,7 +42,6 @@
BuildRequires: libcurl-devel
BuildRequires: libxerces-c-devel >= 3.0
BuildRequires: pkgconfig
-BuildRequires: python-devel
BuildRequires: swig >= 2.0
BuildRequires: xsd >= 3.0
%if %{with php}
@@ -98,16 +97,12 @@
Summary:Kolab XML Format Schema Definitions Library
Group: Development/Libraries/C and C++
Requires: %{libname} = %{version}
-Requires: libcurl-devel
-Requires: libxerces-c-devel
-%if 0%{?suse_version} > 1325
Requires: libboost_chrono-devel
Requires: libboost_date_time-devel
Requires: libboost_system-devel
Requires: libboost_thread-devel
-%else
-Requires: boost-devel
-%endif
+Requires: libcurl-devel
+Requires: libxerces-c-devel
%description devel
Libkolabxml serves as a serialization/de-serialization library for the the
Kolab XML Format
@@ -181,26 +176,6 @@
This package provides the php bindings for Libkolabxml
-%package -n python-%{libname}
-Summary:Python bindings for %{name}
-Group: Development/Languages/Python
-Requires: %{libname} = %{version}
-Provides: python-kolabformat = %{version}
-
-%description -n python-%{libname}
-Libkolabxml serves as a serialization/de-serialization library for the the
Kolab XML Format
-
-Features:
-- Based on official standards:
-- Todos/Events/Journals are fully xCal compliant
-- Contacts/Distributionlists are fully xCard compliant
-- Can model everything which is used in the Kolab XML Format 2.0, Kontact and
Roundcube.
-- Easily extensible
-- Canonical storage format
-- Supports Todos/Events/Journals/Contacts/Distribution
Lists/Notes/Configurations
-
-This package provides the python bindings for Libkolabxml
-
%prep
%setup -q
%patch0 -p1
@@ -218,15 +193,12 @@
%if %{with php}
-DPHP_BINDINGS=TRUE -DPHP_INSTALL_DIR=%{php_extdir}\
%endif
--DPYTHON_BINDINGS=TRUE -DPYTHON_INSTALL_DIR=%{python_sitearch} \
%if %{with mono}
-DCSHARP_BINDINGS=TRUE -DCSHARP_INSTALL_DIR=%{_libexecdir}/mono/ \
%endif
%if %{with tests}
-DBUILD_TESTS=TRUE \
-%if 0%{?suse_version} > 1314
-DBUILD_QT5=TRUE \
-%endif
%else
-DBUILD_TESTS=FALSE
%endif
@@ -252,7 +224,6 @@
export LD_LIBRARY_PATH=$(pwd)/build/src/
cd build/
ctest -V ||:
-python src/python/test.py ||:
%endif
%post -n %{libname} -p /sbin/ldconfig
@@ -263,11 +234,6 @@
%doc AUTHORS README
%{_libdir}/libkolabxml.so.*
-%files -n python-%{libname}
-%license COPYING
-%{python_sitearch}/_kolabformat.so
-%{python_sitearch}/kolabformat.py*
-
%if %{with php}
%files -n php-%{libname}
%license COPYING
commit libkolabxml for openSUSE:Factory
Hello community,
here is the log from the commit of package libkolabxml for openSUSE:Factory
checked in at 2019-09-18 13:07:52
Comparing /work/SRC/openSUSE:Factory/libkolabxml (Old)
and /work/SRC/openSUSE:Factory/.libkolabxml.new.7948 (New)
Package is "libkolabxml"
Wed Sep 18 13:07:52 2019 rev:30 rq:731590 version:1.1.6
Changes:
--- /work/SRC/openSUSE:Factory/libkolabxml/libkolabxml.changes 2019-04-17
10:04:17.558494986 +0200
+++ /work/SRC/openSUSE:Factory/.libkolabxml.new.7948/libkolabxml.changes
2019-09-18 13:07:54.976734372 +0200
@@ -1,0 +2,6 @@
+Tue Sep 17 16:29:03 UTC 2019 - Christophe Giboudeaux
+
+- add 0001-Make-sure-boost-is-found-when-using-libkolabxml.patch.
+ boost is a public dependency and must be searched before using libkolabxml.
+
+---
New:
0001-Make-sure-boost-is-found-when-using-libkolabxml.patch
Other differences:
--
++ libkolabxml.spec ++
--- /var/tmp/diff_new_pack.Ir9E81/_old 2019-09-18 13:07:56.324734088 +0200
+++ /var/tmp/diff_new_pack.Ir9E81/_new 2019-09-18 13:07:56.360734080 +0200
@@ -35,7 +35,9 @@
Group: Development/Libraries/C and C++
URL:https://kolab.org/about/libkolabxml
Source:
http://mirror.kolabsys.com/pub/releases/%{name}-%{version}.tar.gz
-BuildRequires: cmake >= 2.6
+# PATCH-FIX-UPSTREAM
+Patch0: 0001-Make-sure-boost-is-found-when-using-libkolabxml.patch
+BuildRequires: cmake
BuildRequires: gcc-c++
BuildRequires: libcurl-devel
BuildRequires: libxerces-c-devel >= 3.0
@@ -201,6 +203,7 @@
%prep
%setup -q
+%patch0 -p1
%build
# Tests require X server and net
++ 0001-Make-sure-boost-is-found-when-using-libkolabxml.patch ++
>From 0e17f04ef1f00c14a5f33c898f7d848823b17a67 Mon Sep 17 00:00:00 2001
From: Christophe Giboudeaux
Date: Tue, 17 Sep 2019 18:19:59 +0200
Subject: [PATCH] Make sure boost is found when using libkolabxml
Boost is a public dependency, it must be found before using libkolabxml.
In order to use find_dependency(), the minimum CMake version is raised to 3.0.
Obsolete CMake checks were consequently removed.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b67f765..349aea6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,9 +1,6 @@
-# The special language NONE is not available in cmake 2.6
-if(${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} GREATER 6)
-project(Libkolabxml NONE)
-else()
-project(Libkolabxml C)
-endif()
+cmake_minimum_required(VERSION 3.0)
+
+project(Libkolabxml NONE)
cmake_minimum_required(VERSION 2.6)
@@ -21,17 +18,6 @@ option( QT5_BUILD "Build libkolabxml using the Qt5
framework" FALSE)
set(Libkolabxml_MODULE_DIR ${Libkolabxml_SOURCE_DIR}/cmake/modules)
set(CMAKE_MODULE_PATH ${Libkolabxml_MODULE_DIR})
-# only available from cmake-2.8.0
-if(${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} GREATER 7)
-cmake_policy(SET CMP0012 NEW)
-endif()
-
-# only available from cmake-2.8.4
-if(${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} GREATER 7 AND
-${CMAKE_PATCH_VERSION} GREATER 3)
-cmake_policy(SET CMP0017 NEW)
-endif()
-
# Versioning
# x.y.z scheme
# Development versions are only x.y
@@ -93,7 +79,7 @@ endforeach()
configure_file(libkolabxml-version.h.cmake
"${CMAKE_BINARY_DIR}/libkolabxml-version.h" @ONLY)
set(Boost_USE_MULTITHREADED ON)
-find_package(Boost REQUIRED COMPONENTS thread system)
+find_package(Boost MODULE REQUIRED COMPONENTS thread system)
if (Boost_FOUND)
message("Found boost in ${Boost_INCLUDE_DIRS}")
endif (Boost_FOUND)
diff --git a/cmake/modules/LibkolabxmlConfig.cmake.in
b/cmake/modules/LibkolabxmlConfig.cmake.in
index 8f04f36..6806e06 100644
--- a/cmake/modules/LibkolabxmlConfig.cmake.in
+++ b/cmake/modules/LibkolabxmlConfig.cmake.in
@@ -1,5 +1,9 @@
get_filename_component(Libkolabxml_CMAKE_DIR ${CMAKE_CURRENT_LIST_FILE} PATH)
#get the directory where this *Config.cmake file is installed
+include(CMakeFindDependencyMacro)
+
+find_dependency(Boost "@Boost_MAJOR_VERSION@.@Boost_MINOR_VERSION@" MODULE
COMPONENTS thread system)
+
# set the version
set(Libkolabxml_VERSION_MAJOR @Libkolabxml_VERSION_MAJOR@)
set(Libkolabxml_VERSION_MINOR @Libkolabxml_VERSION_MINOR@)
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 9abacdf..837f755 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -9,10 +9,6 @@ if(QT5_BUILD)
include_directories(${QT_INCLUDES}) # TODO: Port away from this.
- if(CMAKE_VERSION VERSION_LESS 2.8.9)
-message(FATAL_ERROR "Akonadi Qt 5 build requires at least CMake version
2.8.9")
- endif()
-
if (Qt5_POSITION_INDEPENDENT_CODE)
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
endif()
commit libkolabxml for openSUSE:Factory
Hello community,
here is the log from the commit of package libkolabxml for openSUSE:Factory
checked in at 2019-04-17 10:04:16
Comparing /work/SRC/openSUSE:Factory/libkolabxml (Old)
and /work/SRC/openSUSE:Factory/.libkolabxml.new.17052 (New)
Package is "libkolabxml"
Wed Apr 17 10:04:16 2019 rev:29 rq:693120 version:1.1.6
Changes:
--- /work/SRC/openSUSE:Factory/libkolabxml/libkolabxml.changes 2017-10-05
11:48:48.724795961 +0200
+++ /work/SRC/openSUSE:Factory/.libkolabxml.new.17052/libkolabxml.changes
2019-04-17 10:04:17.558494986 +0200
@@ -1,0 +2,6 @@
+Thu Apr 11 07:37:22 UTC 2019 - Christophe Giboudeaux
+
+- Make sure libxerces-c-devel is installed before using
+ libkolabxml-devel.
+
+---
Other differences:
--
++ libkolabxml.spec ++
--- /var/tmp/diff_new_pack.1MOYZA/_old 2019-04-17 10:04:18.342495929 +0200
+++ /var/tmp/diff_new_pack.1MOYZA/_new 2019-04-17 10:04:18.342495929 +0200
@@ -1,7 +1,7 @@
#
# spec file for package libkolabxml
#
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
@@ -31,9 +31,9 @@
Version:1.1.6
Release:0
Summary:Kolab XML Format Schema Definitions Library
-License:LGPL-3.0+
+License:LGPL-3.0-or-later
Group: Development/Libraries/C and C++
-Url:https://kolab.org/about/libkolabxml
+URL:https://kolab.org/about/libkolabxml
Source:
http://mirror.kolabsys.com/pub/releases/%{name}-%{version}.tar.gz
BuildRequires: cmake >= 2.6
BuildRequires: gcc-c++
@@ -97,6 +97,7 @@
Group: Development/Libraries/C and C++
Requires: %{libname} = %{version}
Requires: libcurl-devel
+Requires: libxerces-c-devel
%if 0%{?suse_version} > 1325
Requires: libboost_chrono-devel
Requires: libboost_date_time-devel
@@ -255,17 +256,18 @@
%postun -n %{libname} -p /sbin/ldconfig
%files -n %{libname}
-%doc AUTHORS COPYING README
+%license COPYING
+%doc AUTHORS README
%{_libdir}/libkolabxml.so.*
%files -n python-%{libname}
-%doc COPYING
+%license COPYING
%{python_sitearch}/_kolabformat.so
%{python_sitearch}/kolabformat.py*
%if %{with php}
%files -n php-%{libname}
-%doc COPYING
+%license COPYING
%config(noreplace) %{php_confdir}/kolabformat.ini
%{_datadir}/php5/kolabformat.php
%{php_extdir}/kolabformat.so
@@ -273,14 +275,14 @@
%if %{with java}
%files -n java-%{libname}
-%doc COPYING
+%license COPYING
%dir %{_libdir}/java/
%{_libdir}/java/*
%endif
%if %{with mono}
%files -n mono-%{libname}
-%doc COPYING
+%license COPYING
%{_libexecdir}/mono/*
%endif
commit libkolabxml for openSUSE:Factory
Hello community,
here is the log from the commit of package libkolabxml for openSUSE:Factory
checked in at 2017-10-05 11:48:41
Comparing /work/SRC/openSUSE:Factory/libkolabxml (Old)
and /work/SRC/openSUSE:Factory/.libkolabxml.new (New)
Package is "libkolabxml"
Thu Oct 5 11:48:41 2017 rev:28 rq:530677 version:1.1.6
Changes:
--- /work/SRC/openSUSE:Factory/libkolabxml/libkolabxml.changes 2017-09-13
22:17:41.078465370 +0200
+++ /work/SRC/openSUSE:Factory/.libkolabxml.new/libkolabxml.changes
2017-10-05 11:48:48.724795961 +0200
@@ -1,0 +2,6 @@
+Tue Oct 3 06:36:40 UTC 2017 - fst...@suse.com
+
+- Don't require gcc-java for the java bindings, since gcc-java will
+ be removed
+
+---
Other differences:
--
++ libkolabxml.spec ++
--- /var/tmp/diff_new_pack.s2j5ll/_old 2017-10-05 11:48:49.312713231 +0200
+++ /var/tmp/diff_new_pack.s2j5ll/_new 2017-10-05 11:48:49.312713231 +0200
@@ -53,8 +53,7 @@
BuildRequires: boost-devel >= 1.4.1
%endif
%if %{with java}
-BuildRequires: gcc-java
-BuildRequires: java-openjdk
+BuildRequires: java-devel
%endif
%if %{with mono}
BuildRequires: mono-devel
commit libkolabxml for openSUSE:Factory
Hello community,
here is the log from the commit of package libkolabxml for openSUSE:Factory
checked in at 2017-09-13 22:17:39
Comparing /work/SRC/openSUSE:Factory/libkolabxml (Old)
and /work/SRC/openSUSE:Factory/.libkolabxml.new (New)
Package is "libkolabxml"
Wed Sep 13 22:17:39 2017 rev:27 rq:517374 version:1.1.6
Changes:
--- /work/SRC/openSUSE:Factory/libkolabxml/libkolabxml.changes 2017-02-16
16:47:58.785018776 +0100
+++ /work/SRC/openSUSE:Factory/.libkolabxml.new/libkolabxml.changes
2017-09-13 22:17:41.078465370 +0200
@@ -1,0 +2,10 @@
+Thu Aug 17 12:13:06 UTC 2017 - tchva...@suse.com
+
+- Drop patches to build against sle11:
+ * libkolabxml-0.8.3_fix_uuid_includes_SLE.patch
+ * libkolabxml-1.0.1_no-maybe-uninitialized.patch
+- Remove few sle11/old openSUSE conditions to make it more readable
+- Disable php on TW as php7 is not supported by the code and php5
+ is removed
+
+---
Old:
libkolabxml-0.8.3_fix_uuid_includes_SLE.patch
libkolabxml-1.0.1_no-maybe-uninitialized.patch
Other differences:
--
++ libkolabxml.spec ++
--- /var/tmp/diff_new_pack.Gzovpa/_old 2017-09-13 22:17:41.754370214 +0200
+++ /var/tmp/diff_new_pack.Gzovpa/_new 2017-09-13 22:17:41.758369651 +0200
@@ -16,16 +16,17 @@
#
-%if 0%{?suse_version} < 1220
-%define _without_java 1
+%global php_extdir %{_libdir}/php5/extensions
+%global php_confdir %{_sysconfdir}/php5/conf.d
+%define libname %{name}1
+%if 0%{?suse_version} >= 1330
+%bcond_with php
+%else
+%bcond_without php
%endif
%bcond_without java
%bcond_without mono
%bcond_with tests
-
-%global php_extdir %{_libdir}/php5/extensions
-%global php_confdir %{_sysconfdir}/php5/conf.d
-%define libname %{name}1
Name: libkolabxml
Version:1.1.6
Release:0
@@ -34,27 +35,22 @@
Group: Development/Libraries/C and C++
Url:https://kolab.org/about/libkolabxml
Source:
http://mirror.kolabsys.com/pub/releases/%{name}-%{version}.tar.gz
-# PATCH-FIX-SLE libkolabxml-0.8.3_fix_uuid_includes_SLE.patch -- Fix uuid.h
path on SLE 11
-Patch0: libkolabxml-0.8.3_fix_uuid_includes_SLE.patch
-# PATCH-FIX-SLE libkolabxml-1.0.1_no-maybe-uninitialized.patch -- Fix php and
python bindings on SLE 11
-Patch2: libkolabxml-1.0.1_no-maybe-uninitialized.patch
-%if 0%{?suse_version} > 1325
-BuildRequires: libboost_system-devel
-BuildRequires: libboost_thread-devel
-%else
-BuildRequires: boost-devel >= 1.4.1
-%endif
BuildRequires: cmake >= 2.6
BuildRequires: gcc-c++
BuildRequires: libcurl-devel
BuildRequires: libxerces-c-devel >= 3.0
-BuildRequires: php-devel >= 5.3
BuildRequires: pkgconfig
BuildRequires: python-devel
BuildRequires: swig >= 2.0
BuildRequires: xsd >= 3.0
-%if 0%{?suse_version} < 1140
-BuildRequires: uuid-devel = 1.6.2
+%if %{with php}
+BuildRequires: php-devel >= 5.3
+%endif
+%if 0%{?suse_version} > 1325
+BuildRequires: libboost_system-devel
+BuildRequires: libboost_thread-devel
+%else
+BuildRequires: boost-devel >= 1.4.1
%endif
%if %{with java}
BuildRequires: gcc-java
@@ -64,17 +60,11 @@
BuildRequires: mono-devel
%endif
%if %{with tests}
-%if 0%{?suse_version} > 1314
BuildRequires: extra-cmake-modules
BuildRequires: pkgconfig(Qt5Core)
BuildRequires: pkgconfig(Qt5Test)
-%else
-BuildRequires: libqt4-devel
-%endif
%endif
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
-
%description
Libkolabxml serves as a serialization/de-serialization library for the the
Kolab XML Format
@@ -151,7 +141,7 @@
%package -n mono-%{libname}
Summary:Mono (C#) bindings for %{name}
-Group: Development/Languages/Mono
+Group: Development/Languages/Other
Requires: %{libname} = %{version}
Provides: csharp-kolabformat = %{version}
@@ -211,24 +201,8 @@
%prep
%setup -q
-%if 0%{?suse_version} < 1140
-%patch0
-%patch2 -p1
-%endif
%build
-# cmake: with earlier releases, we have to create and cd manually, as %%cmake
is not available
-%if 0%{?suse_version} < 1310
-%define cmake cmake
-mkdir build
-cd build
-%endif
-
-# libexecdir: SLE11 expands to libdir, but we want /usr/lib/
-%if 0%{?suse_version} < 1140
-%define _libexecdir %{_prefix}/lib
-%endif
-
# Tests require X server and net
# no-undefined does not work as the php bindings are "magic"
%cmake \
@@ -238,7 +212,9 @@
%if %{with java}
-DJAVA_BINDINGS=TRUE -DJAVA_INSTALL_DIR=%{_jnidir} \
%endif
+%if %{with php}
-DPHP_BINDINGS=TRUE -DPHP_INSTALL_DIR=%{php_extdir}\
+%endif
-DPYTHON_BINDINGS=TRUE -DPYTHON_INSTALL_DIR=%{python_sitearch} \
%if %{with mono}
-DCSHARP_BINDINGS=TRUE -DCSHARP_INSTALL_DIR=%{_libexecdir}/mono/ \
@@ -249,27 +225,16 @@
commit libkolabxml for openSUSE:Factory
Hello community,
here is the log from the commit of package libkolabxml for openSUSE:Factory
checked in at 2017-02-16 16:47:57
Comparing /work/SRC/openSUSE:Factory/libkolabxml (Old)
and /work/SRC/openSUSE:Factory/.libkolabxml.new (New)
Package is "libkolabxml"
Changes:
--- /work/SRC/openSUSE:Factory/libkolabxml/libkolabxml.changes 2017-02-13
07:45:39.383946838 +0100
+++ /work/SRC/openSUSE:Factory/.libkolabxml.new/libkolabxml.changes
2017-02-16 16:47:58.785018776 +0100
@@ -1,0 +2,5 @@
+Mon Feb 13 08:53:00 UTC 2017 - jeng...@inai.de
+
+- RPM group fix; drop unnecessary use of %__ type macros
+
+---
Other differences:
--
++ libkolabxml.spec ++
--- /var/tmp/diff_new_pack.diT3UN/_old 2017-02-16 16:47:59.360936998 +0100
+++ /var/tmp/diff_new_pack.diT3UN/_new 2017-02-16 16:47:59.364936430 +0100
@@ -89,7 +89,7 @@
%package -n %{libname}
Summary:Kolab XML Format Schema Definitions Library
-Group: Development/Libraries/C and C++
+Group: System/Libraries
%description -n %{libname}
Libkolabxml serves as a serialization/de-serialization library for the the
Kolab XML Format
@@ -265,7 +265,7 @@
# cmake: with earlier releases, we have to change dir manually, as
%%cmake_install is not available
%if 0%{?suse_version} < 1310
cd build/
-%{__make} DESTDIR=%{buildroot} install
+make DESTDIR=%{buildroot} install
%else
%cmake_install
%endif
commit libkolabxml for openSUSE:Factory
Hello community,
here is the log from the commit of package libkolabxml for openSUSE:Factory
checked in at 2017-02-13 07:45:38
Comparing /work/SRC/openSUSE:Factory/libkolabxml (Old)
and /work/SRC/openSUSE:Factory/.libkolabxml.new (New)
Package is "libkolabxml"
Changes:
--- /work/SRC/openSUSE:Factory/libkolabxml/libkolabxml.changes 2017-02-11
01:38:11.750302834 +0100
+++ /work/SRC/openSUSE:Factory/.libkolabxml.new/libkolabxml.changes
2017-02-13 07:45:39.383946838 +0100
@@ -1,0 +2,7 @@
+Sat Feb 11 23:14:56 UTC 2017 - lbeltr...@kde.org
+
+- Add libboost_Date_time-devel and libboost_chrono-devel to
+ requirements to make them explicit (implicitly required by
+ libboost_thread)
+
+---
Other differences:
--
++ libkolabxml.spec ++
--- /var/tmp/diff_new_pack.3367XC/_old 2017-02-13 07:45:40.735752200 +0100
+++ /var/tmp/diff_new_pack.3367XC/_new 2017-02-13 07:45:40.739751624 +0100
@@ -109,6 +109,8 @@
Requires: %{libname} = %{version}
Requires: libcurl-devel
%if 0%{?suse_version} > 1325
+Requires: libboost_chrono-devel
+Requires: libboost_date_time-devel
Requires: libboost_system-devel
Requires: libboost_thread-devel
%else
commit libkolabxml for openSUSE:Factory
Hello community,
here is the log from the commit of package libkolabxml for openSUSE:Factory
checked in at 2017-02-11 01:38:10
Comparing /work/SRC/openSUSE:Factory/libkolabxml (Old)
and /work/SRC/openSUSE:Factory/.libkolabxml.new (New)
Package is "libkolabxml"
Changes:
--- /work/SRC/openSUSE:Factory/libkolabxml/libkolabxml.changes 2017-02-08
10:47:36.451415518 +0100
+++ /work/SRC/openSUSE:Factory/.libkolabxml.new/libkolabxml.changes
2017-02-11 01:38:11.750302834 +0100
@@ -1,0 +2,6 @@
+Wed Feb 8 18:49:49 UTC 2017 - wba...@tmo.at
+
+- Add missing libboost-*-devel requirements to the devel package
+ to fix the build of dependent packages in Tumbleweed
+
+---
Other differences:
--
++ libkolabxml.spec ++
--- /var/tmp/diff_new_pack.mKQ2hO/_old 2017-02-11 01:38:13.130108123 +0100
+++ /var/tmp/diff_new_pack.mKQ2hO/_new 2017-02-11 01:38:13.138106994 +0100
@@ -108,6 +108,12 @@
Group: Development/Libraries/C and C++
Requires: %{libname} = %{version}
Requires: libcurl-devel
+%if 0%{?suse_version} > 1325
+Requires: libboost_system-devel
+Requires: libboost_thread-devel
+%else
+Requires: boost-devel
+%endif
%description devel
Libkolabxml serves as a serialization/de-serialization library for the the
Kolab XML Format
commit libkolabxml for openSUSE:Factory
Hello community,
here is the log from the commit of package libkolabxml for openSUSE:Factory
checked in at 2017-02-08 10:47:35
Comparing /work/SRC/openSUSE:Factory/libkolabxml (Old)
and /work/SRC/openSUSE:Factory/.libkolabxml.new (New)
Package is "libkolabxml"
Changes:
--- /work/SRC/openSUSE:Factory/libkolabxml/libkolabxml.changes 2016-12-01
10:24:39.0 +0100
+++ /work/SRC/openSUSE:Factory/.libkolabxml.new/libkolabxml.changes
2017-02-08 10:47:36.451415518 +0100
@@ -1,0 +2,5 @@
+Wed Feb 1 12:56:50 UTC 2017 - adam.ma...@suse.de
+
+- use individual libboost-*-devel packages instead of boost-devel
+
+---
Other differences:
--
++ libkolabxml.spec ++
--- /var/tmp/diff_new_pack.z1JRS9/_old 2017-02-08 10:47:37.203310740 +0100
+++ /var/tmp/diff_new_pack.z1JRS9/_new 2017-02-08 10:47:37.203310740 +0100
@@ -1,7 +1,7 @@
#
# spec file for package libkolabxml
#
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -38,7 +38,12 @@
Patch0: libkolabxml-0.8.3_fix_uuid_includes_SLE.patch
# PATCH-FIX-SLE libkolabxml-1.0.1_no-maybe-uninitialized.patch -- Fix php and
python bindings on SLE 11
Patch2: libkolabxml-1.0.1_no-maybe-uninitialized.patch
+%if 0%{?suse_version} > 1325
+BuildRequires: libboost_system-devel
+BuildRequires: libboost_thread-devel
+%else
BuildRequires: boost-devel >= 1.4.1
+%endif
BuildRequires: cmake >= 2.6
BuildRequires: gcc-c++
BuildRequires: libcurl-devel
commit libkolabxml for openSUSE:Factory
Hello community,
here is the log from the commit of package libkolabxml for openSUSE:Factory
checked in at 2016-12-01 10:24:38
Comparing /work/SRC/openSUSE:Factory/libkolabxml (Old)
and /work/SRC/openSUSE:Factory/.libkolabxml.new (New)
Package is "libkolabxml"
Changes:
--- /work/SRC/openSUSE:Factory/libkolabxml/libkolabxml.changes 2016-08-08
13:50:52.0 +0200
+++ /work/SRC/openSUSE:Factory/.libkolabxml.new/libkolabxml.changes
2016-12-01 10:24:39.0 +0100
@@ -1,0 +2,20 @@
+Wed Nov 23 17:57:39 UTC 2016 - wba...@tmo.at
+
+- disable parallel build to hopefully fix random build failures
+
+---
+Wed Nov 16 14:31:32 UTC 2016 - a...@ajaissle.de
+
+- New upstream release 1.1.6
+ + The created date is optional
+
+- New upstream release 1.1.5
+ + Support audio alarms without an attachment
+
+- New upstream release 1.1.4
+ + The tests require valid created dates
+
+- New upstream release 1.1.3
+ + The "created" property must be a UTC date-time
+
+---
Old:
libkolabxml-1.1.2.tar.gz
New:
libkolabxml-1.1.6.tar.gz
Other differences:
--
++ libkolabxml.spec ++
--- /var/tmp/diff_new_pack.2THVZ2/_old 2016-12-01 10:24:40.0 +0100
+++ /var/tmp/diff_new_pack.2THVZ2/_new 2016-12-01 10:24:40.0 +0100
@@ -27,7 +27,7 @@
%global php_confdir %{_sysconfdir}/php5/conf.d
%define libname %{name}1
Name: libkolabxml
-Version:1.1.2
+Version:1.1.6
Release:0
Summary:Kolab XML Format Schema Definitions Library
License:LGPL-3.0+
@@ -244,7 +244,9 @@
..
%endif
-make %{?_smp_mflags}
+# parallel build is too unstable currently
+#make %{?_smp_mflags}
+make -j1
%install
# cmake: with earlier releases, we have to change dir manually, as
%%cmake_install is not available
++ libkolabxml-1.1.2.tar.gz -> libkolabxml-1.1.6.tar.gz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libkolabxml-1.1.2/.arcconfig
new/libkolabxml-1.1.6/.arcconfig
--- old/libkolabxml-1.1.2/.arcconfig1970-01-01 01:00:00.0 +0100
+++ new/libkolabxml-1.1.6/.arcconfig2016-09-02 10:50:26.0 +0200
@@ -0,0 +1,3 @@
+{
+ "phabricator.uri" : "https://git.kolab.org";
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libkolabxml-1.1.2/CMakeLists.txt
new/libkolabxml-1.1.6/CMakeLists.txt
--- old/libkolabxml-1.1.2/CMakeLists.txt2015-11-25 12:36:44.0
+0100
+++ new/libkolabxml-1.1.6/CMakeLists.txt2016-09-02 10:50:26.0
+0200
@@ -45,7 +45,7 @@
set (Libkolabxml_VERSION_MAJOR 1)
set (Libkolabxml_VERSION_MINOR 1)
# Enable the full x.y.z version only for release versions
-set (Libkolabxml_VERSION_PATCH 2)
+set (Libkolabxml_VERSION_PATCH 6)
set (Libkolabxml_VERSION
"${Libkolabxml_VERSION_MAJOR}.${Libkolabxml_VERSION_MINOR}.${Libkolabxml_VERSION_PATCH}"
)
#set (Libkolabxml_VERSION
"${Libkolabxml_VERSION_MAJOR}.${Libkolabxml_VERSION_MINOR}" )
@@ -66,7 +66,7 @@
COMMAND git archive --prefix=${SNAPSHOTARCHIVE_NAME}/ HEAD
| bzip2 > ${CMAKE_BINARY_DIR}/${SNAPSHOTARCHIVE_NAME}.tar.bz2
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
-
+
#It's possible to make dist targets only using:
#cmake -DDIST_ONLY=TRUE ..
if (DIST_ONLY)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libkolabxml-1.1.2/src/containers/kolabcontainers.cpp
new/libkolabxml-1.1.6/src/containers/kolabcontainers.cpp
--- old/libkolabxml-1.1.2/src/containers/kolabcontainers.cpp2015-11-25
12:36:44.0 +0100
+++ new/libkolabxml-1.1.6/src/containers/kolabcontainers.cpp2016-09-02
10:50:26.0 +0200
@@ -637,6 +637,12 @@
{
}
+Alarm::Alarm(Alarm::Type type)
+: d(new Alarm::Private)
+{
+d->type = AudioAlarm;
+}
+
Alarm::Alarm(const std::string &text)
: d(new Alarm::Private)
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libkolabxml-1.1.2/src/containers/kolabcontainers.h
new/libkolabxml-1.1.6/src/containers/kolabcontainers.h
--- old/libkolabxml-1.1.2/src/containers/kolabcontainers.h 2015-11-25
12:36:44.0 +0100
+++ new/libkolabxml-1.1.6/src/containers/kolabcontainers.h 2016-09-02
10:50:26.0 +0200
@@ -224,6 +224,7 @@
};
Alarm();
+Alarm(Type);
Alarm(const Alarm &);
~Alarm();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libkolabxml-1.1.2/src/objectvalidation.cpp
new/libkolabxml-1.1.6/src/objectvalidation.cpp
--- old/libkolabxml-1
commit libkolabxml for openSUSE:Factory
Hello community,
here is the log from the commit of package libkolabxml for openSUSE:Factory
checked in at 2016-08-08 13:50:49
Comparing /work/SRC/openSUSE:Factory/libkolabxml (Old)
and /work/SRC/openSUSE:Factory/.libkolabxml.new (New)
Package is "libkolabxml"
Changes:
--- /work/SRC/openSUSE:Factory/libkolabxml/libkolabxml.changes 2016-01-23
01:05:04.0 +0100
+++ /work/SRC/openSUSE:Factory/.libkolabxml.new/libkolabxml.changes
2016-08-08 13:50:52.0 +0200
@@ -1,0 +2,6 @@
+Fri Jul 22 17:18:15 UTC 2016 - wba...@tmo.at
+
+- Remove kdelibs4support-devel from the build requirements, it's
+ not needed
+
+---
Other differences:
--
++ libkolabxml.spec ++
--- /var/tmp/diff_new_pack.5Phbms/_old 2016-08-08 13:50:53.0 +0200
+++ /var/tmp/diff_new_pack.5Phbms/_new 2016-08-08 13:50:53.0 +0200
@@ -61,7 +61,6 @@
%if %{with tests}
%if 0%{?suse_version} > 1314
BuildRequires: extra-cmake-modules
-BuildRequires: kdelibs4support-devel
BuildRequires: pkgconfig(Qt5Core)
BuildRequires: pkgconfig(Qt5Test)
%else
commit libkolabxml for openSUSE:Factory
Hello community,
here is the log from the commit of package libkolabxml for openSUSE:Factory
checked in at 2016-01-23 01:05:02
Comparing /work/SRC/openSUSE:Factory/libkolabxml (Old)
and /work/SRC/openSUSE:Factory/.libkolabxml.new (New)
Package is "libkolabxml"
Changes:
--- /work/SRC/openSUSE:Factory/libkolabxml/libkolabxml.changes 2016-01-09
23:09:58.0 +0100
+++ /work/SRC/openSUSE:Factory/.libkolabxml.new/libkolabxml.changes
2016-01-23 01:05:04.0 +0100
@@ -1,0 +2,6 @@
+Fri Jan 8 14:28:11 UTC 2016 - tittiatc...@gmail.com
+
+- New upstream release 1.1.2
+ - Build fixes for the tests (Qt5 related)
+
+---
Old:
libkolabxml-1.1.1.tar.gz
New:
libkolabxml-1.1.2.tar.gz
Other differences:
--
++ libkolabxml.spec ++
--- /var/tmp/diff_new_pack.z1ZXaX/_old 2016-01-23 01:05:04.0 +0100
+++ /var/tmp/diff_new_pack.z1ZXaX/_new 2016-01-23 01:05:04.0 +0100
@@ -1,7 +1,7 @@
#
# spec file for package libkolabxml
#
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -27,7 +27,7 @@
%global php_confdir %{_sysconfdir}/php5/conf.d
%define libname %{name}1
Name: libkolabxml
-Version:1.1.1
+Version:1.1.2
Release:0
Summary:Kolab XML Format Schema Definitions Library
License:LGPL-3.0+
++ libkolabxml-1.1.1.tar.gz -> libkolabxml-1.1.2.tar.gz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libkolabxml-1.1.1/CMakeLists.txt
new/libkolabxml-1.1.2/CMakeLists.txt
--- old/libkolabxml-1.1.1/CMakeLists.txt2015-07-31 10:52:28.0
+0200
+++ new/libkolabxml-1.1.2/CMakeLists.txt2015-11-25 12:36:44.0
+0100
@@ -45,7 +45,7 @@
set (Libkolabxml_VERSION_MAJOR 1)
set (Libkolabxml_VERSION_MINOR 1)
# Enable the full x.y.z version only for release versions
-set (Libkolabxml_VERSION_PATCH 1)
+set (Libkolabxml_VERSION_PATCH 2)
set (Libkolabxml_VERSION
"${Libkolabxml_VERSION_MAJOR}.${Libkolabxml_VERSION_MINOR}.${Libkolabxml_VERSION_PATCH}"
)
#set (Libkolabxml_VERSION
"${Libkolabxml_VERSION_MAJOR}.${Libkolabxml_VERSION_MINOR}" )
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libkolabxml-1.1.1/tests/CMakeLists.txt
new/libkolabxml-1.1.2/tests/CMakeLists.txt
--- old/libkolabxml-1.1.1/tests/CMakeLists.txt 2015-07-31 10:52:28.0
+0200
+++ new/libkolabxml-1.1.2/tests/CMakeLists.txt 2015-11-25 12:36:44.0
+0100
@@ -7,7 +7,6 @@
find_package(Qt5Core REQUIRED)
find_package(Qt5Test REQUIRED)
- include("../cmake/modules/ECMQt4To5Porting.cmake")
include_directories(${QT_INCLUDES}) # TODO: Port away from this.
if(CMAKE_VERSION VERSION_LESS 2.8.9)
@@ -18,7 +17,8 @@
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
endif()
- set(QT_QTTEST_LIBRARIES Qt5::Test)
+ set(QT_QTCORE_LIBRARY Qt5::Core)
+ set(QT_QTTEST_LIBRARY Qt5::Test)
else()
set(QT_USE_IMPORTED_TARGETS TRUE) # Qt 4 only
set(QT_MIN_VERSION 4.6.2) # Qt 4 only
@@ -32,7 +32,7 @@
include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/.. )
include_directories(${CMAKE_CURRENT_BINARY_DIR})
-include_directories(${QT_INCLUDES} ${QT_INCLUDE_DIR} QtCore)
+include_directories(${QT_INCLUDES} ${QT_INCLUDE_DIR})
if (NOT APPLE)
set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wl,--no-undefined" )
endif()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libkolabxml-1.1.1/tests/kolabconversationtest.cpp
new/libkolabxml-1.1.2/tests/kolabconversationtest.cpp
--- old/libkolabxml-1.1.1/tests/kolabconversationtest.cpp 2015-07-31
10:52:28.0 +0200
+++ new/libkolabxml-1.1.2/tests/kolabconversationtest.cpp 2015-11-25
12:36:44.0 +0100
@@ -27,7 +27,7 @@
void KolabConversationTest::configurationDeserialationTest()
{
boost::shared_ptr ptr =
Kolab::KolabObjects::deserializeObject(TEST_DATA_PATH
"/testfiles/testConfiguration.xml", true);
-QVERIFY(ptr);
+QVERIFY(static_cast(ptr));
QVERIFY(ptr->isValid());
QCOMPARE(ptr->type(), Kolab::Configuration::TypeRelation);
@@ -36,7 +36,7 @@
void KolabConversationTest::noteDeserialationTest()
{
boost::shared_ptr ptr =
Kolab::KolabObjects::deserializeObject(TEST_DATA_PATH
"/testfiles/testNote.xml", true);
-QVERIFY(ptr);
+QVERIFY(static_cast(ptr));
QVERIFY(ptr->isValid());
QCOMPARE(ptr->summary(), std::string("summarytext"));
}
diff -u
commit libkolabxml for openSUSE:Factory
Hello community,
here is the log from the commit of package libkolabxml for openSUSE:Factory
checked in at 2016-01-09 23:09:57
Comparing /work/SRC/openSUSE:Factory/libkolabxml (Old)
and /work/SRC/openSUSE:Factory/.libkolabxml.new (New)
Package is "libkolabxml"
Changes:
--- /work/SRC/openSUSE:Factory/libkolabxml/libkolabxml.changes 2015-04-06
00:23:58.0 +0200
+++ /work/SRC/openSUSE:Factory/.libkolabxml.new/libkolabxml.changes
2016-01-09 23:09:58.0 +0100
@@ -1,0 +2,14 @@
+Fri Aug 7 09:07:10 UTC 2015 - tittiatc...@gmail.com
+
+- New upstream release 1.1.1
+ - Qt5 support for the tests
+
+---
+Mon Apr 6 14:04:04 UTC 2015 - a...@ajaissle.de
+
+- Add %bcond_with tests
+- libqt4-devel is only needed for the tests
+- Add %check section; only run %check when %{with tests} in on
+- Set minversion for some of the build requirements
+
+---
Old:
libkolabxml-1.1.0.tar.gz
New:
libkolabxml-1.1.1.tar.gz
Other differences:
--
++ libkolabxml.spec ++
--- /var/tmp/diff_new_pack.PmKzhe/_old 2016-01-09 23:09:59.0 +0100
+++ /var/tmp/diff_new_pack.PmKzhe/_new 2016-01-09 23:09:59.0 +0100
@@ -21,12 +21,13 @@
%endif
%bcond_without java
%bcond_without mono
+%bcond_with tests
%global php_extdir %{_libdir}/php5/extensions
%global php_confdir %{_sysconfdir}/php5/conf.d
%define libname %{name}1
Name: libkolabxml
-Version:1.1.0
+Version:1.1.1
Release:0
Summary:Kolab XML Format Schema Definitions Library
License:LGPL-3.0+
@@ -37,28 +38,38 @@
Patch0: libkolabxml-0.8.3_fix_uuid_includes_SLE.patch
# PATCH-FIX-SLE libkolabxml-1.0.1_no-maybe-uninitialized.patch -- Fix php and
python bindings on SLE 11
Patch2: libkolabxml-1.0.1_no-maybe-uninitialized.patch
-BuildRequires: boost-devel
+BuildRequires: boost-devel >= 1.4.1
BuildRequires: cmake >= 2.6
BuildRequires: gcc-c++
-%if %{with java}
-BuildRequires: gcc-java
-BuildRequires: java-openjdk
-%endif
BuildRequires: libcurl-devel
-BuildRequires: libqt4-devel
-BuildRequires: libxerces-c-devel
-%if %{with mono}
-BuildRequires: mono-devel
-%endif
+BuildRequires: libxerces-c-devel >= 3.0
BuildRequires: php-devel >= 5.3
BuildRequires: pkgconfig
BuildRequires: python-devel
BuildRequires: swig >= 2.0
-BuildRequires: xsd
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
+BuildRequires: xsd >= 3.0
%if 0%{?suse_version} < 1140
BuildRequires: uuid-devel = 1.6.2
%endif
+%if %{with java}
+BuildRequires: gcc-java
+BuildRequires: java-openjdk
+%endif
+%if %{with mono}
+BuildRequires: mono-devel
+%endif
+%if %{with tests}
+%if 0%{?suse_version} > 1314
+BuildRequires: extra-cmake-modules
+BuildRequires: kdelibs4support-devel
+BuildRequires: pkgconfig(Qt5Core)
+BuildRequires: pkgconfig(Qt5Test)
+%else
+BuildRequires: libqt4-devel
+%endif
+%endif
+
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
Libkolabxml serves as a serialization/de-serialization library for the the
Kolab XML Format
@@ -209,7 +220,9 @@
# Tests require X server and net
# no-undefined does not work as the php bindings are "magic"
%cmake \
--DCMAKE_EXE_LINKER_FLAGS=-Wl,--as-needed
-DCMAKE_MODULE_LINKER_FLAGS=-Wl,--as-needed
-DCMAKE_SHARED_LINKER_FLAGS=-Wl,--as-needed \
+-DCMAKE_EXE_LINKER_FLAGS=-Wl,--as-needed \
+-DCMAKE_MODULE_LINKER_FLAGS=-Wl,--as-needed \
+-DCMAKE_SHARED_LINKER_FLAGS=-Wl,--as-needed \
%if %{with java}
-DJAVA_BINDINGS=TRUE -DJAVA_INSTALL_DIR=%{_jnidir} \
%endif
@@ -218,7 +231,14 @@
%if %{with mono}
-DCSHARP_BINDINGS=TRUE -DCSHARP_INSTALL_DIR=%{_libexecdir}/mono/ \
%endif
+%if %{with tests}
+-DBUILD_TESTS=TRUE \
+%if 0%{?suse_version} > 1314
+-DBUILD_QT5=TRUE \
+%endif
+%else
-DBUILD_TESTS=FALSE \
+%endif
%if 0%{?suse_version} < 1310
-DCMAKE_INSTALL_PREFIX="%{_prefix}" \
-DLIB_INSTALL_DIR=%{_lib} \
@@ -244,6 +264,14 @@
extension=kolabformat.so
EOF
+%if %{with tests}
+%check
+export LD_LIBRARY_PATH=$(pwd)/build/src/
+cd build/
+ctest -V ||:
+python src/python/test.py ||:
+%endif
+
%post -n %{libname} -p /sbin/ldconfig
%postun -n %{libname} -p /sbin/ldconfig
++ libkolabxml-1.1.0.tar.gz -> libkolabxml-1.1.1.tar.gz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libkolabxml-1.1.0/CMakeLists.txt
new/libkolabxml-1.1.1/CMakeLists.txt
--- old/libkolabxml-1.1.0/CMakeLists.txt2014-12-31 16:55:13.0
+0100
+++ new/libkolabxml-1.1.1/CMakeLists.txt2015-07-31 10:52:28.0
+0200
@@ -14,6 +14,8 @@
option(
commit libkolabxml for openSUSE:Factory
Hello community,
here is the log from the commit of package libkolabxml for openSUSE:Factory
checked in at 2015-04-06 00:23:57
Comparing /work/SRC/openSUSE:Factory/libkolabxml (Old)
and /work/SRC/openSUSE:Factory/.libkolabxml.new (New)
Package is "libkolabxml"
Changes:
--- /work/SRC/openSUSE:Factory/libkolabxml/libkolabxml.changes 2014-12-16
14:50:55.0 +0100
+++ /work/SRC/openSUSE:Factory/.libkolabxml.new/libkolabxml.changes
2015-04-06 00:23:58.0 +0200
@@ -1,0 +2,21 @@
+Wed Apr 1 16:59:03 UTC 2015 - a...@ajaissle.de
+
+- New upstream release 1.1.0
+- Drop patch (upstream inclusion):
+ - libkolabxml-1.0.3_make_version_attribute_not_a_fixed_value.patch
+
+---
+Sat Mar 28 12:23:16 UTC 2015 - a...@ajaissle.de
+
+- Add libkolabxml-1.0.3_make_version_attribute_not_a_fixed_value.patch:
+ Instead of a fixed value, we only use a default value.
+ Fixes problems where objects created with version string '3.0dev'
+ can not be fetched/displayed.
+- Convert %with_java to %bcond_without java
+
+---
+Mon Mar 23 08:08:25 UTC 2015 - sch...@suse.de
+
+- Allow building without mono bindings
+
+---
Old:
libkolabxml-1.0.3.tar.gz
New:
libkolabxml-1.1.0.tar.gz
Other differences:
--
++ libkolabxml.spec ++
--- /var/tmp/diff_new_pack.92kwup/_old 2015-04-06 00:23:58.0 +0200
+++ /var/tmp/diff_new_pack.92kwup/_new 2015-04-06 00:23:58.0 +0200
@@ -1,7 +1,7 @@
#
# spec file for package libkolabxml
#
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -15,20 +15,18 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-%define with_java 1
-%define with_mono 1
-%if 0%{?suse_version} == 1315
-%define with_mono 0
-%endif
+
%if 0%{?suse_version} < 1220
-%define with_java 0
+%define _without_java 1
%endif
+%bcond_without java
+%bcond_without mono
%global php_extdir %{_libdir}/php5/extensions
%global php_confdir %{_sysconfdir}/php5/conf.d
%define libname %{name}1
Name: libkolabxml
-Version:1.0.3
+Version:1.1.0
Release:0
Summary:Kolab XML Format Schema Definitions Library
License:LGPL-3.0+
@@ -42,14 +40,14 @@
BuildRequires: boost-devel
BuildRequires: cmake >= 2.6
BuildRequires: gcc-c++
-%if 0%{?with_java}
+%if %{with java}
BuildRequires: gcc-java
BuildRequires: java-openjdk
%endif
BuildRequires: libcurl-devel
BuildRequires: libqt4-devel
BuildRequires: libxerces-c-devel
-%if 0%{?with_mono}
+%if %{with mono}
BuildRequires: mono-devel
%endif
BuildRequires: php-devel >= 5.3
@@ -108,7 +106,6 @@
- Canonical storage format
- Supports Todos/Events/Journals/Contacts/Distribution
Lists/Notes/Configurations
-%if 0%{?with_java}
%package -n java-%{libname}
Summary:Java bindings for %{name}
Group: Development/Languages/Java
@@ -128,9 +125,7 @@
- Supports Todos/Events/Journals/Contacts/Distribution
Lists/Notes/Configurations
This package provides the java bindings for Libkolabxml
-%endif
-%if 0%{?with_mono}
%package -n mono-%{libname}
Summary:Mono (C#) bindings for %{name}
Group: Development/Languages/Mono
@@ -150,7 +145,6 @@
- Supports Todos/Events/Journals/Contacts/Distribution
Lists/Notes/Configurations
This package provides the mono (C#) bindings for Libkolabxml
-%endif
%package -n php-%{libname}
Summary:PHP bindings for %{name}
@@ -216,12 +210,12 @@
# no-undefined does not work as the php bindings are "magic"
%cmake \
-DCMAKE_EXE_LINKER_FLAGS=-Wl,--as-needed
-DCMAKE_MODULE_LINKER_FLAGS=-Wl,--as-needed
-DCMAKE_SHARED_LINKER_FLAGS=-Wl,--as-needed \
-%if 0%{?with_java}
+%if %{with java}
-DJAVA_BINDINGS=TRUE -DJAVA_INSTALL_DIR=%{_jnidir} \
%endif
-DPHP_BINDINGS=TRUE -DPHP_INSTALL_DIR=%{php_extdir}\
-DPYTHON_BINDINGS=TRUE -DPYTHON_INSTALL_DIR=%{python_sitearch} \
-%if 0%{?with_mono}
+%if %{with mono}
-DCSHARP_BINDINGS=TRUE -DCSHARP_INSTALL_DIR=%{_libexecdir}/mono/ \
%endif
-DBUILD_TESTS=FALSE \
@@ -272,7 +266,7 @@
%{_datadir}/php5/kolabformat.php
%{php_extdir}/kolabformat.so
-%if 0%{?with_java}
+%if %{with java}
%files -n java-%{libname}
%defattr(-,root,root)
%doc COPYING
@@ -280,7 +274,7 @@
%{_libdir}/java/*
%endif
-%if 0%{?with_mono}
+%if %{with mono}
%files -n mono-%{libname}
%defattr(-,root,root)
%do
commit libkolabxml for openSUSE:Factory
Hello community,
here is the log from the commit of package libkolabxml for openSUSE:Factory
checked in at 2014-12-16 14:50:54
Comparing /work/SRC/openSUSE:Factory/libkolabxml (Old)
and /work/SRC/openSUSE:Factory/.libkolabxml.new (New)
Package is "libkolabxml"
Changes:
--- /work/SRC/openSUSE:Factory/libkolabxml/libkolabxml.changes 2014-09-02
08:22:09.0 +0200
+++ /work/SRC/openSUSE:Factory/.libkolabxml.new/libkolabxml.changes
2014-12-16 14:50:55.0 +0100
@@ -1,0 +2,19 @@
+Wed Dec 10 00:24:50 UTC 2014 - a...@ajaissle.de
+
+- Reenable building for non-Factory openSUSE
+
+---
+Sat Nov 8 19:01:25 UTC 2014 - hrvoje.sen...@gmail.com
+
+- Revert the added Requires in devel subpackage from previous change:
+ if someone needs bindings explicitly, they can buildrequire them
+ explicitly
+
+---
+Fri Nov 7 10:50:08 UTC 2014 - tchva...@suse.com
+
+- Version bump to 1.0.3
+- Cleanup with spec-cleaner
+- no-undefined disabled as php-bindings cant cope with it
+
+---
Old:
libkolabxml-1.0.2.tar.gz
New:
libkolabxml-1.0.3.tar.gz
Other differences:
--
++ libkolabxml.spec ++
--- /var/tmp/diff_new_pack.wVUE8Y/_old 2014-12-16 14:51:00.0 +0100
+++ /var/tmp/diff_new_pack.wVUE8Y/_new 2014-12-16 14:51:00.0 +0100
@@ -15,17 +15,21 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
+%define with_java 1
+%define with_mono 1
+%if 0%{?suse_version} == 1315
+%define with_mono 0
+%endif
+%if 0%{?suse_version} < 1220
+%define with_java 0
+%endif
-%global phpdir php5
-%global php_extdir %{_libdir}/%{phpdir}/extensions
-%global php_inidir %{_sysconfdir}/%{phpdir}/conf.d
-
-%bcond_without mono
-
+%global php_extdir %{_libdir}/php5/extensions
+%global php_confdir %{_sysconfdir}/php5/conf.d
+%define libname %{name}1
Name: libkolabxml
-Version:1.0.2
+Version:1.0.3
Release:0
-%define soname 1
Summary:Kolab XML Format Schema Definitions Library
License:LGPL-3.0+
Group: Development/Libraries/C and C++
@@ -35,19 +39,17 @@
Patch0: libkolabxml-0.8.3_fix_uuid_includes_SLE.patch
# PATCH-FIX-SLE libkolabxml-1.0.1_no-maybe-uninitialized.patch -- Fix php and
python bindings on SLE 11
Patch2: libkolabxml-1.0.1_no-maybe-uninitialized.patch
-
BuildRequires: boost-devel
BuildRequires: cmake >= 2.6
BuildRequires: gcc-c++
+%if 0%{?with_java}
BuildRequires: gcc-java
BuildRequires: java-openjdk
+%endif
BuildRequires: libcurl-devel
BuildRequires: libqt4-devel
-%if 0%{?sles_version} == 11
-BuildRequires: uuid-devel = 1.6.2
-%endif
BuildRequires: libxerces-c-devel
-%if %{with mono}
+%if 0%{?with_mono}
BuildRequires: mono-devel
%endif
BuildRequires: php-devel >= 5.3
@@ -56,6 +58,9 @@
BuildRequires: swig >= 2.0
BuildRequires: xsd
BuildRoot: %{_tmppath}/%{name}-%{version}-build
+%if 0%{?suse_version} < 1140
+BuildRequires: uuid-devel = 1.6.2
+%endif
%description
Libkolabxml serves as a serialization/de-serialization library for the the
Kolab XML Format
@@ -69,11 +74,11 @@
- Canonical storage format
- Supports Todos/Events/Journals/Contacts/Distribution
Lists/Notes/Configurations
-%package -n %{name}%{soname}
+%package -n %{libname}
Summary:Kolab XML Format Schema Definitions Library
Group: Development/Libraries/C and C++
-%description -n %{name}%{soname}
+%description -n %{libname}
Libkolabxml serves as a serialization/de-serialization library for the the
Kolab XML Format
Features:
@@ -88,7 +93,7 @@
%package devel
Summary:Kolab XML Format Schema Definitions Library
Group: Development/Libraries/C and C++
-Requires: %{name}%{soname} = %{version}
+Requires: %{libname} = %{version}
Requires: libcurl-devel
%description devel
@@ -103,13 +108,14 @@
- Canonical storage format
- Supports Todos/Events/Journals/Contacts/Distribution
Lists/Notes/Configurations
-%package -n java-%{name}%{soname}
+%if 0%{?with_java}
+%package -n java-%{libname}
Summary:Java bindings for %{name}
Group: Development/Languages/Java
-Requires: %{name}%{soname} = %{version}
+Requires: %{libname} = %{version}
Provides: java-kolabformat = %{version}
-%description -n java-%{name}%{soname}
+%description -n java-%{libname}
Libkolabxml serves as a serialization/de-serialization library for the the
Kolab XML Format
Features:
@@ -122,14 +128,16 @@
- Supports Todos/Events/Journals/Contacts/Distribution
Lists/Notes/Configurations
This packa
commit libkolabxml for openSUSE:Factory
Hello community,
here is the log from the commit of package libkolabxml for openSUSE:Factory
checked in at 2014-09-02 08:22:07
Comparing /work/SRC/openSUSE:Factory/libkolabxml (Old)
and /work/SRC/openSUSE:Factory/.libkolabxml.new (New)
Package is "libkolabxml"
Changes:
--- /work/SRC/openSUSE:Factory/libkolabxml/libkolabxml.changes 2014-08-11
10:07:00.0 +0200
+++ /work/SRC/openSUSE:Factory/.libkolabxml.new/libkolabxml.changes
2014-09-02 08:22:09.0 +0200
@@ -1,0 +2,9 @@
+Tue Aug 26 11:17:36 UTC 2014 - a...@ajaissle.de
+
+- New upstream release 1.0.2
+
+- Dropped the following patches, as they're now included upstream:
+ - libkolabxml-1.0.1_xsd_type.patch
+ - libkolabxml-1.0.1_csharp_bindings.patch
+
+---
Old:
libkolabxml-1.0.1.tar.gz
libkolabxml-1.0.1_csharp_bindings.patch
libkolabxml-1.0.1_xsd_type.patch
New:
libkolabxml-1.0.2.tar.gz
Other differences:
--
++ libkolabxml.spec ++
--- /var/tmp/diff_new_pack.e562mQ/_old 2014-09-02 08:22:10.0 +0200
+++ /var/tmp/diff_new_pack.e562mQ/_new 2014-09-02 08:22:10.0 +0200
@@ -23,7 +23,7 @@
%bcond_without mono
Name: libkolabxml
-Version:1.0.1
+Version:1.0.2
Release:0
%define soname 1
Summary:Kolab XML Format Schema Definitions Library
@@ -33,12 +33,9 @@
Source:
http://mirror.kolabsys.com/pub/releases/%{name}-%{version}.tar.gz
# PATCH-FIX-SLE libkolabxml-0.8.3_fix_uuid_includes_SLE.patch -- Fix uuid.h
path on SLE 11
Patch0: libkolabxml-0.8.3_fix_uuid_includes_SLE.patch
-# PATCH-FIX-UPSTREAM libkolabxml-1.0.1_csharp_bindings.patch -- Fix csharp
bindings
-Patch1: libkolabxml-1.0.1_csharp_bindings.patch
# PATCH-FIX-SLE libkolabxml-1.0.1_no-maybe-uninitialized.patch -- Fix php and
python bindings on SLE 11
Patch2: libkolabxml-1.0.1_no-maybe-uninitialized.patch
-# PATCH-FIX-UPSTREAM -- Fix compatibility with xsd 4.0.0
-Patch3: libkolabxml-1.0.1_xsd_type.patch
+
BuildRequires: boost-devel
BuildRequires: cmake >= 2.6
BuildRequires: gcc-c++
@@ -49,7 +46,7 @@
%if 0%{?sles_version} == 11
BuildRequires: uuid-devel = 1.6.2
%endif
-BuildRequires: libXerces-c-devel
+BuildRequires: libxerces-c-devel
%if %{with mono}
BuildRequires: mono-devel
%endif
@@ -192,8 +189,6 @@
%patch0 -p0
%patch2 -p1
%endif
-%patch1 -p1
-%patch3 -p1
%build
export CXXFLAGS="%{optflags}"
++ libkolabxml-1.0.1.tar.gz -> libkolabxml-1.0.2.tar.gz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libkolabxml-1.0.1/CMakeLists.txt
new/libkolabxml-1.0.2/CMakeLists.txt
--- old/libkolabxml-1.0.1/CMakeLists.txt2013-10-30 17:48:07.0
+0100
+++ new/libkolabxml-1.0.2/CMakeLists.txt2014-08-26 12:53:07.0
+0200
@@ -43,7 +43,7 @@
set (Libkolabxml_VERSION_MAJOR 1)
set (Libkolabxml_VERSION_MINOR 0)
# Enable the full x.y.z version only for release versions
-set (Libkolabxml_VERSION_PATCH 1)
+set (Libkolabxml_VERSION_PATCH 2)
set (Libkolabxml_VERSION
"${Libkolabxml_VERSION_MAJOR}.${Libkolabxml_VERSION_MINOR}.${Libkolabxml_VERSION_PATCH}"
)
#set (Libkolabxml_VERSION
"${Libkolabxml_VERSION_MAJOR}.${Libkolabxml_VERSION_MINOR}" )
@@ -75,7 +75,7 @@
#C++ is required from here on
enable_language(CXX)
-set(LIB_INSTALL_DIR lib CACHE STRING "The directories where to install
libraries to")
+set(LIB_INSTALL_DIR lib${LIB_SUFFIX} CACHE STRING "The directories where to
install libraries to")
set(INCLUDE_INSTALL_DIR include CACHE STRING "The directory where to install
headers to")
set(INCLUDE_INSTALL_DIR ${INCLUDE_INSTALL_DIR}/kolabxml)
set(CMAKECONFIG_INSTALL_DIR ${LIB_INSTALL_DIR}/cmake/Libkolabxml )
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libkolabxml-1.0.1/schemas/ical/kolabformat-xcal.xsd
new/libkolabxml-1.0.2/schemas/ical/kolabformat-xcal.xsd
--- old/libkolabxml-1.0.1/schemas/ical/kolabformat-xcal.xsd 2013-10-30
17:48:07.0 +0100
+++ new/libkolabxml-1.0.2/schemas/ical/kolabformat-xcal.xsd 2014-08-26
12:53:07.0 +0200
@@ -41,7 +41,7 @@
-
+
@@ -107,6 +107,7 @@
+
@@ -148,6 +149,7 @@
+
commit libkolabxml for openSUSE:Factory
Hello community,
here is the log from the commit of package libkolabxml for openSUSE:Factory
checked in at 2014-08-11 10:06:58
Comparing /work/SRC/openSUSE:Factory/libkolabxml (Old)
and /work/SRC/openSUSE:Factory/.libkolabxml.new (New)
Package is "libkolabxml"
Changes:
--- /work/SRC/openSUSE:Factory/libkolabxml/libkolabxml.changes 2014-02-01
08:43:47.0 +0100
+++ /work/SRC/openSUSE:Factory/.libkolabxml.new/libkolabxml.changes
2014-08-11 10:07:00.0 +0200
@@ -1,0 +2,6 @@
+Mon Aug 4 13:31:17 UTC 2014 - a...@ajaissle.de
+
+- Added patch libkolabxml-1.0.1_xsd_type.patch
+ - Fix compatibility with xsd 4.0.0
+
+---
New:
libkolabxml-1.0.1_xsd_type.patch
Other differences:
--
++ libkolabxml.spec ++
--- /var/tmp/diff_new_pack.mVi9EV/_old 2014-08-11 10:07:01.0 +0200
+++ /var/tmp/diff_new_pack.mVi9EV/_new 2014-08-11 10:07:01.0 +0200
@@ -37,6 +37,8 @@
Patch1: libkolabxml-1.0.1_csharp_bindings.patch
# PATCH-FIX-SLE libkolabxml-1.0.1_no-maybe-uninitialized.patch -- Fix php and
python bindings on SLE 11
Patch2: libkolabxml-1.0.1_no-maybe-uninitialized.patch
+# PATCH-FIX-UPSTREAM -- Fix compatibility with xsd 4.0.0
+Patch3: libkolabxml-1.0.1_xsd_type.patch
BuildRequires: boost-devel
BuildRequires: cmake >= 2.6
BuildRequires: gcc-c++
@@ -191,6 +193,7 @@
%patch2 -p1
%endif
%patch1 -p1
+%patch3 -p1
%build
export CXXFLAGS="%{optflags}"
++ libkolabxml-1.0.1_xsd_type.patch ++
diff -Ppru libkolabxml-1.0.1.orig/src/shared_conversions.h
libkolabxml-1.0.1.xsd_4.0/src/shared_conversions.h
--- libkolabxml-1.0.1.orig/src/shared_conversions.h 2013-10-30
17:48:07.0 +0100
+++ libkolabxml-1.0.1.xsd_4.0/src/shared_conversions.h 2014-08-04
17:05:42.107654516 +0200
@@ -29,7 +29,11 @@ namespace Kolab {
typedef boost::shared_ptr cDateTimePtr;
typedef ::xsd::cxx::tree::type type;
+#if (XSD_INT_VERSION >= 400L)
+typedef ::xsd::cxx::tree::simple_type< char, type > simple_type;
+#else
typedef ::xsd::cxx::tree::simple_type< type > simple_type;
+#endif
typedef ::xsd::cxx::tree::date< char, simple_type > date;
typedef ::xsd::cxx::tree::date_time< char, simple_type > date_time;
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit libkolabxml for openSUSE:Factory
Hello community,
here is the log from the commit of package libkolabxml for openSUSE:Factory
checked in at 2014-02-01 08:43:46
Comparing /work/SRC/openSUSE:Factory/libkolabxml (Old)
and /work/SRC/openSUSE:Factory/.libkolabxml.new (New)
Package is "libkolabxml"
Changes:
--- /work/SRC/openSUSE:Factory/libkolabxml/libkolabxml.changes 2014-01-03
14:53:28.0 +0100
+++ /work/SRC/openSUSE:Factory/.libkolabxml.new/libkolabxml.changes
2014-02-01 08:43:47.0 +0100
@@ -1,0 +2,8 @@
+Mon Nov 25 09:58:33 UTC 2013 - a...@ajaissle.de
+
+- libkolabxml-1.0.1_no-maybe-uninitialized.patch
+ * Remove no-maybe-unititialized cxx flag from SLE builds (not supported)
+- Renamed csharp_bindings.diff to libkolabxml-1.0.1_csharp_bindings.patch
+- Renamed fix_uuid_includes_SLE.diff to
libkolabxml-0.8.3_fix_uuid_includes_SLE.patch
+
+---
Old:
csharp_bindings.diff
fix_uuid_includes_SLE.diff
New:
libkolabxml-0.8.3_fix_uuid_includes_SLE.patch
libkolabxml-1.0.1_csharp_bindings.patch
libkolabxml-1.0.1_no-maybe-uninitialized.patch
Other differences:
--
++ libkolabxml.spec ++
--- /var/tmp/diff_new_pack.BbjvG3/_old 2014-02-01 08:43:47.0 +0100
+++ /var/tmp/diff_new_pack.BbjvG3/_new 2014-02-01 08:43:47.0 +0100
@@ -31,10 +31,12 @@
Group: Development/Libraries/C and C++
Url:https://kolab.org/about/libkolabxml
Source:
http://mirror.kolabsys.com/pub/releases/%{name}-%{version}.tar.gz
-# PATCH-FIX-SLE fix_uuid_includes_SLE.diff -- Fix uuid.h path on SLE* 11
-Patch0: fix_uuid_includes_SLE.diff
-# PATCH-FIX-UPSTREAM csharp_bindings.diff -- Fix csharp bindings
-Patch1: csharp_bindings.diff
+# PATCH-FIX-SLE libkolabxml-0.8.3_fix_uuid_includes_SLE.patch -- Fix uuid.h
path on SLE 11
+Patch0: libkolabxml-0.8.3_fix_uuid_includes_SLE.patch
+# PATCH-FIX-UPSTREAM libkolabxml-1.0.1_csharp_bindings.patch -- Fix csharp
bindings
+Patch1: libkolabxml-1.0.1_csharp_bindings.patch
+# PATCH-FIX-SLE libkolabxml-1.0.1_no-maybe-uninitialized.patch -- Fix php and
python bindings on SLE 11
+Patch2: libkolabxml-1.0.1_no-maybe-uninitialized.patch
BuildRequires: boost-devel
BuildRequires: cmake >= 2.6
BuildRequires: gcc-c++
@@ -186,6 +188,7 @@
%setup -q
%if 0%{?sles_version} == 11
%patch0 -p0
+%patch2 -p1
%endif
%patch1 -p1
++ libkolabxml-0.8.3_fix_uuid_includes_SLE.patch ++
diff -Ppru src/utils.cpp src/utils.cpp
--- src/utils.cpp 2013-02-26 12:31:37.0 +0100
+++ src/utils.cpp 2013-04-22 16:16:20.244099388 +0200
@@ -26,7 +26,7 @@
#include
#include
#else
-#include
+#include
#endif
#include
++ libkolabxml-1.0.1_csharp_bindings.patch ++
diff -Ppru a/src/csharp/CMakeLists.txt b/src/csharp/CMakeLists.txt
--- a/src/csharp/CMakeLists.txt 2013-10-30 17:48:07.0 +0100
+++ b/src/csharp/CMakeLists.txt 2013-11-21 01:15:23.552898945 +0100
@@ -44,8 +44,11 @@ set(KOLAB_SWIG_CSHARP_FILES
${CMAKE_CURRENT_BINARY_DIR}/Related.cs
${CMAKE_CURRENT_BINARY_DIR}/Relative.cs
${CMAKE_CURRENT_BINARY_DIR}/Role.cs
+${CMAKE_CURRENT_BINARY_DIR}/Snippet.cs
+${CMAKE_CURRENT_BINARY_DIR}/SnippetsCollection.cs
${CMAKE_CURRENT_BINARY_DIR}/Status.cs
${CMAKE_CURRENT_BINARY_DIR}/SWIGTYPE_p_Kolab__Freebusy.cs
+${CMAKE_CURRENT_BINARY_DIR}/SWIGTYPE_p_std__vectorT_Kolab__Snippet_t.cs
${CMAKE_CURRENT_BINARY_DIR}/SWIGTYPE_p_std__vectorT_Kolab__Todo_t.cs
${CMAKE_CURRENT_BINARY_DIR}/Telephone.cs
${CMAKE_CURRENT_BINARY_DIR}/Todo.cs
++ libkolabxml-1.0.1_no-maybe-uninitialized.patch ++
diff -Ppru a/src/php/CMakeLists.txt b/src/php/CMakeLists.txt
--- a/src/php/CMakeLists.txt2013-10-30 17:48:07.0 +0100
+++ b/src/php/CMakeLists.txt2013-11-25 10:57:06.747767369 +0100
@@ -19,7 +19,7 @@ add_custom_target(generate_php_bindings
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)
diff -Ppru a/src/python/CMakeLists.txt b/src/python/CMakeLists.txt
--- a/src/python/CMakeLists.txt 2013-10-30 17:48:07.0 +0100
+++ b/src/python/CMakeLists.txt 2013-11-25 10:57:38.918321481 +0100
@@ -24,8 +24,6 @@ add_custom_command(OUTPUT ${KOLAB_SWIG_P
SET_SOURCE_FILES_PROPERTIES(${KOLAB_SWIG_PYTHON_SOURCE_FILE} PROPERTIES
GENERATED
commit libkolabxml for openSUSE:Factory
Hello community,
here is the log from the commit of package libkolabxml for openSUSE:Factory
checked in at 2014-01-03 14:53:27
Comparing /work/SRC/openSUSE:Factory/libkolabxml (Old)
and /work/SRC/openSUSE:Factory/.libkolabxml.new (New)
Package is "libkolabxml"
Changes:
--- /work/SRC/openSUSE:Factory/libkolabxml/libkolabxml.changes 2013-09-16
10:04:13.0 +0200
+++ /work/SRC/openSUSE:Factory/.libkolabxml.new/libkolabxml.changes
2014-01-03 14:53:28.0 +0100
@@ -1,0 +2,17 @@
+Thu Nov 21 13:16:57 UTC 2013 - a...@ajaissle.de
+
+- New upstream release 1.0.1
+- soname changed from 0 to 1
+
+---
+Wed Nov 20 22:55:47 UTC 2013 - a...@ajaissle.de
+
+- New upstream release 0.8.5
+- csharp_bindings.diff: Fix csharp bindings
+
+---
+Wed Nov 13 12:31:03 UTC 2013 - a...@ajaissle.de
+
+- Bindings require libkolabxml
+
+---
Old:
libkolabxml-0.8.4.tar.gz
New:
csharp_bindings.diff
libkolabxml-1.0.1.tar.gz
Other differences:
--
++ libkolabxml.spec ++
--- /var/tmp/diff_new_pack.YqBadv/_old 2014-01-03 14:53:28.0 +0100
+++ /var/tmp/diff_new_pack.YqBadv/_new 2014-01-03 14:53:28.0 +0100
@@ -1,7 +1,7 @@
#
# spec file for package libkolabxml
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -23,16 +23,18 @@
%bcond_without mono
Name: libkolabxml
-Version:0.8.4
+Version:1.0.1
Release:0
-%define soname 0
+%define soname 1
Summary:Kolab XML Format Schema Definitions Library
License:LGPL-3.0+
Group: Development/Libraries/C and C++
Url:https://kolab.org/about/libkolabxml
Source:
http://mirror.kolabsys.com/pub/releases/%{name}-%{version}.tar.gz
-# Fix uuid.h path on SLE* 11
+# PATCH-FIX-SLE fix_uuid_includes_SLE.diff -- Fix uuid.h path on SLE* 11
Patch0: fix_uuid_includes_SLE.diff
+# PATCH-FIX-UPSTREAM csharp_bindings.diff -- Fix csharp bindings
+Patch1: csharp_bindings.diff
BuildRequires: boost-devel
BuildRequires: cmake >= 2.6
BuildRequires: gcc-c++
@@ -103,6 +105,7 @@
%package -n java-%{name}%{soname}
Summary:Java bindings for %{name}
Group: Development/Languages/Java
+Requires: %{name}%{soname} = %{version}
Provides: java-kolabformat = %{version}
%description -n java-%{name}%{soname}
@@ -122,6 +125,7 @@
%package -n mono-%{name}%{soname}
Summary:Mono (C#) bindings for %{name}
Group: Development/Languages/Mono
+Requires: %{name}%{soname} = %{version}
Provides: csharp-kolabformat = %{version}
%description -n mono-%{name}%{soname}
@@ -141,6 +145,7 @@
%package -n php-%{name}%{soname}
Summary:PHP bindings for %{name}
Group: Development/Languages/Other
+Requires: %{name}%{soname} = %{version}
Provides: php-kolabformat = %{version}
%description -n php-%{name}%{soname}
@@ -160,6 +165,7 @@
%package -n python-%{name}%{soname}
Summary:Python bindings for %{name}
Group: Development/Languages/Python
+Requires: %{name}%{soname} = %{version}
Provides: python-kolabformat = %{version}
%description -n python-%{name}%{soname}
@@ -181,6 +187,7 @@
%if 0%{?sles_version} == 11
%patch0 -p0
%endif
+%patch1 -p1
%build
export CXXFLAGS="%{optflags}"
@@ -198,11 +205,11 @@
-DPYTHON_BINDINGS=TRUE -DPYTHON_INSTALL_DIR=%{python_sitearch} \
..
- make %{?_smp_mflags}
+ %{__make} %{?_smp_mflags}
%install
cd build
- make DESTDIR=%{buildroot} install
+ %{__make} DESTDIR=%{buildroot} install
mkdir -p %{buildroot}/%{_datadir}/%{phpdir}
mv %{buildroot}/%{php_extdir}/kolabformat.php
%{buildroot}/%{_datadir}/%{phpdir}/kolabformat.php
++ csharp_bindings.diff ++
diff -Ppru a/src/csharp/CMakeLists.txt b/src/csharp/CMakeLists.txt
--- a/src/csharp/CMakeLists.txt 2013-10-30 17:48:07.0 +0100
+++ b/src/csharp/CMakeLists.txt 2013-11-21 01:15:23.552898945 +0100
@@ -44,8 +44,11 @@ set(KOLAB_SWIG_CSHARP_FILES
${CMAKE_CURRENT_BINARY_DIR}/Related.cs
${CMAKE_CURRENT_BINARY_DIR}/Relative.cs
${CMAKE_CURRENT_BINARY_DIR}/Role.cs
+${CMAKE_CURRENT_BINARY_DIR}/Snippet.cs
+${CMAKE_CURRENT_BINARY_DIR}/SnippetsCollection.cs
${CMAKE_CURRENT_BINARY_DIR}/Status.cs
${CMAKE_CURRENT_BINAR
commit libkolabxml for openSUSE:Factory
Hello community,
here is the log from the commit of package libkolabxml for openSUSE:Factory
checked in at 2013-09-16 10:04:11
Comparing /work/SRC/openSUSE:Factory/libkolabxml (Old)
and /work/SRC/openSUSE:Factory/.libkolabxml.new (New)
Package is "libkolabxml"
Changes:
--- /work/SRC/openSUSE:Factory/libkolabxml/libkolabxml.changes 2013-07-10
17:27:21.0 +0200
+++ /work/SRC/openSUSE:Factory/.libkolabxml.new/libkolabxml.changes
2013-09-16 10:04:13.0 +0200
@@ -1,0 +2,6 @@
+Sun Sep 15 19:29:24 UTC 2013 - hrvoje.sen...@gmail.com
+
+- Fix build for Factory - make java subpackage owns %_libdir/java
+ directory
+
+---
Other differences:
--
++ libkolabxml.spec ++
--- /var/tmp/diff_new_pack.91x05I/_old 2013-09-16 10:04:14.0 +0200
+++ /var/tmp/diff_new_pack.91x05I/_new 2013-09-16 10:04:14.0 +0200
@@ -237,6 +237,7 @@
%files -n java-%{name}%{soname}
%defattr(-,root,root)
%doc COPYING
+%dir %{_libdir}/java/
%{_libdir}/java/*
%if %{with mono}
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit libkolabxml for openSUSE:Factory
Hello community,
here is the log from the commit of package libkolabxml for openSUSE:Factory
checked in at 2013-07-10 17:27:20
Comparing /work/SRC/openSUSE:Factory/libkolabxml (Old)
and /work/SRC/openSUSE:Factory/.libkolabxml.new (New)
Package is "libkolabxml"
Changes:
--- /work/SRC/openSUSE:Factory/libkolabxml/libkolabxml.changes 2013-06-21
10:53:40.0 +0200
+++ /work/SRC/openSUSE:Factory/.libkolabxml.new/libkolabxml.changes
2013-07-10 17:27:21.0 +0200
@@ -6,0 +7,5 @@
+Sat Jun 8 21:38:31 UTC 2013 - a...@ajaissle.de
+
+- Cleaning up spec file to reduce prjconf settings
+
+---
Other differences:
--
++ libkolabxml.spec ++
--- /var/tmp/diff_new_pack.FlVePX/_old 2013-07-10 17:27:21.0 +0200
+++ /var/tmp/diff_new_pack.FlVePX/_new 2013-07-10 17:27:21.0 +0200
@@ -16,6 +16,10 @@
#
+%global phpdir php5
+%global php_extdir %{_libdir}/%{phpdir}/extensions
+%global php_inidir %{_sysconfdir}/%{phpdir}/conf.d
+
%bcond_without mono
Name: libkolabxml
@@ -25,7 +29,7 @@
Summary:Kolab XML Format Schema Definitions Library
License:LGPL-3.0+
Group: Development/Libraries/C and C++
-Url:http://wiki.kolab.org/Libkolabxml
+Url:https://kolab.org/about/libkolabxml
Source:
http://mirror.kolabsys.com/pub/releases/%{name}-%{version}.tar.gz
# Fix uuid.h path on SLE* 11
Patch0: fix_uuid_includes_SLE.diff
@@ -39,7 +43,7 @@
%if 0%{?sles_version} == 11
BuildRequires: uuid-devel = 1.6.2
%endif
-BuildRequires: libxerces-c-devel
+BuildRequires: libXerces-c-devel
%if %{with mono}
BuildRequires: mono-devel
%endif
@@ -190,7 +194,7 @@
-DCMAKE_SKIP_RPATH=TRUE \
-DJAVA_BINDINGS=TRUE -DJAVA_INSTALL_DIR=%{_jnidir} \
-DCSHARP_BINDINGS=TRUE -DCSHARP_INSTALL_DIR=%{_prefix}/lib/mono/ \
--DPHP_BINDINGS=TRUE \
+-DPHP_BINDINGS=TRUE -DPHP_INSTALL_DIR=%{php_extdir}\
-DPYTHON_BINDINGS=TRUE -DPYTHON_INSTALL_DIR=%{python_sitearch} \
..
@@ -200,20 +204,14 @@
cd build
make DESTDIR=%{buildroot} install
- %define php_extension_dir %( %{_bindir}/php-config --extension-dir | sed -e
's#\\n##' )
- %define php_inidir /etc/php5/conf.d
-
- mkdir -p %{buildroot}/%{_datadir}/php5
- mv %{buildroot}/%{php_extension_dir}/kolabformat.php
%{buildroot}/%{_datadir}/php5/kolabformat.php
+ mkdir -p %{buildroot}/%{_datadir}/%{phpdir}
+ mv %{buildroot}/%{php_extdir}/kolabformat.php
%{buildroot}/%{_datadir}/%{phpdir}/kolabformat.php
mkdir -p %{buildroot}/%{php_inidir}/
-cat >%{buildroot}/%{php_inidir}/kolabformat.ini <%{buildroot}/%{php_inidir}/kolabformat.ini <
commit libkolabxml for openSUSE:Factory
Hello community,
here is the log from the commit of package libkolabxml for openSUSE:Factory
checked in at 2013-06-21 07:34:24
Comparing /work/SRC/openSUSE:Factory/libkolabxml (Old)
and /work/SRC/openSUSE:Factory/.libkolabxml.new (New)
Package is "libkolabxml"
Changes:
--- /work/SRC/openSUSE:Factory/libkolabxml/libkolabxml.changes 2013-05-16
18:01:52.0 +0200
+++ /work/SRC/openSUSE:Factory/.libkolabxml.new/libkolabxml.changes
2013-06-21 10:53:40.0 +0200
@@ -1,0 +2,5 @@
+Wed Jun 19 12:37:38 UTC 2013 - sch...@suse.de
+
+- Make mono bindings optional
+
+---
Other differences:
--
++ libkolabxml.spec ++
--- /var/tmp/diff_new_pack.2SQpca/_old 2013-06-21 10:53:40.0 +0200
+++ /var/tmp/diff_new_pack.2SQpca/_new 2013-06-21 10:53:40.0 +0200
@@ -16,6 +16,8 @@
#
+%bcond_without mono
+
Name: libkolabxml
Version:0.8.4
Release:0
@@ -38,7 +40,9 @@
BuildRequires: uuid-devel = 1.6.2
%endif
BuildRequires: libxerces-c-devel
+%if %{with mono}
BuildRequires: mono-devel
+%endif
BuildRequires: php-devel >= 5.3
BuildRequires: pkgconfig
BuildRequires: python-devel
@@ -237,10 +241,12 @@
%doc COPYING
%{_libdir}/java/*
+%if %{with mono}
%files -n mono-%{name}%{soname}
%defattr(-,root,root)
%doc COPYING
%{_prefix}/lib/mono/*
+%endif
%files devel
%defattr(-,root,root)
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit libkolabxml for openSUSE:Factory
Hello community,
here is the log from the commit of package libkolabxml for openSUSE:Factory
checked in at 2013-05-16 18:01:51
Comparing /work/SRC/openSUSE:Factory/libkolabxml (Old)
and /work/SRC/openSUSE:Factory/.libkolabxml.new (New)
Package is "libkolabxml"
Changes:
--- /work/SRC/openSUSE:Factory/libkolabxml/libkolabxml.changes 2013-04-24
15:56:21.0 +0200
+++ /work/SRC/openSUSE:Factory/.libkolabxml.new/libkolabxml.changes
2013-05-16 18:01:52.0 +0200
@@ -1,0 +2,12 @@
+Mon Apr 29 13:50:10 UTC 2013 - a...@ajaissle.de
+
+- Removed fix_php5_bindings.diff
+
+---
+Wed Apr 24 07:50:24 UTC 2013 - a...@ajaissle.de
+
+- New upstream version 0.8.4
+ * Fixes an issue in the bindings generated (related to event vectors)
+- Disabled fix_php5_bindings.diff (fixed in 0.8.4)
+
+---
Old:
fix_php5_bindings.diff
libkolabxml-0.8.3.tar.gz
Other differences:
--
++ libkolabxml.spec ++
--- /var/tmp/diff_new_pack.ykX0S1/_old 2013-05-16 18:01:54.0 +0200
+++ /var/tmp/diff_new_pack.ykX0S1/_new 2013-05-16 18:01:54.0 +0200
@@ -17,7 +17,7 @@
Name: libkolabxml
-Version:0.8.3
+Version:0.8.4
Release:0
%define soname 0
Summary:Kolab XML Format Schema Definitions Library
@@ -25,10 +25,8 @@
Group: Development/Libraries/C and C++
Url:http://wiki.kolab.org/Libkolabxml
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
+Patch0: fix_uuid_includes_SLE.diff
BuildRequires: boost-devel
BuildRequires: cmake >= 2.6
BuildRequires: gcc-c++
@@ -172,9 +170,8 @@
%prep
%setup -q
-%patch0 -p0
%if 0%{?sles_version} == 11
-%patch1 -p0
+%patch0 -p0
%endif
%build
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit libkolabxml for openSUSE:Factory
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.0 +0100
+++ /work/SRC/openSUSE:Factory/.libkolabxml.new/libkolabxml.changes
2013-04-24 15:56:21.0 +0200
@@ -1,0 +2,29 @@
+Mon Apr 22 14:28:40 UTC 2013 - a...@ajaissle.de
+
+- 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 - a...@ajaissle.de
+
+- Enable mono bindings for SLE 11 SP 2
+
+---
+Tue Mar 19 12:45:39 UTC 2013 - a...@ajaissle.de
+
+- 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 - a...@ajaissle.de
+
+- Also include .pyo and .pyc files in python-kolabformat
+
+---
+Fri Mar 1 15:11:24 UTC 2013 - a...@ajaissle.de
+
+- 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.0 +0200
+++ /var/tmp/diff_new_pack.dUPdhi/_new 2013-04-24 15:56:23.0 +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 <
#include
#else
-#include
+#include
#endif
#include
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit libkolabxml for openSUSE:Factory
Hello community,
here is the log from the commit of package libkolabxml for openSUSE:Factory
checked in at 2013-03-01 07:25:12
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-01-17
13:18:20.0 +0100
+++ /work/SRC/openSUSE:Factory/.libkolabxml.new/libkolabxml.changes
2013-03-01 07:25:13.0 +0100
@@ -1,0 +2,7 @@
+Wed Feb 27 08:45:25 UTC 2013 - a...@ajaissle.de
+
+- New upstream version 0.8.3
+ * adds capabilities to read/write a new XML format
+- Update fix_php5_bindings.diff
+
+---
Old:
libkolabxml-0.8.1.tar.gz
New:
libkolabxml-0.8.3.tar.gz
Other differences:
--
++ libkolabxml.spec ++
--- /var/tmp/diff_new_pack.mwMkTy/_old 2013-03-01 07:25:14.0 +0100
+++ /var/tmp/diff_new_pack.mwMkTy/_new 2013-03-01 07:25:14.0 +0100
@@ -1,7 +1,7 @@
#
# spec file for package libkolabxml
#
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
Name: libkolabxml
-Version:0.8.1
+Version:0.8.3
Release:0
%define soname 0
Summary:Kolab XML Format Schema Definitions Library
++ fix_php5_bindings.diff ++
--- /var/tmp/diff_new_pack.mwMkTy/_old 2013-03-01 07:25:14.0 +0100
+++ /var/tmp/diff_new_pack.mwMkTy/_new 2013-03-01 07:25:14.0 +0100
@@ -1,22 +1,22 @@
src/php/CMakeLists.txt 2012-08-15 16:50:12.0 +0200
-+++ src/php/CMakeLists.txt 2012-12-24 01:04:29.812585496 +0100
-@@ -10,9 +10,8 @@
+--- src/php/CMakeLists.txt.orig2013-02-26 12:31:37.0 +0100
src/php/CMakeLists.txt 2013-02-27 10:46:32.858763766 +0100
+@@ -10,8 +10,8 @@ add_custom_command(OUTPUT ${CMAKE_CURREN
VERBATIM
)
-SET_SOURCE_FILES_PROPERTIES(${KOLAB_SWIG_PHP_SOURCE_FILE} PROPERTIES
GENERATED 1)
-ADD_CUSTOM_TARGET(generate_php_bindings ALL DEPENDS
${KOLAB_SWIG_PHP_SOURCE_FILE})
--
+set_source_files_properties(${KOLAB_SWIG_PHP_SOURCE_FILE} PROPERTIES
GENERATED 1)
+add_custom_target(generate_php_bindings ALL DEPENDS
${KOLAB_SWIG_PHP_SOURCE_FILE})
+
#Compile PHP Bindings
- # Since there is no php library we can't compile with -Wl,--no-undefined
-@@ -20,25 +19,54 @@
+@@ -19,35 +19,57 @@ ADD_CUSTOM_TARGET(generate_php_bindings
+ if (APPLE)
set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -flat_namespace -undefined
suppress" )
endif()
-
--find_package(PHP4 5.3 REQUIRED)
++set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-variable
-Wno-unused-label -Wno-maybe-uninitialized -Wno-unused-function" )
++
+# Try to find PHP5
+find_path(PHP_INCLUDE_DIR NAMES main/php.h PATH_SUFFIXES php php5)
+find_program(PHP_EXECUTABLE NAMES php)
@@ -44,27 +44,7 @@
+ if(_PHP_VERSION_ID_MATCH)
+string(REGEX REPLACE "#define PHP_VERSION_ID[ ]*([0-9]*)\n" "\\1"
PHP_VERSION_ID ${_PHP_VERSION_ID_MATCH})
+ endif()
-
--if (PHP4_FOUND)
--include_directories(${PHP4_INCLUDE_PATH})
--add_library(phpbindings SHARED ${KOLAB_SWIG_PHP_SOURCE_FILE})
--target_link_libraries(phpbindings kolabxml)
--SET_TARGET_PROPERTIES(phpbindings PROPERTIES OUTPUT_NAME "kolabformat")
--SET_TARGET_PROPERTIES(phpbindings PROPERTIES PREFIX "")
--
--configure_file(test.php ${CMAKE_CURRENT_BINARY_DIR} COPYONLY)
--
--set(PHP_INSTALL_DIR "${CMAKE_CURRENT_BINARY_DIR}/phpbindings" CACHE
STRING "Install directory for php bindings.")
--
--install(TARGETS phpbindings LIBRARY DESTINATION ${PHP_INSTALL_DIR})
--
--install( FILES
--${CMAKE_CURRENT_BINARY_DIR}/kolabformat.php
--DESTINATION ${PHP_INSTALL_DIR}
--)
--else(PHP4_FOUND)
--message(WARNING "not building php bindings because php was not found")
--endif (PHP4_FOUND)
++
+ # Include the needed PHP5 subdirs
+ set(PHP_INCLUDE_DIRS ${PHP_INCLUDE_DIR} ${PHP_INCLUDE_DIR}/main
${PHP_INCLUDE_DIR}/TSRM ${PHP_INCLUDE_DIR}/Zend )
+endif()
@@ -88,3 +68,35 @@
+else()
+ message(WARNING "not building php bindings because php was not found")
+endif()
+
+-# Debian (Wheezy) won't be able to find PHP using find_package. In packaging
libkolabxml
+-# for it, we define the include path and executable during the build.
+-if (NOT PHP4_INCLUDE_PATH OR NOT PHP4_EXECUTABLE)
+-find_package(PHP4 5.3 REQUIRED)
+-endif (NOT PHP4_INCLUDE_PATH OR NOT PHP4_EXECUTABLE
commit libkolabxml for openSUSE:Factory
Hello community,
here is the log from the commit of package libkolabxml for openSUSE:Factory
checked in at 2013-01-17 11:16:43
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 2012-11-28
10:51:11.0 +0100
+++ /work/SRC/openSUSE:Factory/.libkolabxml.new/libkolabxml.changes
2013-01-17 13:18:20.0 +0100
@@ -1,0 +2,11 @@
+Mon Jan 14 08:27:18 UTC 2013 - a...@ajaissle.de
+
+- Disabled php and mono bindings for SLES to fix the SLES build
+
+---
+Thu Dec 20 00:16:20 UTC 2012 - a...@ajaissle.de
+
+- Added Patch: fix_php5_bindings.diff to fix php bindings
+ * Patch to hack src/php/CMakeList.cmake to find PHP5 on openSUSE
+
+---
New:
fix_php5_bindings.diff
Other differences:
--
++ libkolabxml.spec ++
--- /var/tmp/diff_new_pack.oCidIR/_old 2013-01-17 13:18:21.0 +0100
+++ /var/tmp/diff_new_pack.oCidIR/_new 2013-01-17 13:18:21.0 +0100
@@ -25,8 +25,10 @@
Group: Development/Libraries/C and C++
Url:http://wiki.kolab.org/Libkolabxml
Source:
http://mirror.kolabsys.com/pub/releases/%{name}-%{version}.tar.gz
+# PATCH-FIX-OPENSUSE fix_php5_bindings.diff
+Patch0: fix_php5_bindings.diff
BuildRequires: boost-devel
-BuildRequires: cmake
+BuildRequires: cmake >= 2.6
BuildRequires: gcc-c++
BuildRequires: gcc-java
BuildRequires: java-openjdk
@@ -34,8 +36,12 @@
BuildRequires: libqt4-devel
BuildRequires: libxerces-c-devel
BuildRequires: mono-devel
-# FIXME: doesn't build
-# BuildRequires: php5-devel
+# ToDo: Fix SLE_11_SP2 CSHARP and PHP bindings
+#%%if 0%{?sles_version} == 0
+BuildRequires: php5-devel
+#%%else
+#BuildRequires: php53-devel
+#%%endif
BuildRequires: pkgconfig
BuildRequires: python-devel
BuildRequires: swig
@@ -91,6 +97,7 @@
%package -n java-%{name}%{soname}
Summary:Java bindings for %{name}
Group: Development/Languages/Java
+Provides: java-kolabformat = %{version}
%description -n java-%{name}%{soname}
Libkolabxml serves as a serialization/de-serialization library for the the
Kolab XML Format
@@ -109,6 +116,7 @@
%package -n mono-%{name}%{soname}
Summary:Mono (C#) bindings for %{name}
Group: Development/Languages/Mono
+Provides: csharp-kolabformat = %{version}
%description -n mono-%{name}%{soname}
Libkolabxml serves as a serialization/de-serialization library for the the
Kolab XML Format
@@ -126,7 +134,8 @@
%package -n php-%{name}%{soname}
Summary:PHP bindings for %{name}
-Group: Development/Languages/PHP
+Group: Development/Languages/Other
+Provides: php-kolabformat = %{version}
%description -n php-%{name}%{soname}
Libkolabxml serves as a serialization/de-serialization library for the the
Kolab XML Format
@@ -145,6 +154,7 @@
%package -n python-%{name}%{soname}
Summary:Python bindings for %{name}
Group: Development/Languages/Python
+Provides: python-kolabformat = %{version}
%description -n python-%{name}%{soname}
Libkolabxml serves as a serialization/de-serialization library for the the
Kolab XML Format
@@ -160,9 +170,9 @@
This package provides the python bindings for Libkolabxml
-
%prep
%setup -q
+%patch0 -p0
%build
export CXXFLAGS="%{optflags}"
@@ -175,7 +185,10 @@
-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} \
..
@@ -185,6 +198,19 @@
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
+
+ mkdir -p %{buildroot}/%{_datadir}/php5
+ mv %{buildroot}/%{php_extension_dir}/kolabformat.php
%{buildroot}/%{_datadir}/php5/kolabformat.php
+
+ mkdir -p %{buildroot}/%{php_inidir}/
+cat >%{buildroot}/%{php_inidir}/kolabformat.ini <= 5.3
+set(PHP_MIN_VERSION 50300)
+
+# Find where to install the extension files if it's not defined
+if(NOT DEFINED PHP_INSTALL_DIR)
+ find_program(PHP_CONFIG_EXECUTABLE NAMES php-config)
+ if(PHP_CONFIG_EXECUTABLE)
+execute_process(COMMAND ${PHP_CONFIG_EXECUTABLE} --extension-dir
+OUTPUT_VARIABLE _php
commit libkolabxml for openSUSE:Factory
Hello community,
here is the log from the commit of package libkolabxml for openSUSE:Factory
checked in at 2012-11-28 10:51:10
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 2012-09-15
11:53:01.0 +0200
+++ /work/SRC/openSUSE:Factory/.libkolabxml.new/libkolabxml.changes
2012-11-28 10:51:11.0 +0100
@@ -1,0 +2,5 @@
+Tue Nov 20 17:23:54 UTC 2012 - nico.kru...@gmail.com
+
+- Fix the SLES build (%make_install is not expanded on SLES)
+
+---
Other differences:
--
++ libkolabxml.spec ++
--- /var/tmp/diff_new_pack.Ix7oyN/_old 2012-11-28 10:51:12.0 +0100
+++ /var/tmp/diff_new_pack.Ix7oyN/_new 2012-11-28 10:51:12.0 +0100
@@ -18,12 +18,12 @@
Name: libkolabxml
Version:0.8.1
-%define soname 0
Release:0
-License:LGPL-3.0+
+%define soname 0
Summary:Kolab XML Format Schema Definitions Library
-Url:http://wiki.kolab.org/Libkolabxml
+License:LGPL-3.0+
Group: Development/Libraries/C and C++
+Url:http://wiki.kolab.org/Libkolabxml
Source:
http://mirror.kolabsys.com/pub/releases/%{name}-%{version}.tar.gz
BuildRequires: boost-devel
BuildRequires: cmake
@@ -56,6 +56,7 @@
%package -n %{name}%{soname}
Summary:Kolab XML Format Schema Definitions Library
+Group: Development/Libraries/C and C++
%description -n %{name}%{soname}
Libkolabxml serves as a serialization/de-serialization library for the the
Kolab XML Format
@@ -71,6 +72,7 @@
%package devel
Summary:Kolab XML Format Schema Definitions Library
+Group: Development/Libraries/C and C++
Requires: %{name}%{soname} = %{version}
Requires: libcurl-devel
@@ -181,7 +183,7 @@
%install
cd build
- %makeinstall
+ make DESTDIR=%{buildroot} install
%post -n %{name}%{soname} -p /sbin/ldconfig
%postun -n %{name}%{soname} -p /sbin/ldconfig
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
