Request 2529 (accepted)

You're not reviewing the full diff of request 2529 , but the diff to the superseded request 2528 (Show full diff)

Overview

Request 2529 (accepted)

libkolabxml with bindings for Plesk-provided PHP versions

Created by vanmeeuwen over 5 years ago
In state accepted
Supersedes 2528

Submit libkolabxml

Submit package Kolab:Winterfell / libkolabxml to package Kolab:16 / libkolabxml

libkolabxml.spec Changed

@@ -150,12 +150,6 @@
 Requires:       libcurl-devel
 %if 0%{?with_php} > 0
 Requires:       php-devel >= 5.3
-%if 0%{plesk}
-Requires:       plesk-php56-devel
-Requires:       plesk-php70-devel
-Requires:       plesk-php71-devel
-Requires:       plesk-php72-devel
-%endif
 %endif
 %if 0%{?with_python} > 0
 %if 0%{?rhel} >= 8
@@ -237,56 +231,12 @@
 # package
 BuildRequires:  php >= 5.3
 BuildRequires:  php-devel >= 5.3
-%if 0%{?plesk}
-BuildRequires:  plesk-php56-devel
-BuildRequires:  plesk-php70-devel
-BuildRequires:  plesk-php71-devel
-BuildRequires:  plesk-php72-devel
-%endif
 
 %description -n php-kolabformat
 The PHP kolabformat package offers a comprehensible PHP library using the
 bindings provided through libkolabxml.
 %endif
 
-%if 0%{?plesk}
-%package -n plesk-php56-kolabformat
-Summary:        libkolabxml bindings for Plesk's PHP 5.6
-Group:          System Environment/Libraries
-Requires:       libkolabxml%{?_isa} = %{version}
-Requires:       plesk-php56
-
-%description -n plesk-php56-kolabformat
-libkolabxml bindings for Plesk's PHP 5.6
-
-%package -n plesk-php70-kolabformat
-Summary:        libkolabxml bindings for Plesk's PHP 7.0
-Group:          System Environment/Libraries
-Requires:       libkolabxml%{?_isa} = %{version}
-Requires:       plesk-php70
-
-%description -n plesk-php70-kolabformat
-libkolabxml bindings for Plesk's PHP 7.0
-
-%package -n plesk-php71-kolabformat
-Summary:        libkolabxml bindings for Plesk's PHP 7.1
-Group:          System Environment/Libraries
-Requires:       libkolabxml%{?_isa} = %{version}
-Requires:       plesk-php71
-
-%description -n plesk-php71-kolabformat
-libkolabxml bindings for Plesk's PHP 7.1
-
-%package -n plesk-php72-kolabformat
-Summary:        libkolabxml bindings for Plesk's PHP 7.2
-Group:          System Environment/Libraries
-Requires:       libkolabxml%{?_isa} = %{version}
-Requires:       plesk-php72
-
-%description -n plesk-php72-kolabformat
-libkolabxml bindings for Plesk's PHP 7.2
-%endif # if 0%{?plesk}
-
 %if 0%{?with_python} > 0
 %package -n python-kolabformat
 Summary:        Python bindings for libkolabxml
@@ -308,44 +258,19 @@
 %endif
 
 %prep
-%setup -q -c -n libkolabxml-%{version}
-pwd
-ls -l
+%setup -q -n libkolabxml-%{version}
 
 %if 0%{?with_at}
 %patch1002 -p1
 %endif
 
-%if 0%{?plesk}
-cp -a libkolabxml-%{version} libkolabxml-%{version}-5.6
-
-cp -a libkolabxml-%{version} libkolabxml-%{version}-7.0
-sed -i "s/-php/-php7/g" libkolabxml-%{version}-7.0/src/php/CMakeLists.txt
-
-cp -a libkolabxml-%{version} libkolabxml-%{version}-7.1
-sed -i "s/-php/-php7/g" libkolabxml-%{version}-7.1/src/php/CMakeLists.txt
-
-cp -a libkolabxml-%{version} libkolabxml-%{version}-7.2
-sed -i "s/-php/-php7/g" libkolabxml-%{version}-7.2/src/php/CMakeLists.txt
-%endif
-
 %if 0%{?with_php7}
 sed -i "s/-php/-php7/g" src/php/CMakeLists.txt
 %endif
 
 %build
