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.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libkolabxml.new/libkolabxml.changes 2014-12-16 14:50:55.000000000 +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.000000000 +0100 +++ /var/tmp/diff_new_pack.wVUE8Y/_new 2014-12-16 14:51:00.000000000 +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 package provides the java bindings for Libkolabxml +%endif -%package -n mono-%{name}%{soname} +%if 0%{?with_mono} +%package -n mono-%{libname} Summary: Mono (C#) bindings for %{name} Group: Development/Languages/Mono -Requires: %{name}%{soname} = %{version} +Requires: %{libname} = %{version} Provides: csharp-kolabformat = %{version} -%description -n mono-%{name}%{soname} +%description -n mono-%{libname} Libkolabxml serves as a serialization/de-serialization library for the the Kolab XML Format Features: @@ -142,14 +150,15 @@ - Supports Todos/Events/Journals/Contacts/Distribution Lists/Notes/Configurations This package provides the mono (C#) bindings for Libkolabxml +%endif -%package -n php-%{name}%{soname} +%package -n php-%{libname} Summary: PHP bindings for %{name} Group: Development/Languages/Other -Requires: %{name}%{soname} = %{version} +Requires: %{libname} = %{version} Provides: php-kolabformat = %{version} -%description -n php-%{name}%{soname} +%description -n php-%{libname} Libkolabxml serves as a serialization/de-serialization library for the the Kolab XML Format Features: @@ -163,13 +172,13 @@ This package provides the php bindings for Libkolabxml -%package -n python-%{name}%{soname} +%package -n python-%{libname} Summary: Python bindings for %{name} Group: Development/Languages/Python -Requires: %{name}%{soname} = %{version} +Requires: %{libname} = %{version} Provides: python-kolabformat = %{version} -%description -n python-%{name}%{soname} +%description -n python-%{libname} Libkolabxml serves as a serialization/de-serialization library for the the Kolab XML Format Features: @@ -185,74 +194,97 @@ %prep %setup -q -%if 0%{?sles_version} == 11 -%patch0 -p0 +%if 0%{?suse_version} < 1140 +%patch0 %patch2 -p1 %endif %build - export CXXFLAGS="%{optflags}" - export CFLAGS="%{optflags}" +# 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 - mkdir build - cd build +# libexecdir: SLE11 expands to libdir, but we want /usr/lib/ +%if 0%{?suse_version} < 1140 +%define _libexecdir %{_prefix}/lib +%endif - cmake -DCMAKE_INSTALL_PREFIX="%{_prefix}" \ - -DLIB_INSTALL_DIR=%{_lib} \ - -DCMAKE_SKIP_RPATH=TRUE \ +# 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 \ +%if 0%{?with_java} -DJAVA_BINDINGS=TRUE -DJAVA_INSTALL_DIR=%{_jnidir} \ - -DCSHARP_BINDINGS=TRUE -DCSHARP_INSTALL_DIR=%{_prefix}/lib/mono/ \ +%endif -DPHP_BINDINGS=TRUE -DPHP_INSTALL_DIR=%{php_extdir}\ -DPYTHON_BINDINGS=TRUE -DPYTHON_INSTALL_DIR=%{python_sitearch} \ +%if 0%{?with_mono} + -DCSHARP_BINDINGS=TRUE -DCSHARP_INSTALL_DIR=%{_libexecdir}/mono/ \ +%endif + -DBUILD_TESTS=FALSE \ +%if 0%{?suse_version} < 1310 + -DCMAKE_INSTALL_PREFIX="%{_prefix}" \ + -DLIB_INSTALL_DIR=%{_lib} \ .. +%endif - %{__make} %{?_smp_mflags} +make %{?_smp_mflags} %install - cd build - %{__make} DESTDIR=%{buildroot} install +# 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 +%else +%cmake_install +%endif - mkdir -p %{buildroot}/%{_datadir}/%{phpdir} - mv %{buildroot}/%{php_extdir}/kolabformat.php %{buildroot}/%{_datadir}/%{phpdir}/kolabformat.php +mkdir -p %{buildroot}/%{_datadir}/php5 +mv %{buildroot}/%{php_extdir}/kolabformat.php %{buildroot}/%{_datadir}/php5/kolabformat.php - mkdir -p %{buildroot}/%{php_inidir}/ - cat >%{buildroot}/%{php_inidir}/kolabformat.ini <<EOF +mkdir -p %{buildroot}/%{php_confdir}/ +cat >%{buildroot}/%{php_confdir}/kolabformat.ini <<EOF extension=kolabformat.so EOF -%post -n %{name}%{soname} -p /sbin/ldconfig +%post -n %{libname} -p /sbin/ldconfig -%postun -n %{name}%{soname} -p /sbin/ldconfig +%postun -n %{libname} -p /sbin/ldconfig -%files -n %{name}%{soname} +%files -n %{libname} %defattr(-,root,root) -%doc AUTHORS COPYING NEWS README +%doc AUTHORS COPYING README %{_libdir}/libkolabxml.so.* -%files -n python-%{name}%{soname} +%files -n python-%{libname} %defattr(-,root,root) %doc COPYING %{python_sitearch}/_kolabformat.so %{python_sitearch}/kolabformat.py* -%files -n php-%{name}%{soname} +%files -n php-%{libname} %defattr(-,root,root) %doc COPYING -%config(noreplace) %{php_inidir}/kolabformat.ini -%{_datadir}/%{phpdir}/kolabformat.php +%config(noreplace) %{php_confdir}/kolabformat.ini +%{_datadir}/php5/kolabformat.php %{php_extdir}/kolabformat.so -%files -n java-%{name}%{soname} +%if 0%{?with_java} +%files -n java-%{libname} %defattr(-,root,root) %doc COPYING %dir %{_libdir}/java/ %{_libdir}/java/* +%endif -%if %{with mono} -%files -n mono-%{name}%{soname} +%if 0%{?with_mono} +%files -n mono-%{libname} %defattr(-,root,root) %doc COPYING -%{_prefix}/lib/mono/* +%{_libexecdir}/mono/* %endif %files devel ++++++ libkolabxml-1.0.2.tar.gz -> libkolabxml-1.0.3.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkolabxml-1.0.2/CMakeLists.txt new/libkolabxml-1.0.3/CMakeLists.txt --- old/libkolabxml-1.0.2/CMakeLists.txt 2014-08-26 12:53:07.000000000 +0200 +++ new/libkolabxml-1.0.3/CMakeLists.txt 2014-10-13 11:49:38.000000000 +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 2) +set (Libkolabxml_VERSION_PATCH 3) 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.0.2/schemas/kolabformat.xsd new/libkolabxml-1.0.3/schemas/kolabformat.xsd --- old/libkolabxml-1.0.2/schemas/kolabformat.xsd 2014-08-26 12:53:07.000000000 +0200 +++ new/libkolabxml-1.0.3/schemas/kolabformat.xsd 2014-10-13 11:49:38.000000000 +0200 @@ -102,6 +102,7 @@ <xs:enumeration value="dictionary"/> <xs:enumeration value="categorycolor"/> <xs:enumeration value="snippets"/> + <xs:enumeration value="file_driver"/> </xs:restriction> </xs:simpleType> @@ -138,6 +139,17 @@ </xs:complexType> <xs:element name="snippet" type="Snippet"/> + + <xs:complexType name="FileDriverSettings" mixed="true" > + <xs:sequence> + <xs:element name="host" type="xs:string" minOccurs="0"/> + <xs:element name="port" type="xs:integer" minOccurs="0"/> + <xs:element name="username" type="xs:string" minOccurs="0"/> + <xs:element name="password" type="xs:string" minOccurs="0"/> + </xs:sequence> + </xs:complexType> + + <xs:element name="settings" type="FileDriverSettings"/> <xs:complexType name="Configuration"> <xs:complexContent mixed="false"> @@ -156,6 +168,11 @@ <!-- Snippets --> <xs:element name="name" type="xs:string" minOccurs="0"/> <xs:element name="snippet" type="Snippet" minOccurs="0" maxOccurs="unbounded"/> + <!-- FileDriver --> + <xs:element name="driver" type="xs:string" minOccurs="0"/> + <xs:element name="title" type="xs:string" minOccurs="0"/> + <xs:element name="enabled" type="xs:boolean" minOccurs="0"/> + <xs:element name="settings" type="FileDriverSettings" minOccurs="0"/> </xs:sequence> </xs:extension> </xs:complexContent> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkolabxml-1.0.2/src/containers/kolabconfiguration.cpp new/libkolabxml-1.0.3/src/containers/kolabconfiguration.cpp --- old/libkolabxml-1.0.2/src/containers/kolabconfiguration.cpp 2014-08-26 12:53:07.000000000 +0200 +++ new/libkolabxml-1.0.3/src/containers/kolabconfiguration.cpp 2014-10-13 11:49:38.000000000 +0200 @@ -25,6 +25,7 @@ std::vector<CategoryColor> categoryColor; Dictionary dictionary; SnippetsCollection snippets; + FileDriver fileDriver; ConfigurationType type; std::string uid; cDateTime created; @@ -57,6 +58,13 @@ d->type = TypeSnippet; } +Configuration::Configuration(const FileDriver &fileDriver) +: d(new Configuration::Private) +{ + d->fileDriver = fileDriver; + d->type = TypeFileDriver; +} + Configuration::Configuration(const Configuration &other) : d(new Configuration::Private) { @@ -129,4 +137,9 @@ return d->snippets; } +FileDriver Configuration::fileDriver() const +{ + return d->fileDriver; +} + } //Namespace diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkolabxml-1.0.2/src/containers/kolabconfiguration.h new/libkolabxml-1.0.3/src/containers/kolabconfiguration.h --- old/libkolabxml-1.0.2/src/containers/kolabconfiguration.h 2014-08-26 12:53:07.000000000 +0200 +++ new/libkolabxml-1.0.3/src/containers/kolabconfiguration.h 2014-10-13 11:49:38.000000000 +0200 @@ -109,12 +109,58 @@ std::vector<Snippet> mSnippets; }; +struct FileDriver { + FileDriver(): mEnabled(false) {} + FileDriver(const std::string &driver, const std::string &title): mDriver(driver), mTitle(title), mEnabled(true) {} + + bool operator==(const FileDriver &other) const { + return mDriver == other.mDriver + && mTitle == other.mTitle + && mEnabled == other.mEnabled + && mHost == other.mHost + && mPort == other.mPort + && mUsername == other.mUsername + && mPassword == other.mPassword; + } + + void setDriver(const std::string &driver) { mDriver = driver; } + std::string driver() const { return mDriver; } + + void setTitle(const std::string &title) { mTitle = title; } + std::string title() const { return mTitle; } + + void setEnabled(bool enabled) { mEnabled = enabled; } + bool enabled() const { return mEnabled; } + + void setHost(const std::string &host) { mHost = host; } + std::string host() const { return mHost; } + + void setPort(int port) { mPort = port; } + int port() const { return mPort; } + + void setUsername(const std::string &username) { mUsername = username; } + std::string username() const { return mUsername; } + + void setPassword(const std::string &password) { mPassword = password; } + std::string password() const { return mPassword; } + +private: + std::string mDriver; + std::string mTitle; + bool mEnabled; + std::string mHost; + int mPort; + std::string mUsername; + std::string mPassword; +}; + class Configuration { public: Configuration(); Configuration(const std::vector<CategoryColor> &); Configuration(const Dictionary &); Configuration(const SnippetsCollection &); + Configuration(const FileDriver &); Configuration(const Configuration &); ~Configuration(); void operator=(const Configuration &); @@ -134,12 +180,15 @@ Invalid, TypeDictionary, TypeCategoryColor, - TypeSnippet + TypeSnippet, + TypeFileDriver }; ConfigurationType type() const; std::vector<CategoryColor> categoryColor() const; Dictionary dictionary() const; SnippetsCollection snippets() const; + FileDriver fileDriver() const; + private: struct Private; boost::scoped_ptr<Private> d; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkolabxml-1.0.2/src/csharp/CMakeLists.txt new/libkolabxml-1.0.3/src/csharp/CMakeLists.txt --- old/libkolabxml-1.0.2/src/csharp/CMakeLists.txt 2014-08-26 12:53:07.000000000 +0200 +++ new/libkolabxml-1.0.3/src/csharp/CMakeLists.txt 2014-10-13 11:49:38.000000000 +0200 @@ -33,6 +33,7 @@ ${CMAKE_CURRENT_BINARY_DIR}/Email.cs ${CMAKE_CURRENT_BINARY_DIR}/Event.cs ${CMAKE_CURRENT_BINARY_DIR}/File.cs + ${CMAKE_CURRENT_BINARY_DIR}/FileDriver.cs ${CMAKE_CURRENT_BINARY_DIR}/Geo.cs ${CMAKE_CURRENT_BINARY_DIR}/Journal.cs ${CMAKE_CURRENT_BINARY_DIR}/Key.cs diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkolabxml-1.0.2/src/java/CMakeLists.txt new/libkolabxml-1.0.3/src/java/CMakeLists.txt --- old/libkolabxml-1.0.2/src/java/CMakeLists.txt 2014-08-26 12:53:07.000000000 +0200 +++ new/libkolabxml-1.0.3/src/java/CMakeLists.txt 2014-10-13 11:49:38.000000000 +0200 @@ -23,6 +23,7 @@ ${CMAKE_CURRENT_BINARY_DIR}/Duration.java ${CMAKE_CURRENT_BINARY_DIR}/ErrorSeverity.java ${CMAKE_CURRENT_BINARY_DIR}/Event.java + ${CMAKE_CURRENT_BINARY_DIR}/FileDriver.java ${CMAKE_CURRENT_BINARY_DIR}/Geo.java ${CMAKE_CURRENT_BINARY_DIR}/Journal.java ${CMAKE_CURRENT_BINARY_DIR}/Key.java diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkolabxml-1.0.2/src/kolabconversions.h new/libkolabxml-1.0.3/src/kolabconversions.h --- old/libkolabxml-1.0.2/src/kolabconversions.h 2014-08-26 12:53:07.000000000 +0200 +++ new/libkolabxml-1.0.3/src/kolabconversions.h 2014-10-13 11:49:38.000000000 +0200 @@ -129,6 +129,8 @@ return KolabXSD::Configuration::type_type::categorycolor; case Kolab::Configuration::TypeSnippet: return KolabXSD::Configuration::type_type::snippets; + case Kolab::Configuration::TypeFileDriver: + return KolabXSD::Configuration::type_type::file_driver; default: CRITICAL("Invalid configuration type"); } @@ -189,6 +191,20 @@ } } break; + case Kolab::Configuration::TypeFileDriver: { + const Kolab::FileDriver &fileDriver = configuration.fileDriver(); + n.driver(fileDriver.driver()); + n.title(fileDriver.title()); + n.enabled(fileDriver.enabled()); + + KolabXSD::FileDriverSettings settings; + settings.host(fileDriver.host()); + settings.port(fileDriver.port()); + settings.username(fileDriver.username()); + settings.password(fileDriver.password()); + n.settings(settings); + } + break; default: CRITICAL("Invalid configuration type"); return std::string(); @@ -515,6 +531,27 @@ collection.setSnippets(snippets); n = boost::shared_ptr<Kolab::Configuration>(new Kolab::Configuration(collection)); + } else if (configuration->type() == KolabXSD::ConfigurationType::file_driver) { + std::string driver; + if (configuration->driver()) { + driver = *configuration->driver(); + } + std::string title; + if (configuration->title()) { + title = *configuration->title(); + } + Kolab::FileDriver fileDriver(driver, title); + fileDriver.setEnabled(*configuration->enabled()); + if (configuration->settings()) { + fileDriver.setHost(*configuration->settings()->host()); + fileDriver.setPort(convertToInt(*configuration->settings()->port())); + fileDriver.setUsername(*configuration->settings()->username()); + fileDriver.setPassword(*configuration->settings()->password()); + } else { + CRITICAL("Settings are missing"); + } + + n = boost::shared_ptr<Kolab::Configuration>(new Kolab::Configuration(fileDriver)); } else { CRITICAL("No valid configuration type"); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkolabxml-1.0.2/tests/bindingstest.cpp new/libkolabxml-1.0.3/tests/bindingstest.cpp --- old/libkolabxml-1.0.2/tests/bindingstest.cpp 2014-08-26 12:53:07.000000000 +0200 +++ new/libkolabxml-1.0.3/tests/bindingstest.cpp 2014-10-13 11:49:38.000000000 +0200 @@ -105,6 +105,32 @@ QCOMPARE(re.snippets(), snippets); } +void BindingsTest::fileDriverConfigurationCompletness() +{ + Kolab::FileDriver fileDriver("driver", "title"); + fileDriver.setEnabled(false); + fileDriver.setHost("host"); + fileDriver.setPort(9); + fileDriver.setUsername("username"); + fileDriver.setPassword("password"); + + Kolab::Configuration configuration(fileDriver); + configuration.setUid("uid"); + configuration.setCreated(Kolab::cDateTime(2006,1,6,12,0,0,true)); //UTC + configuration.setLastModified(Kolab::cDateTime(2006,1,6,12,0,0,true)); //UTC + + const std::string &result = Kolab::writeConfiguration(configuration); + QCOMPARE(Kolab::error(), Kolab::NoError); +// std::cout << result << std::endl; + const Kolab::Configuration &re = Kolab::readConfiguration(result, false); + QCOMPARE(Kolab::error(), Kolab::NoError); + QCOMPARE(re.uid(), configuration.uid()); + QCOMPARE(re.created(), configuration.created()); + QCOMPARE(re.lastModified(), configuration.lastModified()); + QCOMPARE(re.type(), Kolab::Configuration::TypeFileDriver); + QCOMPARE(re.fileDriver(), fileDriver); +} + void BindingsTest::noteCompletness() { Kolab::Note note; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkolabxml-1.0.2/tests/bindingstest.h new/libkolabxml-1.0.3/tests/bindingstest.h --- old/libkolabxml-1.0.2/tests/bindingstest.h 2014-08-26 12:53:07.000000000 +0200 +++ new/libkolabxml-1.0.3/tests/bindingstest.h 2014-10-13 11:49:38.000000000 +0200 @@ -25,6 +25,7 @@ void categorycolorConfigurationCompletness(); void dictionaryConfigurationCompletness(); void snippetConfigurationCompletness(); + void fileDriverConfigurationCompletness(); void noteCompletness(); void fileCompletness(); void eventCompletness(); -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
