subject:"commit libkolab\-qt5 for openSUSE\:Factory"

commit libkolab-qt5 for openSUSE:Factory

2017-09-13 Thread root

Hello community,

here is the log from the commit of package libkolab-qt5 for openSUSE:Factory 
checked in at 2017-09-13 22:17:48

Comparing /work/SRC/openSUSE:Factory/libkolab-qt5 (Old)
 and  /work/SRC/openSUSE:Factory/.libkolab-qt5.new (New)


Package is "libkolab-qt5"

Wed Sep 13 22:17:48 2017 rev:9 rq:517376 version:1.0.2

Changes:

--- /work/SRC/openSUSE:Factory/libkolab-qt5/libkolab-qt5.changes
2017-02-16 16:42:48.337104285 +0100
+++ /work/SRC/openSUSE:Factory/.libkolab-qt5.new/libkolab-qt5.changes   
2017-09-13 22:17:52.104913029 +0200
@@ -1,0 +2,6 @@
+Thu Aug 17 12:32:22 UTC 2017 - fv...@suse.com
+
+- Run spec-cleaner
+- Build with php7 on TW, but not supported so disabled for now
+
+---



Other differences:
--
++ libkolab-qt5.spec ++
--- /var/tmp/diff_new_pack.tW9hYn/_old  2017-09-13 22:17:52.704828571 +0200
+++ /var/tmp/diff_new_pack.tW9hYn/_new  2017-09-13 22:17:52.704828571 +0200
@@ -16,9 +16,17 @@
 #
 
 
-%define php_extdir %{_libdir}/php5/extensions
-%define php_confdir %{_sysconfdir}/php5/conf.d
+%define php_extdir %{_libdir}/%{php_ver}/extensions
+%define php_confdir %{_sysconfdir}/%{php_ver}/conf.d
 %define libname libkolab1
+%if 0%{?suse_version} >= 1330
+%global php_ver php7
+# php7 not supported
+%bcond_with php
+%else
+%global php_ver php5
+%bcond_without php
+%endif
 Name:   libkolab-qt5
 Version:1.0.2
 Release:0
@@ -29,16 +37,6 @@
 Source: libkolab-%{version}.tar.gz
 BuildRequires:  akonadi-notes-devel
 BuildRequires:  akonadi-server-devel
-%if 0%{?suse_version} > 1325
-BuildRequires:  libboost_atomic-devel
-BuildRequires:  libboost_chrono-devel
-BuildRequires:  libboost_date_time-devel
-BuildRequires:  libboost_program_options-devel
-BuildRequires:  libboost_system-devel
-BuildRequires:  libboost_thread-devel
-%else
-BuildRequires:  boost-devel
-%endif
 BuildRequires:  cmake >= 2.8.9
 BuildRequires:  kcalcore-devel
 BuildRequires:  kcalutils-devel
@@ -47,7 +45,6 @@
 BuildRequires:  kmime-devel
 BuildRequires:  libkolabxml-devel >= 1.1.1
 BuildRequires:  libxerces-c-devel
-BuildRequires:  php-devel >= 5.3
 BuildRequires:  pkgconfig
 BuildRequires:  python-devel
 BuildRequires:  swig >= 2.0
@@ -56,7 +53,19 @@
 BuildRequires:  pkgconfig(Qt5Qml)
 BuildRequires:  pkgconfig(Qt5Test)
 BuildRequires:  pkgconfig(Qt5Widgets)
-BuildRoot:  %{_tmppath}/%{name}-%{version}-build
+%if 0%{?suse_version} > 1325
+BuildRequires:  libboost_atomic-devel
+BuildRequires:  libboost_chrono-devel
+BuildRequires:  libboost_date_time-devel
+BuildRequires:  libboost_program_options-devel
+BuildRequires:  libboost_system-devel
+BuildRequires:  libboost_thread-devel
+%else
+BuildRequires:  boost-devel
+%endif
+%if %{with php}
+BuildRequires:  %{php_ver}-devel >= 5.3
+%endif
 
 %description
 libkolab provides conversions from/to KDE containers, MIME message handling 
and facilities
@@ -72,15 +81,18 @@
 to read and write kolabv2 and kolabv3.
 The Akonadi-Kolab-Resource as well as the upgradetool are based on this code.
 
-%package -n php-%{libname}
+%package -n %{php_ver}-%{libname}
 Summary:PHP Bindings for libkolab
 Group:  Development/Languages/Other
 Requires:   %{libname} = %{version}
