Kolab Groupware OBS

libkolabxml.spec Changed

@@ -61,16 +61,14 @@
 %else
 Name:           libkolabxml
 %endif
-Version:        1.2
-Release:        0.1.git%{?dist}
+Version: 1.1.2
+Release: 1%{?dist}
 Summary:        Kolab XML format collection parser library
 
 Group:          System Environment/Libraries
 License:        LGPLv3+
 URL:            http://www.kolab.org
-
-# From fa555615bd732cdc7fef56bf617e57d1bcf174fd
-Source0:        http://git.kolab.org/libkolabxml/snapshot/libkolabxml-%{version}.tar.gz
+Source0:        %{name}_%{version}.orig.tar.gz
 
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -79,6 +77,7 @@
 BuildRequires:  e2fsprogs-devel
 BuildRequires:  gcc-c++
 BuildRequires:  libcurl-devel
+BuildRequires:  make
 %if 0%{?suse_version}
 BuildRequires:  qt-devel
 %else
@@ -377,7 +376,10 @@
 %endif
 
 %changelog
-* Thu May 28 2015 Christian Mollekopf <mollekopf@kolabsys.com> - 1.2
+* Tue Feb 23 2016 Sandro Knauß (Kolab Systems) <knauss@kolabsys.com> - 1.1.2-1
+- New upstream release 1.1.2
+
+* Thu May 28 2015 Christian Mollekopf <mollekopf@kolabsys.com> - 1.1.1-0
 - New upstream release
 - Removed dependency on kdepimlibs and kdelibs which is not required

debian.changelog Changed

debian.control Changed

@@ -2,7 +2,8 @@
 Section: libs
 Priority: optional
 Maintainer: Debian Kolab Maintainers <pkg-kolab-devel@lists.alioth.debian.org>
-Uploaders: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>, Paul Klos <kolab@klos2day.nl>
+Uploaders: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>,
+           Paul Klos <kolab@klos2day.nl>
 Build-Depends: cmake,
                debhelper,
                libboost-dev,
@@ -10,8 +11,8 @@
                libboost-thread-dev,
                libcurl4-gnutls-dev,
                libossp-uuid-dev,
-               libqt4-dev,
                libxerces-c-dev,
+               libqt4-dev,
                php5-cli,
                php5-dev,
                python-dev,
@@ -23,8 +24,7 @@
 
 Package: libkolabxml1
 Architecture: any
