Projects
Kolab:16:TestingLinked
libkolab
Log In
Username
Password
We truncated the diff of some files because they were too big. If you want to see the full diff for every file,
click here
.
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
Expand all
Collapse all
Changes of Revision 29
View file
libkolab.spec
Changed
@@ -41,7 +41,7 @@ Name: libkolab %endif -Version: 3.0.2 +Version: 3.1.0 Release: 1%{?dist} Summary: Kolab Object Handling Library @@ -52,34 +52,28 @@ Source0: libkolab-%{version}.tar.gz BuildRequires: cmake -%if 0%{?rhel} > 7 || 0%{?fedora} BuildRequires: kf5-kcalendarcore-devel BuildRequires: kf5-kmime-devel -%else -# Note: available within kolabsys.com infrastructure only, as being (essentially) a -# fork of various kde 4.9 libraries that depend on kde*, and that have no place in el6. -BuildRequires: libcalendaring-devel >= 4.9.1 -%endif %if 0%{?suse_version} BuildRequires: qt-devel %else BuildRequires: qt5-qtbase-devel %endif BuildRequires: libcurl-devel -BuildRequires: libkolabxml-devel >= 1.0 +BuildRequires: libkolabxml-devel >= 1.2 BuildRequires: make BuildRequires: php >= 5.3 BuildRequires: php-devel >= 5.3 +BuildRequires: swig >= 4.1 %if 0%{?plesk} -%if 0%{?rhel} < 8 || 0%{?fedora} -BuildRequires: plesk-php56-devel -BuildRequires: plesk-php70-devel -%endif -BuildRequires: plesk-php71-devel +%if 0%{?rhel} < 9 BuildRequires: plesk-php72-devel BuildRequires: plesk-php73-devel +%endif BuildRequires: plesk-php74-devel +BuildRequires: plesk-php80-devel +BuildRequires: plesk-php81-devel %endif BuildRequires: python3-devel @@ -95,18 +89,12 @@ %endif Summary: Kolab library development headers Requires: libkolab%{?_isa} = %{version} -%if 0%{?rhel} > 7 || 0%{?fedora} BuildRequires: kf5-kcalendarcore-devel BuildRequires: kf5-kmime-devel %if 0%{?fedora} >= 21 # Fedora 21 has qca2 and qca, qca2 has been renamed to qca BuildRequires: qca %endif -%else -# Note: available within kolabsys.com infrastructure only, as being (essentially) a -# fork of various kde 4.9 libraries that depend on kde*, and that have no place in el6. -BuildRequires: libcalendaring-devel >= 4.9.1 -%endif Requires: libkolabxml-devel >= 1.0 Requires: php-devel Requires: pkgconfig @@ -139,38 +127,7 @@ PHP Bindings for libkolab %if 0%{?plesk} -%if 0%{?rhel} < 8 || 0%{?fedora} -%package -n plesk-php56-kolab -Summary: libkolab bindings for Plesk's PHP 5.6 -Group: System Environment/Libraries -Provides: php-bindings(libkolab) = %{version}-%{release} -Requires: libkolab%{?_isa} = %{version} -Requires: plesk-php56 - -%description -n plesk-php56-kolab -libkolab bindings for Plesk's PHP 5.6 - -%package -n plesk-php70-kolab -Summary: libkolab bindings for Plesk's PHP 7.0 -Group: System Environment/Libraries -Provides: php-bindings(libkolab) = %{version}-%{release} -Requires: libkolab%{?_isa} = %{version} -Requires: plesk-php70 - -%description -n plesk-php70-kolab -libkolab bindings for Plesk's PHP 7.0 -%endif - -%package -n plesk-php71-kolab -Summary: libkolab bindings for Plesk's PHP 7.1 -Group: System Environment/Libraries -Provides: php-bindings(libkolab) = %{version}-%{release} -Requires: libkolab%{?_isa} = %{version} -Requires: plesk-php71 - -%description -n plesk-php71-kolab -libkolab bindings for Plesk's PHP 7.1 - +%if 0%{?rhel} < 9 %package -n plesk-php72-kolab Summary: libkolab bindings for Plesk's PHP 7.2 Group: System Environment/Libraries @@ -191,6 +148,7 @@ %description -n plesk-php73-kolab libkolab bindings for Plesk's PHP 7.3 +%endif %package -n plesk-php74-kolab Summary: libkolab bindings for Plesk's PHP 7.4 Group: System Environment/Libraries @@ -200,6 +158,26 @@ %description -n plesk-php74-kolab libkolab bindings for Plesk's PHP 7.4 + +%package -n plesk-php80-kolab +Summary: libkolab bindings for Plesk's PHP 8.0 +Group: System Environment/Libraries +Provides: php-bindings(libkolab) = %{version}-%{release} +Requires: libkolab%{?_isa} = %{version} +Requires: plesk-php80 + +%description -n plesk-php80-kolab +libkolab bindings for Plesk's PHP 8.0 + +%package -n plesk-php81-kolab +Summary: libkolab bindings for Plesk's PHP 8.1 +Group: System Environment/Libraries +Provides: php-bindings(libkolab) = %{version}-%{release} +Requires: libkolab%{?_isa} = %{version} +Requires: plesk-php81 + +%description -n plesk-php81-kolab +libkolab bindings for Plesk's PHP 8.1 %endif %package -n python-kolab @@ -236,24 +214,22 @@ popd %if 0%{?plesk} -%if 0%{?rhel} < 8 || 0%{?fedora} -cp -a libkolab-%{version} libkolab-%{version}-5.6 - -cp -a libkolab-%{version} libkolab-%{version}-7.0 -sed -i "s/-php/-php7/g" libkolab-%{version}-7.0/cmake/modules/SWIGUtils.cmake -%endif - -cp -a libkolab-%{version} libkolab-%{version}-7.1 -sed -i "s/-php/-php7/g" libkolab-%{version}-7.1/cmake/modules/SWIGUtils.cmake - +%if 0%{?rhel} < 9 cp -a libkolab-%{version} libkolab-%{version}-7.2 sed -i "s/-php/-php7/g" libkolab-%{version}-7.2/cmake/modules/SWIGUtils.cmake cp -a libkolab-%{version} libkolab-%{version}-7.3 sed -i "s/-php/-php7/g" libkolab-%{version}-7.3/cmake/modules/SWIGUtils.cmake +%endif cp -a libkolab-%{version} libkolab-%{version}-7.4 sed -i "s/-php/-php7/g" libkolab-%{version}-7.4/cmake/modules/SWIGUtils.cmake + +cp -a libkolab-%{version} libkolab-%{version}-8.0 +sed -i "s/-php/-php7/g" libkolab-%{version}-8.0/cmake/modules/SWIGUtils.cmake + +cp -a libkolab-%{version} libkolab-%{version}-8.1 +sed -i "s/-php/-php7/g" libkolab-%{version}-8.1/cmake/modules/SWIGUtils.cmake %endif %if 0%{?with_php7} @@ -263,7 +239,7 @@ %endif %if 0%{?with_python} -cp -a libkolab-%{version} libkolab-%{version}-python +cp -a libkolab-%{version} libkolab-%{version}-python2 %endif %if 0%{?with_python3} @@ -302,9 +278,6 @@ -DBoost_NO_BOOST_CMAKE=TRUE \ -Wno-fatal-errors -Wno-errors \ -DINCLUDE_INSTALL_DIR=%{_includedir} \ -%if 0%{?rhel} < 8 && 0%{?fedora} < 20 - -DUSE_LIBCALENDARING=ON \ -%endif -DPHP_BINDINGS=ON \ -DPHP_INSTALL_DIR=%{php_extdir} \ .. @@ -313,7 +286,7 @@ popd %if 0%{with_python}
View file
debian.control
Changed
@@ -8,7 +8,7 @@ debhelper, dh-python, libcurl4-gnutls-dev, - libkolabxml-dev (>= 1.0), + libkolabxml-dev (>= 1.3), libossp-uuid-dev, qtbase5-dev, libkf5coreaddons-dev, @@ -26,7 +26,7 @@ python2-dev | python-dev, python-minimal | python2-minimal, python3-all-dev, - swig (>= 2.0) + swig4.0 (>= 4.1) X-Python-Version: >= 2.7 Standards-Version: 3.9.3 Homepage: http://git.kolab.org/libkolab
View file
debian.rules
Changed
@@ -5,7 +5,7 @@ PHPEXT := $(shell php-config --extension-dir) PHPINC := $(shell php-config --include-dir) -PHP_VERSIONS=7.4 7.3 7.2 7.1 7.0 5.6 +PHP_VERSIONS=8.1 8.0 7.4 7.3 7.2 export DH_VERBOSE=1 export DH_OPTIONS=-v @@ -34,7 +34,6 @@ sed -i -e "/Files:/ i\ plesk-php$${shver}-kolab deb web extra" debian/control ; \ echo "opt/plesk/php/$${version}/lib/php/modules/*.so" >> debian/plesk-php$${shver}-kolab.install ; \ - echo "opt/plesk/php/$${version}/share/php/kolab.php" >> debian/plesk-php$${shver}-kolab.install ; \ echo "debian/kolab.ini opt/plesk/php/$${version}/etc/php.d" > debian/plesk-php$${shver}-kolab.install ; \ done ; \ fi @@ -122,25 +121,22 @@ # Install the PHP modules manually, because they depend on PHP the API version, # which has to be determined dynamically, so we can't put it into an .install file. mkdir -p debian/tmp/usr/share/php - make -C php-vanilla install DESTDIR=$(PWD)/debian/tmp/ ; \ - mv debian/tmp/$(PHPEXT)/*.php debian/tmp/usr/share/php/ || exit 1. + make -C php-vanilla install DESTDIR=$(PWD)/debian/tmp/ echo "$(PHPEXT)" >> debian/php-kolab.install # Put kolab.ini into place - if -d "/etc/php/7.4/mods-available" ; then \ + if -d "/etc/php/8.1/mods-available" ; then \ + echo "debian/kolab.ini etc/php/8.1/mods-available" >> debian/php-kolab.install ; \ + elif -d "/etc/php/8.0/mods-available" ; then \ + echo "debian/kolab.ini etc/php/8.0/mods-available" >> debian/php-kolab.install ; \ + elif -d "/etc/php/7.4/mods-available" ; then \ echo "debian/kolab.ini etc/php/7.4/mods-available" >> debian/php-kolab.install ; \ elif -d "/etc/php/7.3/mods-available" ; then \ echo "debian/kolab.ini etc/php/7.3/mods-available" >> debian/php-kolab.install ; \ elif -d "/etc/php/7.2/mods-available" ; then \ echo "debian/kolab.ini etc/php/7.2/mods-available" >> debian/php-kolab.install ; \ - elif -d "/etc/php/7.1/mods-available" ; then \ - echo "debian/kolab.ini etc/php/7.1/mods-available" >> debian/php-kolab.install ; \ - elif -d "/etc/php/7.0/mods-available" ; then \ - echo "debian/kolab.ini etc/php/7.0/mods-available" >> debian/php-kolab.install ; \ - elif -d "/etc/php/mods-available" ; then \ - echo "debian/kolab.ini etc/php/mods-available" >> debian/php-kolab.install ; \ else \ - echo "debian/kolab.ini etc/php5/mods-available" >> debian/php-kolab.install ; \ + echo "debian/kolab.ini etc/php/mods-available" >> debian/php-kolab.install ; \ fi for i in debian/tmp/usr/lib/python*/dist-packages/kolab ; do \ @@ -162,8 +158,6 @@ mkdir -p debian/plesk-php$${shver}-kolab/opt/plesk/php/$${version}/etc/php.d/ ; \ mkdir -p debian/plesk-php$${shver}-kolab/opt/plesk/php/$${version}/share/php/ ; \ cp -a debian/kolab.ini debian/plesk-php$${shver}-kolab/opt/plesk/php/$${version}/etc/php.d/ ; \ - mv debian/plesk-php$${shver}-kolab$$(/opt/plesk/php/$${version}/bin/php-config --extension-dir)/kolab*.php \ - debian/plesk-php$${shver}-kolab/opt/plesk/php/$${version}/share/php/. || exit 1; \ rm -rf debian/plesk-php$${shver}-kolab/usr/ ; \ done ; \ fi
View file
debian.tar.gz/php-kolab-kde.install
Changed
@@ -1,3 +1,2 @@ /usr/share/php5/kolab/kolab.ini usr/share/php5/kolab/ usr/lib/php5/*/*.so -usr/share/php/kolab*.php
View file
debian.tar.gz/php-kolab.install
Changed
@@ -1,2 +1,1 @@ usr/lib/php*/*/*.so -usr/share/php/*.php
View file
libkolab-3.0.2.tar.gz/CMakeLists.txt -> libkolab-3.1.0.tar.gz/CMakeLists.txt
Changed
@@ -30,9 +30,9 @@ # 0.1.1 (patch release for 0.1.0) # 0.2 (0.2 development version towards 0.2.0) set(Libkolab_VERSION_MAJOR 3) -set(Libkolab_VERSION_MINOR 0) +set(Libkolab_VERSION_MINOR 1) # Enable the full x.y.z version only for release versions -set(Libkolab_VERSION_PATCH 2) +set(Libkolab_VERSION_PATCH 0) #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})
View file
libkolab-3.0.2.tar.gz/cmake/modules/SWIGUtils.cmake -> libkolab-3.1.0.tar.gz/cmake/modules/SWIGUtils.cmake
Changed
@@ -3,7 +3,7 @@ macro (generatePHPBindings MODULE_NAME INTERFACE_FILE) set(KOLAB_SWIG_PHP_SOURCE_FILE php_${MODULE_NAME}_wrapper.cpp) - add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${KOLAB_SWIG_PHP_SOURCE_FILE} ${CMAKE_CURRENT_BINARY_DIR}/${MODULE_NAME}.php + add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${KOLAB_SWIG_PHP_SOURCE_FILE} COMMAND ${SWIG} -v -c++ -php -I${Libkolabxml_INCLUDES} -module ${MODULE_NAME} -o ${CMAKE_CURRENT_BINARY_DIR}/${KOLAB_SWIG_PHP_SOURCE_FILE} ${INTERFACE_FILE} COMMENT "Generating php bindings" WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} @@ -67,11 +67,6 @@ # configure_file(test.php ${CMAKE_CURRENT_BINARY_DIR} COPYONLY) install(TARGETS ${MODULE_NAME}_phpbindings LIBRARY DESTINATION ${PHP_INSTALL_DIR}) - install(FILES - ${CMAKE_CURRENT_BINARY_DIR}/${MODULE_NAME}.php - DESTINATION ${PHP_INSTALL_DIR} - ) - else() message(WARNING "not building php bindings because php was not found") endif()
View file
libkolab.dsc
Changed
@@ -34,7 +34,7 @@ python2-dev | python-dev, python-minimal | python2-minimal, python3-all-dev, - swig (>= 2.0) + swig4.0 (>= 4.1) Package-List: libkolab-dev deb libdevel optional libkolab2 deb libs optional
Locations
Projects
Search
Status Monitor
Help
Open Build Service
OBS Manuals
API Documentation
OBS Portal
Reporting a Bug
Contact
Mailing List
Forums
Chat (IRC)
Twitter
Open Build Service (OBS)
is an
openSUSE project
.