-pushd %{name}-%{version}
 python utils/zonetabconversion.py
-popd
 
-%if 0%{?plesk}
-cp %{name}-%{version}/tztable.h %{name}-%{version}-5.6/.
-cp %{name}-%{version}/tztable.h %{name}-%{version}-7.0/.
-cp %{name}-%{version}/tztable.h %{name}-%{version}-7.1/.
-cp %{name}-%{version}/tztable.h %{name}-%{version}-7.2/.
-%endif
-
-pushd %{name}-%{version}
 rm -rf build
 mkdir -p build
 pushd build
@@ -369,13 +294,18 @@
     %{?_cmake_lib_suffix64} \
 %endif
     -DBUILD_SHARED_LIBS:BOOL=ON \
-%else # if 0${?suse_version}
+%else
 %cmake \
 %endif
     -DBoost_NO_BOOST_CMAKE=TRUE \
     -Wno-fatal-errors -Wno-errors \
     -DCMAKE_SKIP_RPATH=ON \
     -DCMAKE_PREFIX_PATH=%{_libdir} \
+%if 0%{?rhel} < 6 && 0%{?fedora} < 15
+    -DBOOST_LIBRARYDIR=%{_libdir}/boost141 \
+    -DBOOST_INCLUDEDIR=%{_includedir}/boost141 \
+    -DBoost_ADDITIONAL_VERSIONS="1.41;1.41.0" \
+%endif
 %if 0%{?rhel} >= 8 || 0%{?fedora}
     -DQT5_BUILD=ON \
 %endif
@@ -400,39 +330,9 @@
     ..
 make
 popd
-popd
-
-%if 0%{?plesk}
-for version in 5.6 7.0 7.1 7.2; do
-    pushd %{name}-%{version}-${version}
-    rm -rf build
-    mkdir -p build
-    pushd build
-    %cmake \
-        -DBoost_NO_BOOST_CMAKE=TRUE \
-        -Wno-fatal-errors -Wno-errors \
-        -DCMAKE_SKIP_RPATH=ON \
-        -DCMAKE_PREFIX_PATH=%{_libdir} \
-%if 0%{?rhel} >= 8 || 0%{?fedora}
-        -DQT5_BUILD=ON \
-%endif
-        -DINCLUDE_INSTALL_DIR=%{_includedir} \
-%if 0%{?with_php} > 0
-        -DPHP_BINDINGS=ON \
-        -DPHP_INCLUDE_DIR=/opt/plesk/php/${version}/include/php/ \
-        -DPHP_EXECUTABLE=/opt/plesk/php/${version}/bin/php \
-        -DPHP_INSTALL_DIR=/opt/plesk/php/${version}/lib64/php/modules/ \
-%endif
-        ..
-    make
-    popd
-    popd
-done
-%endif
 
 %install
 rm -rf %{buildroot}
-pushd %{name}-%{version}
 pushd build
 make install DESTDIR=%{buildroot} INSTALL='install -p'
 popd
@@ -446,33 +346,9 @@
 extension=kolabformat.so
 EOF
 %endif