-Depends: ${misc:Depends},
-	${shlibs:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: Libkolabxml is the reference implementation of the Kolab XML format
  The Kolab 3.0 XML format is defined in
  http://wiki.kolab.org/User:Mollekopf/Drafts/KEP:17.
@@ -35,10 +35,10 @@
 Package: php-kolabformat
 Architecture: any
 Depends: libkolabxml1 (= ${binary:Version}),
-	${misc:Depends},
-	${shlibs:Depends},
-	${php:Depends},
-	ucf
+         ucf,
+         ${misc:Depends},
+         ${php:Depends},
+         ${shlibs:Depends}
 Description: PHP bindings for Kolab Format 3.0 XML parsing
  Libkolabxml is the reference implementation of the Kolab XML format
  For more information see the libkolabxml package.
@@ -49,9 +49,9 @@
 Architecture: any
 Section: python
 Depends: libkolabxml1 (= ${binary:Version}),
-	python,
-	${misc:Depends},
-	${shlibs:Depends}
+         python,
+         ${misc:Depends},
+         ${shlibs:Depends}
 Description: Python bindings for Kolab Format 3.0 XML parsing
  Libkolabxml is the reference implementation of the Kolab XML format.
  For more information see the libkolabxml package.
@@ -61,11 +61,9 @@
 Package: libkolabxml-dev
 Section: libdevel
 Architecture: any
-Depends: libkolabxml1 (= ${binary:Version}),
-         ${misc:Depends}
+Depends: libkolabxml1 (= ${binary:Version}), ${misc:Depends}
 Description: Development files for libkolabxml
  Libkolabxml is the reference implementation of the Kolab XML format.
  For more information see the libkolabxml package.
  .
  This package provides development files libkolabxml.
-

debian.rules Changed

debian.tar.gz/copyright Changed

@@ -25,10 +25,10 @@
  /usr/share/common-licenses/LGPL-3
 
 Files: schemas/*
-Copyright: 2011-2012 by The Calendaring and Scheduling Consortium, Inc. 
+Copyright: 2011-2012 by The Calendaring and Scheduling Consortium, Inc.
 License: Apache-2.0
  Files from http://www.calconnect.org/artifacts/ical-art.shtml
- All material contained in files linked from this page is licensed 
+ All material contained in files linked from this page is licensed
  via the Apache License Version 2.0.
  .
  Licensed under the Apache License, Version 2.0 (the "License");
@@ -62,7 +62,7 @@
  Permission is granted to anyone to use this software for any purpose,
  including commercial applications, and to alter it and redistribute it
  freely, subject to the following restrictions:
- .  
+ .
  1. The origin of this source code must not be misrepresented; you must not
     claim that you wrote the original source code. If you use this source code
     in a product, an acknowledgment in the product documentation would be

debian.tar.gz/kolabformat.ini Added

debian.tar.gz/libkolabxml-dev.install Changed

debian.tar.gz/patches Added

debian.tar.gz/patches/fix-conversationtest.patch Added

@@ -0,0 +1,13 @@
+diff --git a/tests/conversiontest.cpp b/tests/conversiontest.cpp
+index 9affadc..d15007c 100644
+--- a/tests/conversiontest.cpp
++++ b/tests/conversiontest.cpp
+@@ -177,7 +177,7 @@ void ConversionTest::mailtoUriEncodingTest_data()
+     QTest::addColumn<QString>("name");
+     QTest::addColumn<QString>("resultEncoded");
+     //Older versions used to encode "." and "_". Not sure which version is actually required though (fixed in 7.26.0 but broken in 7.19.7, we're testing for 7.26.0)
+-    if (LIBCURL_VERSION_NUM >= 0x071a00) {
++    if (LIBCURL_VERSION_NUM >= 0x071600) {
+         QTest::newRow("1") << "email_1@email.com" << "John Doe" << "mailto:John%20Doe%3Cemail_1%40email.com%3E";
+         QTest::newRow("Reserved characters") << "!*'();:@&=+$,/?#[]@email.com" << "John Doe" << "mailto:John%20Doe%3C%21%2A%27%28%29%3B%3A%40%26%3D%2B%24%2C%2F%3F%23%5B%5D%40email.com%3E";
+         QTest::newRow("Unreserved characters") << "Aa0-_.~@email.com" << "John Doe" << "mailto:John%20Doe%3CAa0-_.~%40email.com%3E";

debian.tar.gz/patches/fix-parallel-build.patch Added

@@ -0,0 +1,19 @@
+Author: Diane Trout <diane@ghic.org>
+Description: When running multiple make processes the 
+ generate_php_bindings didn't have dependency information about 
+ what was generating php_kolabformat.h.
+
+ This explicitly addes php_kolabformat.h to the list of files generated 
+ by the swig command.
+
+--- a/src/php/CMakeLists.txt
++++ b/src/php/CMakeLists.txt
+@@ -3,7 +3,7 @@
+ 
+ set(KOLAB_SWIG_PHP_SOURCE_FILE php_kolabformat_wrapper.cpp)
+ set(KOLAB_SWIG_PHP_HEADER_FILE php_kolabformat.h)
+-add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${KOLAB_SWIG_PHP_SOURCE_FILE} ${CMAKE_CURRENT_BINARY_DIR}/kolabformat.php
++add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${KOLAB_SWIG_PHP_SOURCE_FILE} ${CMAKE_CURRENT_BINARY_DIR}/${KOLAB_SWIG_PHP_HEADER_FILE} ${CMAKE_CURRENT_BINARY_DIR}/kolabformat.php
+         COMMAND ${SWIG} -v -c++ -php -o ${CMAKE_CURRENT_BINARY_DIR}/${KOLAB_SWIG_PHP_SOURCE_FILE}  ../kolabformat.i
+         COMMENT "Generating php bindings"
+         WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}

debian.tar.gz/patches/fix-race-condition.patch Added

@@ -0,0 +1,29 @@
+Description: Correct race condition
+ The Debian build system ran into a race
+ condition, where the generated header file
+ php_kolabformat.h was used before generation
+ was complete.
+Author: Paul Klos <kolab@klos2day.nl>
+Last-Update: 2013-06-10
+Bug: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=710568
+
+--- a/src/php/CMakeLists.txt
++++ b/src/php/CMakeLists.txt
+@@ -2,6 +2,7 @@
+ include_directories(../)
+ 
+ set(KOLAB_SWIG_PHP_SOURCE_FILE php_kolabformat_wrapper.cpp)
++set(KOLAB_SWIG_PHP_HEADER_FILE php_kolabformat.h)
+ add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${KOLAB_SWIG_PHP_SOURCE_FILE} ${CMAKE_CURRENT_BINARY_DIR}/kolabformat.php
+         COMMAND ${SWIG} -v -c++ -php -o ${CMAKE_CURRENT_BINARY_DIR}/${KOLAB_SWIG_PHP_SOURCE_FILE}  ../kolabformat.i
+         COMMENT "Generating php bindings"
+@@ -11,7 +12,8 @@
+     )
+ 
+ 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_HEADER_FILE} PROPERTIES GENERATED 1)
++add_custom_target(generate_php_bindings ALL DEPENDS ${KOLAB_SWIG_PHP_SOURCE_FILE} ${KOLAB_SWIG_PHP_HEADER_FILE})
+ 
+ 
+ #Compile PHP Bindings

debian.tar.gz/patches/series Added

debian.tar.gz/source Added

debian.tar.gz/source/format Added

libkolabxml.dsc Changed

@@ -2,30 +2,17 @@
 Source: libkolabxml
 Binary: libkolabxml1, php-kolabformat, python-kolabformat, libkolabxml-dev
 Architecture: any
-Version: 1.2~dev20150511-0~kolab1
+Version: 1.1.2-0~kolab1
 Maintainer: Debian Kolab Maintainers <pkg-kolab-devel@lists.alioth.debian.org>
 Uploaders: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>, Paul Klos <kolab@klos2day.nl>
 Homepage: http://git.kolab.org/libkolabxml
 Standards-Version: 3.9.3
-Build-Depends: cmake,
-               debhelper,
-               libboost-dev,
-               libboost-system-dev,
-               libboost-thread-dev,
-               libcurl4-gnutls-dev,
-               libossp-uuid-dev,
-               libqt4-dev,
-               libxerces-c-dev,
-               php5-cli,
-               php5-dev,
-               python-dev,
-               swig (>= 2.0),
-               xsdcxx
-Package-List: 
- libkolabxml-dev deb libdevel optional
- libkolabxml1 deb libs optional
- php-kolabformat deb libs optional
- python-kolabformat deb python optional
-Files: 
- 00000000000000000000000000000000 0 libkolabxml-1.2.tar.gz
- 00000000000000000000000000000000 0 debian.tar.gz
+Build-Depends: cmake, debhelper, libboost-dev, libboost-system-dev, libboost-thread-dev, libcurl4-gnutls-dev, libossp-uuid-dev, libxerces-c-dev, libqt4-dev, php5-cli, php5-dev, python-dev, swig (>= 2.0), xsdcxx
+Package-List:
+ libkolabxml-dev deb libdevel optional arch=any
+ libkolabxml1 deb libs optional arch=any
+ php-kolabformat deb libs optional arch=any
+ python-kolabformat deb python optional arch=any
+Files:
+ 00000000000000000000000000000000 0 libkolabxml-1.1.2.orig.tar.gz
+ 00000000000000000000000000000000 0 debian.tar.gz
\ No newline at end of file

Changes of Revision 4