+%if "%{php_ver}" == "php5"
 Conflicts:  otherproviders(php-kolab)
+Provides:   php-%{libname}
 Provides:   php-kolab = %{version}
 Obsoletes:  php-kolab < %{version}
+%endif
 
-%description -n php-%{libname}
+%description -n %{php_ver}-%{libname}
 libkolab provides conversions from/to KDE containers, MIME message handling 
and facilities
 to read and write kolabv2 and kolabv3.
 This package provides PHP Bindings for libkolab.
@@ -129,7 +141,9 @@
 %else
 -DUSE_LIBCALENDARING=TRUE \
 %endif
+%if %{with php}
 -DPHP_BINDINGS=TRUE -DPHP_INSTALL_DIR=%{php_extdir} \
+%endif
 -DPYTHON_BINDINGS=TRUE -DPYTHON_INSTALL_DIR=%{python_sitearch} \
 -DBUILD_TESTS=FALSE
 
@@ -141,8 +155,9 @@
 # cmake: with earlier releases, we have to change dir manually, as 
%%cmake_install is not available
 %cmake_install
 
-mkdir -p %{buildroot}%{_datadir}/php5
-mv %{buildroot}%{php_extdir}/*.php %{buildroot}%{_datadir}/php5/.
+%if %{with php}
+mkdir -p %{buildroot}%{_datadir}/%{php_ver}
+mv %{buildroot}%{php_extdir}/*.php %{buildroot}%{_datadir}/%{php_ver}/.
 
 mkdir -p %{buildroot}%{php_confdir}
 cat >%{buildroot}%{php_confdir}/kolab.ini <

commit libkolab-qt5 for openSUSE:Factory

2017-02-16 Thread root

Hello community,

here is the log from the commit of package libkolab-qt5 for openSUSE:Factory 
checked in at 2017-02-16 16:42:47

Comparing /work/SRC/openSUSE:Factory/libkolab-qt5 (Old)
 and  /work/SRC/openSUSE:Factory/.libkolab-qt5.new (New)


Package is "libkolab-qt5"

Changes:

--- /work/SRC/openSUSE:Factory/libkolab-qt5/libkolab-qt5.changes
2017-02-10 09:50:14.767480940 +0100
+++ /work/SRC/openSUSE:Factory/.libkolab-qt5.new/libkolab-qt5.changes   
2017-02-16 16:42:48.337104285 +0100
@@ -1,0 +2,5 @@
+Sat Feb 11 22:27:48 UTC 2017 - jeng...@inai.de
+
+- Update RPM group, description.
+
+---



Other differences:
--
++ libkolab-qt5.spec ++
--- /var/tmp/diff_new_pack.9gCqaQ/_old  2017-02-16 16:42:48.901024200 +0100
+++ /var/tmp/diff_new_pack.9gCqaQ/_new  2017-02-16 16:42:48.905023632 +0100
@@ -59,16 +59,16 @@
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 
 %description
-libkolab provides conversions from/to KDE containers, mime message handling 
and facilities
+libkolab provides conversions from/to KDE containers, MIME message handling 
and facilities
 to read and write kolabv2 and kolabv3.
 The Akonadi-Kolab-Resource as well as the upgradetool are based on this code.
 
 %package -n %{libname}
 Summary:Conversions from/to KDE containers
-Group:  Development/Libraries/C and C++
+Group:  System/Libraries
 
 %description -n %{libname}
-libkolab provides conversions from/to KDE containers, mime message handling 
and facilities
+libkolab provides conversions from/to KDE containers, MIME message handling 
and facilities
 to read and write kolabv2 and kolabv3.
 The Akonadi-Kolab-Resource as well as the upgradetool are based on this code.
 
@@ -81,7 +81,7 @@
 Obsoletes:  php-kolab < %{version}
 
 %description -n php-%{libname}
-libkolab provides conversions from/to KDE containers, mime message handling 
and facilities
+libkolab provides conversions from/to KDE containers, MIME message handling 
and facilities
 to read and write kolabv2 and kolabv3.
 This package provides PHP Bindings for libkolab.
 
@@ -94,7 +94,7 @@
 Obsoletes:  python-kolab < %{version}
 
 %description -n python-%{libname}
-libkolab provides conversions from/to KDE containers, mime message handling 
and facilities
+libkolab provides conversions from/to KDE containers, MIME message handling 
and facilities
 to read and write kolabv2 and kolabv3.
 This package provides Python bindings for libkolab.
 
@@ -113,7 +113,7 @@
 Conflicts:  libkolab-devel
 
 %description devel
-libkolab provides conversions from/to KDE containers, mime message handling 
and facilities
+libkolab provides conversions from/to KDE containers, MIME message handling 
and facilities
 to read and write kolabv2 and kolabv3.
 The Akonadi-Kolab-Resource as well as the upgradetool are based on this code.

commit libkolab-qt5 for openSUSE:Factory

2017-02-10 Thread root

Hello community,

here is the log from the commit of package libkolab-qt5 for openSUSE:Factory 
checked in at 2017-02-10 09:49:22

Comparing /work/SRC/openSUSE:Factory/libkolab-qt5 (Old)
 and  /work/SRC/openSUSE:Factory/.libkolab-qt5.new (New)


Package is "libkolab-qt5"

Changes:

--- /work/SRC/openSUSE:Factory/libkolab-qt5/libkolab-qt5.changes
2016-10-28 12:27:05.0 +0200
+++ /work/SRC/openSUSE:Factory/.libkolab-qt5.new/libkolab-qt5.changes   
2017-02-10 09:50:14.767480940 +0100
@@ -1,0 +2,5 @@
+Mon Feb  6 15:37:12 UTC 2017 - adam.ma...@suse.de
+
+- use individual libboost-*-devel packages instead of boost-devel
+
+---



Other differences:
--
++ libkolab-qt5.spec ++
--- /var/tmp/diff_new_pack.LphbJG/_old  2017-02-10 09:50:15.399391593 +0100
+++ /var/tmp/diff_new_pack.LphbJG/_new  2017-02-10 09:50:15.399391593 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package libkolab-qt5
 #
-# 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
@@ -27,26 +27,36 @@
 Group:  Development/Libraries/C and C++
 Url:https://kolab.org/about/libkolab
 Source: libkolab-%{version}.tar.gz
-BuildRequires:  boost-devel
-BuildRequires:  cmake >= 2.8.9
-BuildRequires:  libkolabxml-devel >= 1.1.1
-BuildRequires:  libxerces-c-devel
-BuildRequires:  php-devel >= 5.3
-BuildRequires:  python-devel
-BuildRequires:  swig >= 2.0
-BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  akonadi-notes-devel
 BuildRequires:  akonadi-server-devel
+%if 0%{?suse_version} > 1325
+BuildRequires:  libboost_atomic-devel
+BuildRequires:  libboost_chrono-devel
+BuildRequires:  libboost_date_time-devel
+BuildRequires:  libboost_program_options-devel
+BuildRequires:  libboost_system-devel
+BuildRequires:  libboost_thread-devel
+%else
+BuildRequires:  boost-devel
+%endif
+BuildRequires:  cmake >= 2.8.9
 BuildRequires:  kcalcore-devel
 BuildRequires:  kcalutils-devel
 BuildRequires:  kcontacts-devel
 BuildRequires:  kcoreaddons-devel
 BuildRequires:  kmime-devel
+BuildRequires:  libkolabxml-devel >= 1.1.1
+BuildRequires:  libxerces-c-devel
+BuildRequires:  php-devel >= 5.3
+BuildRequires:  pkgconfig
+BuildRequires:  python-devel
+BuildRequires:  swig >= 2.0
 BuildRequires:  pkgconfig(Qt5Core)
 BuildRequires:  pkgconfig(Qt5Gui)
 BuildRequires:  pkgconfig(Qt5Qml)
 BuildRequires:  pkgconfig(Qt5Test)
 BuildRequires:  pkgconfig(Qt5Widgets)
+BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 
 %description
 libkolab provides conversions from/to KDE containers, mime message handling 
and facilities
@@ -66,9 +76,9 @@
 Summary:PHP Bindings for libkolab
 Group:  Development/Languages/Other
 Requires:   %{libname} = %{version}
+Conflicts:  otherproviders(php-kolab)
 Provides:   php-kolab = %{version}
 Obsoletes:  php-kolab < %{version}
-Conflicts:  otherproviders(php-kolab)
 
 %description -n php-%{libname}
 libkolab provides conversions from/to KDE containers, mime message handling 
and facilities
@@ -79,9 +89,9 @@
 Summary:Python bindings for libkolab
 Group:  Development/Languages/Python
 Requires:   %{libname} = %{version}
+Conflicts:  otherproviders(python-kolab)
 Provides:   python-kolab = %{version}
 Obsoletes:  python-kolab < %{version}
-Conflicts:  otherproviders(python-kolab)
 
 %description -n python-%{libname}
 libkolab provides conversions from/to KDE containers, mime message handling 
and facilities
@@ -149,7 +159,6 @@
 EOF
 
 %post -n %{libname} -p /sbin/ldconfig
-
 %postun -n %{libname} -p /sbin/ldconfig
 
 %files -n %{libname}

commit libkolab-qt5 for openSUSE:Factory

2016-10-28 Thread h_root

Hello community,

here is the log from the commit of package libkolab-qt5 for openSUSE:Factory 
checked in at 2016-10-28 12:27:04

Comparing /work/SRC/openSUSE:Factory/libkolab-qt5 (Old)
 and  /work/SRC/openSUSE:Factory/.libkolab-qt5.new (New)


Package is "libkolab-qt5"

Changes:

--- /work/SRC/openSUSE:Factory/libkolab-qt5/libkolab-qt5.changes
2016-08-08 13:49:59.0 +0200
+++ /work/SRC/openSUSE:Factory/.libkolab-qt5.new/libkolab-qt5.changes   
2016-10-28 12:27:05.0 +0200
@@ -1,0 +2,11 @@
+Tue Oct 25 11:12:52 UTC 2016 - wba...@tmo.at
+
+- add %build section that was missing (the build was done in %prep)
+
+---
+Tue Oct 25 10:01:09 UTC 2016 - wba...@tmo.at
+
+- disable parallel build to hopefully fix random build failures
+  (boo#1006727)
+
+---



Other differences:
--
++ libkolab-qt5.spec ++
--- /var/tmp/diff_new_pack.AX1qv6/_old  2016-10-28 12:27:05.0 +0200
+++ /var/tmp/diff_new_pack.AX1qv6/_new  2016-10-28 12:27:05.0 +0200
@@ -110,6 +110,7 @@
 %prep
 %setup -q -n libkolab-%{version}
 
+%build
 # TESTS: require X and most fail anyway
 %cmake \
 -DLibkolabxml_DIR=%{_libdir}/cmake/Libkolabxml \
@@ -122,7 +123,9 @@
 -DPYTHON_BINDINGS=TRUE -DPYTHON_INSTALL_DIR=%{python_sitearch} \
 -DBUILD_TESTS=FALSE
 
-make %{?_smp_mflags}
+# parallel build is too unstable currently (boo#1006727)
+#make %{?_smp_mflags}
+make -j1
 
 %install
 # cmake: with earlier releases, we have to change dir manually, as 
%%cmake_install is not available

commit libkolab-qt5 for openSUSE:Factory

2016-08-08 Thread h_root

Hello community,

here is the log from the commit of package libkolab-qt5 for openSUSE:Factory 
checked in at 2016-08-08 13:49:58

Comparing /work/SRC/openSUSE:Factory/libkolab-qt5 (Old)
 and  /work/SRC/openSUSE:Factory/.libkolab-qt5.new (New)


Package is "libkolab-qt5"

Changes:

--- /work/SRC/openSUSE:Factory/libkolab-qt5/libkolab-qt5.changes
2016-05-31 12:14:22.0 +0200
+++ /work/SRC/openSUSE:Factory/.libkolab-qt5.new/libkolab-qt5.changes   
2016-08-08 13:49:59.0 +0200
@@ -1,0 +2,6 @@
+Thu Jul 21 18:00:19 UTC 2016 - wba...@tmo.at
+
+- Adjust build requirements
+- Adjust requires of the devel package
+
+---



Other differences:
--
++ libkolab-qt5.spec ++
--- /var/tmp/diff_new_pack.1WKgeV/_old  2016-08-08 13:50:00.0 +0200
+++ /var/tmp/diff_new_pack.1WKgeV/_new  2016-08-08 13:50:00.0 +0200
@@ -28,17 +28,19 @@
 Url:https://kolab.org/about/libkolab
 Source: libkolab-%{version}.tar.gz
 BuildRequires:  boost-devel
-BuildRequires:  cmake >= 2.6
-BuildRequires:  libkolabxml-devel >= 1.1
+BuildRequires:  cmake >= 2.8.9
+BuildRequires:  libkolabxml-devel >= 1.1.1
 BuildRequires:  libxerces-c-devel
 BuildRequires:  php-devel >= 5.3
 BuildRequires:  python-devel
 BuildRequires:  swig >= 2.0
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  akonadi-notes-devel
+BuildRequires:  akonadi-server-devel
 BuildRequires:  kcalcore-devel
 BuildRequires:  kcalutils-devel
-BuildRequires:  kcontacts5-devel
+BuildRequires:  kcontacts-devel
+BuildRequires:  kcoreaddons-devel
 BuildRequires:  kmime-devel
 BuildRequires:  pkgconfig(Qt5Core)
 BuildRequires:  pkgconfig(Qt5Gui)
@@ -91,9 +93,10 @@
 Group:  Development/Libraries/C and C++
 Requires:   %{libname} = %{version}
 Requires:   akonadi-notes-devel
+Requires:   akonadi-server-devel
 Requires:   kcalcore-devel
 Requires:   kcalutils-devel
-Requires:   kcontacts5-devel
+Requires:   kcontacts-devel
 Requires:   kmime-devel
 Requires:   libXerces-c-devel
 Requires:   libkolabxml-devel >= 0.8.4

commit libkolab-qt5 for openSUSE:Factory

2016-05-31 Thread h_root

Hello community,

here is the log from the commit of package libkolab-qt5 for openSUSE:Factory 
checked in at 2016-05-31 12:14:21

Comparing /work/SRC/openSUSE:Factory/libkolab-qt5 (Old)
 and  /work/SRC/openSUSE:Factory/.libkolab-qt5.new (New)


Package is "libkolab-qt5"

Changes:

--- /work/SRC/openSUSE:Factory/libkolab-qt5/libkolab-qt5.changes
2016-01-10 13:07:29.0 +0100
+++ /work/SRC/openSUSE:Factory/.libkolab-qt5.new/libkolab-qt5.changes   
2016-05-31 12:14:22.0 +0200
@@ -1,0 +2,6 @@
+Mon Apr 18 09:38:44 UTC 2016 - lbeltr...@kde.org
+
+-  Remove akonadi-devel BuildRequire (replaced by 
+   akonadi-sever-devel)
+
+---



Other differences:
--
++ libkolab-qt5.spec ++
--- /var/tmp/diff_new_pack.i9dQq3/_old  2016-05-31 12:14:23.0 +0200
+++ /var/tmp/diff_new_pack.i9dQq3/_new  2016-05-31 12:14:23.0 +0200
@@ -1,7 +1,7 @@
 #
-# spec file for package libkolab
+# spec file for package libkolab-qt5
 #
-# 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
@@ -35,18 +35,16 @@
 BuildRequires:  python-devel
 BuildRequires:  swig >= 2.0
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
-BuildRequires:  pkgconfig(Qt5Core)
-BuildRequires:  pkgconfig(Qt5Qml)
-BuildRequires:  pkgconfig(Qt5Gui)
-BuildRequires:  pkgconfig(Qt5Widgets)
-BuildRequires:  pkgconfig(Qt5Test)
-BuildRequires:  kcontacts5-devel
+BuildRequires:  akonadi-notes-devel
 BuildRequires:  kcalcore-devel
 BuildRequires:  kcalutils-devel
+BuildRequires:  kcontacts5-devel
 BuildRequires:  kmime-devel
-BuildRequires:  akonadi-notes-devel
-BuildRequires:  akonadi-devel
-
+BuildRequires:  pkgconfig(Qt5Core)
+BuildRequires:  pkgconfig(Qt5Gui)
+BuildRequires:  pkgconfig(Qt5Qml)
+BuildRequires:  pkgconfig(Qt5Test)
+BuildRequires:  pkgconfig(Qt5Widgets)
 
 %description
 libkolab provides conversions from/to KDE containers, mime message handling 
and facilities
@@ -92,17 +90,15 @@
 Summary:Conversions from/to KDE containers
 Group:  Development/Libraries/C and C++
 Requires:   %{libname} = %{version}
-Requires:   libXerces-c-devel
-Requires:   libkolabxml-devel >= 0.8.4
-Requires:   kcontacts5-devel
+Requires:   akonadi-notes-devel
 Requires:   kcalcore-devel
 Requires:   kcalutils-devel
+Requires:   kcontacts5-devel
 Requires:   kmime-devel
-Requires:   akonadi-notes-devel
-Requires:   akonadi-devel
+Requires:   libXerces-c-devel
+Requires:   libkolabxml-devel >= 0.8.4
 Conflicts:  libkolab-devel
 
-
 %description devel
 libkolab provides conversions from/to KDE containers, mime message handling 
and facilities
 to read and write kolabv2 and kolabv3.

commit libkolab-qt5 for openSUSE:Factory

2016-01-10 Thread h_root

Hello community,

here is the log from the commit of package libkolab-qt5 for openSUSE:Factory 
checked in at 2016-01-10 13:07:04

Comparing /work/SRC/openSUSE:Factory/libkolab-qt5 (Old)
 and  /work/SRC/openSUSE:Factory/.libkolab-qt5.new (New)


Package is "libkolab-qt5"

Changes:

--- /work/SRC/openSUSE:Factory/libkolab-qt5/libkolab-qt5.changes
2015-10-14 16:44:53.0 +0200
+++ /work/SRC/openSUSE:Factory/.libkolab-qt5.new/libkolab-qt5.changes   
2016-01-10 13:07:29.0 +0100
@@ -3,0 +4,8 @@
+- Update to version 1.0.2
+  * Fix build with latest kdepim libraries
+  
+- Drop upstream patch fix_new_kcontact.diff
+
+---
+Mon Sep 28 17:49:14 UTC 2015 - tittiatc...@gmail.com
+

Old:

  fix_new_kcontacts.diff
  libkolab-1.0.1.tar.gz

New:

  libkolab-1.0.2.tar.gz



Other differences:
--
++ libkolab-qt5.spec ++
--- /var/tmp/diff_new_pack.jMw0yX/_old  2016-01-10 13:07:31.0 +0100
+++ /var/tmp/diff_new_pack.jMw0yX/_new  2016-01-10 13:07:31.0 +0100
@@ -20,14 +20,13 @@
 %define php_confdir %{_sysconfdir}/php5/conf.d
 %define libname libkolab1
 Name:   libkolab-qt5
-Version:1.0.1
+Version:1.0.2
 Release:0
 Summary:Conversions from/to KDE containers
 License:LGPL-2.0+ and LGPL-3.0+ and AGPL-3.0+
 Group:  Development/Libraries/C and C++
 Url:https://kolab.org/about/libkolab
 Source: libkolab-%{version}.tar.gz
-Patch1: fix_new_kcontacts.diff
 BuildRequires:  boost-devel
 BuildRequires:  cmake >= 2.6
 BuildRequires:  libkolabxml-devel >= 1.1
@@ -111,7 +110,6 @@
 
 %prep
 %setup -q -n libkolab-%{version}
-%patch1 -p1 
 
 # TESTS: require X and most fail anyway
 %cmake \

++ libkolab-1.0.1.tar.gz -> libkolab-1.0.2.tar.gz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/libkolab-1.0.1/CMakeLists.txt 
new/libkolab-1.0.2/CMakeLists.txt
--- old/libkolab-1.0.1/CMakeLists.txt   2015-07-31 15:43:01.0 +0200
+++ new/libkolab-1.0.2/CMakeLists.txt   2015-11-25 12:33:10.0 +0100
@@ -32,7 +32,7 @@
 set(Libkolab_VERSION_MAJOR 1)
 set(Libkolab_VERSION_MINOR 0)
 # Enable the full x.y.z version only for release versions
-set(Libkolab_VERSION_PATCH 1)
+set(Libkolab_VERSION_PATCH 2)
 #set(Libkolab_VERSION 
${Libkolab_VERSION_MAJOR}.${Libkolab_VERSION_MINOR}.${Libkolab_VERSION_PATCH})
 set(Libkolab_VERSION ${Libkolab_VERSION_MAJOR}.${Libkolab_VERSION_MINOR})
 set(Libkolab_VERSION_STRING ${CMAKE_PROJECT_NAME}-${Libkolab_VERSION})
@@ -57,8 +57,8 @@
 
 
 # Do the building
-find_package(Libkolabxml 1.1 REQUIRED)
-macro_log_feature(Libkolabxml_FOUND "Libkolabxml" "Kolab XML Format 3 
serializing library" "http://git.kolab.org/libkolabxml/; TRUE "1.0" "Required 
for reading/writing Kolab XML Objects")
+find_package(Libkolabxml 1.1.1 REQUIRED)
+macro_log_feature(Libkolabxml_FOUND "Libkolabxml" "Kolab XML Format 3 
serializing library" "https://git.kolab.org/diffusion/LKX/; TRUE "1.1.1" 
"Required for reading/writing Kolab XML Objects")
 
 set(QT_REQUIRED_VERSION "5.2.0")
 
@@ -68,11 +68,13 @@
 endif()
 
 set(KDEPIMLIBS_LIB_VERSION "4.71.0")
+set(KMIME_LIB_VERSION "4.84.0")
+find_package(KF5CoreAddons CONFIG REQUIRED)
 find_package(KF5Akonadi ${KDEPIMLIBS_LIB_VERSION} CONFIG REQUIRED)
 find_package(KF5Contacts ${KDEPIMLIBS_LIB_VERSION} CONFIG REQUIRED)
 find_package(KF5CalendarCore ${KDEPIMLIBS_LIB_VERSION} CONFIG REQUIRED)
 find_package(KF5CalendarUtils ${KDEPIMLIBS_LIB_VERSION} CONFIG REQUIRED)
-find_package(KF5Mime ${KDEPIMLIBS_LIB_VERSION} CONFIG REQUIRED)
+find_package(KF5Mime ${KMIME_LIB_VERSION} CONFIG REQUIRED)
 find_package(KF5AkonadiNotes ${KDEPIMLIBS_LIB_VERSION} CONFIG REQUIRED)
 
 find_package(SWIG)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/libkolab-1.0.1/conversion/kabcconversion.cpp 
new/libkolab-1.0.2/conversion/kabcconversion.cpp
--- old/libkolab-1.0.1/conversion/kabcconversion.cpp2015-07-31 
15:43:01.0 +0200
+++ new/libkolab-1.0.2/conversion/kabcconversion.cpp2015-11-25 
12:33:10.0 +0100
@@ -488,7 +488,9 @@
   addressee.setTitle(fromStdString(contact.titles().at(0))); //TODO 
support multiple
   }
   if (!contact.urls().empty()) {
-  addressee.setUrl(QUrl(fromStdString(contact.urls().at(0).url(; 
//TODO support multiple
+  KContacts::ResourceLocatorUrl url;
+  url.setUrl(QUrl(fromStdString(contact.urls().at(0).url(; //TODO 
support multiple
+  addressee.setUrl(url);
   foreach(const Kolab::Url , contact.urls()) {
   if (u.type() == Kolab::Url::Blog) {
   addressee.insertCustom("KADDRESSBOOK",

commit libkolab-qt5 for openSUSE:Factory

2015-10-14 Thread h_root

Hello community,

here is the log from the commit of package libkolab-qt5 for openSUSE:Factory 
checked in at 2015-10-14 16:44:51

Comparing /work/SRC/openSUSE:Factory/libkolab-qt5 (Old)
 and  /work/SRC/openSUSE:Factory/.libkolab-qt5.new (New)


Package is "libkolab-qt5"

Changes:

--- /work/SRC/openSUSE:Factory/libkolab-qt5/libkolab-qt5.changes
2015-10-03 20:16:41.0 +0200
+++ /work/SRC/openSUSE:Factory/.libkolab-qt5.new/libkolab-qt5.changes   
2015-10-14 16:44:53.0 +0200
@@ -1,0 +2,6 @@
+Mon Sep 28 17:49:14 UTC 2015 - tittiatc...@gmail.com
+
+- Updated patch fix_new_kcontacts.diff to fix building against 
+  KMime 15.08.1
+
+---



Other differences:
--
++ fix_new_kcontacts.diff ++
--- /var/tmp/diff_new_pack.XRE9IX/_old  2015-10-14 16:44:53.0 +0200
+++ /var/tmp/diff_new_pack.XRE9IX/_new  2015-10-14 16:44:53.0 +0200
@@ -1,14 +1,7 @@
-From ea6273aedbab41d1b91036eafc53b88ba871f836 Mon Sep 17 00:00:00 2001
-From: Raymond Wooninck 
-Date: Sun, 19 Jul 2015 20:28:35 +0200
-Subject: Fix2
-
-
-diff --git a/conversion/kabcconversion.cpp b/conversion/kabcconversion.cpp
-index 3f802bb..987ffae 100644
 a/conversion/kabcconversion.cpp
-+++ b/conversion/kabcconversion.cpp
-@@ -666,8 +666,8 @@ Kolab::Contact fromKABC(const KContacts::Addressee 
)
+diff -urNB libkolab-1.0.1/conversion/kabcconversion.cpp 
new/conversion/kabcconversion.cpp
+--- libkolab-1.0.1/conversion/kabcconversion.cpp   2015-07-31 
15:43:01.0 +0200
 new/conversion/kabcconversion.cpp  2015-09-28 19:47:56.137890076 +0200
+@@ -664,8 +664,8 @@
  }
  
  std::vector urls;
@@ -19,18 +12,19 @@
  }   
  const QString  = addressee.custom(QLatin1String("KADDRESSBOOK"), 
QLatin1String("BlogFeed"));
  if (!blogUrl.isEmpty()) {
-
-From 34b8cbdd02f274ef0d219c090a32aa1f3019ceae Mon Sep 17 00:00:00 2001
-From: Raymond Wooninck 
-Date: Sun, 19 Jul 2015 20:47:32 +0200
-Subject: Fix 4
-
-
-diff --git a/kolabformatV2/contact.cpp b/kolabformatV2/contact.cpp
-index d125bd1..7f2fd13 100644
 a/kolabformatV2/contact.cpp
-+++ b/kolabformatV2/contact.cpp
-@@ -947,7 +947,7 @@ void Contact::setFields( const KContacts::Addressee* 
addressee )
+@@ -703,7 +703,7 @@
+ c.setRelateds(std::vector() << 
Kolab::Related(Kolab::Related::Text, toStdString(spouse), 
Kolab::Related::Spouse));
+ }
+ c.setBDay(fromDate(KDateTime(addressee.birthday(), 
KDateTime::ClockTime)));
+-c.setAnniversary(fromDate(KDateTime(QDate::fromString( 
addressee.custom(QLatin1String("KADDRESSBOOK"), 
QLatin1String("X-Anniversary")), Qt::ISODate ), KDateTime::ClockTime)));
++c.setAnniversary(fromDate(KDateTime(QDate::fromString( 
addressee.custom(QLatin1String("KADDRESSBOOK"), 
QLatin1String("X-Anniversary")), Qt::ISODate ), 
KDateTime::Spec(KDateTime::ClockTime;
+ if (!addressee.photo().isEmpty()) {
+ std::string mimetype;
+ const std::string  = fromPicture(addressee.photo(), mimetype);
+diff -urNB libkolab-1.0.1/kolabformatV2/contact.cpp 
new/kolabformatV2/contact.cpp
+--- libkolab-1.0.1/kolabformatV2/contact.cpp   2015-07-31 15:43:01.0 
+0200
 new/kolabformatV2/contact.cpp  2015-09-28 19:47:17.356720656 +0200
+@@ -947,7 +947,7 @@
setPrefix( addressee->prefix() );
setSuffix( addressee->suffix() );
setOrganization( addressee->organization() );
@@ -39,7 +33,7 @@
setIMAddress( addressee->custom( "KADDRESSBOOK", "X-IMAddress" ) );
setDepartment( addressee->department());
setOfficeLocation( addressee->custom( "KADDRESSBOOK", "X-Office" ) );
-@@ -1082,6 +1082,9 @@ void Contact::saveTo( KContacts::Addressee* addressee )
+@@ -1082,6 +1082,9 @@
  {
// TODO: This needs the same set of TODOs as the setFields method
KolabBase::saveTo( addressee );
@@ -49,7 +43,7 @@
  
addressee->setGivenName( givenName() );
addressee->setAdditionalName( middleNames() );
-@@ -1090,7 +1093,7 @@ void Contact::saveTo( KContacts::Addressee* addressee )
+@@ -1090,7 +1093,7 @@
addressee->setPrefix( prefix() );
addressee->setSuffix( suffix() );
addressee->setOrganization( organization() );

commit libkolab-qt5 for openSUSE:Factory

commit libkolab-qt5 for openSUSE:Factory

commit libkolab-qt5 for openSUSE:Factory

commit libkolab-qt5 for openSUSE:Factory

commit libkolab-qt5 for openSUSE:Factory

commit libkolab-qt5 for openSUSE:Factory

commit libkolab-qt5 for openSUSE:Factory

commit libkolab-qt5 for openSUSE:Factory

8 matches

Site Navigation

Mail list logo

Footer information