-popd
-
-%if 0%{?plesk}
-for version in 5.6 7.0 7.1 7.2; do
-    pushd %{name}-%{version}-${version}
-    pushd build
-    make install DESTDIR=%{buildroot} INSTALL='install -p'
-    popd
-
-    mkdir -p \
-        %{buildroot}/opt/plesk/php/${version}/share/php/ \
-        %{buildroot}/opt/plesk/php/${version}/etc/php.d/ \
-        %{buildroot}/opt/plesk/php/${version}/etc/php-fpm.d/
-
-    mv \
-        %{buildroot}/opt/plesk/php/${version}/lib64/php/modules/kolabformat.php \
-        %{buildroot}/opt/plesk/php/${version}/share/php/kolabformat.php
-
-    echo "extension=kolabformat.so" > %{buildroot}/opt/plesk/php/${version}/etc/php.d/kolabformat.ini
-    cp %{buildroot}/opt/plesk/php/${version}/etc/php.d/kolabformat.ini \
-        %{buildroot}/opt/plesk/php/${version}/etc/php-fpm.d/
-    popd
-done
-%endif
 
 %check
-pushd %{name}-%{version}/build
+pushd build
 # Make sure libkolabxml.so.* is found, otherwise the tests fail
 export LD_LIBRARY_PATH=$( pwd )/src/
 pushd tests
@@ -488,15 +364,6 @@
 %endif
 popd
 
-%if 0%{?plesk}
-for version in 5.6 7.0 7.1 7.2; do
-    pushd %{name}-%{version}-5.6/build/
-    export LD_LIBRARY_PATH=$( pwd )/src/
-    /opt/plesk/php/${version}/bin/php -d enable_dl=On -dextension=src/php/kolabformat.so src/php/test.php ||:
-    popd
-done
-%endif
-
 %clean
 rm -rf %{buildroot}
 
@@ -506,7 +373,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc %{name}-%{version}/DEVELOPMENT %{name}-%{version}/NEWS %{name}-%{version}/README
+%doc DEVELOPMENT NEWS README
 %{_libdir}/*.so.*
 
 %if 0%{?suse_version}
@@ -539,40 +406,8 @@
 %{_datadir}/%{php}/kolabformat.php
 %{php_extdir}/kolabformat.so
 %config(noreplace) %{php_inidir}/kolabformat.ini
-
-%if 0%{?plesk}
-%files -n plesk-php56-kolabformat
-%defattr(-,root,root,-)
-/opt/plesk/php/5.6/lib64/php/modules/kolabformat.so
-/opt/plesk/php/5.6/share/php/kolabformat.php
-/opt/plesk/php/5.6/etc/php.d/kolabformat.ini
-/opt/plesk/php/5.6/etc/php-fpm.d/kolabformat.ini
-
-%files -n plesk-php70-kolabformat
-%defattr(-,root,root,-)
-/opt/plesk/php/7.0/lib64/php/modules/kolabformat.so
-/opt/plesk/php/7.0/share/php/kolabformat.php
-/opt/plesk/php/7.0/etc/php.d/kolabformat.ini
-/opt/plesk/php/7.0/etc/php-fpm.d/kolabformat.ini
-
-%files -n plesk-php71-kolabformat
-%defattr(-,root,root,-)
-/opt/plesk/php/7.1/lib64/php/modules/kolabformat.so
-/opt/plesk/php/7.1/share/php/kolabformat.php
-/opt/plesk/php/7.1/etc/php.d/kolabformat.ini
-/opt/plesk/php/7.1/etc/php-fpm.d/kolabformat.ini
-
-%files -n plesk-php72-kolabformat
-%defattr(-,root,root,-)
-/opt/plesk/php/7.2/lib64/php/modules/kolabformat.so
-/opt/plesk/php/7.2/share/php/kolabformat.php
-/opt/plesk/php/7.2/etc/php.d/kolabformat.ini
-/opt/plesk/php/7.2/etc/php-fpm.d/kolabformat.ini
-
 %endif
 
-%endif # if 0%{?with_php}
-
 %if 0%{?with_python} > 0
 %files -n python-kolabformat
 %defattr(-,root,root,-)

Build Results
RPM Lint

Refresh

Comments for request 2529 0

Request History

vanmeeuwen created request over 5 years ago

libkolabxml with bindings for Plesk-provided PHP versions

vanmeeuwen accepted review over 5 years ago

vanmeeuwen approved review over 5 years ago

vanmeeuwen accepted request over 5 years ago