From 24bb619f0958e5788d9141705c71ca978c05a060 Mon Sep 17 00:00:00 2001 From: Ralf Becker <ralfbecker@outdoor-training.de> Date: Tue, 11 Aug 2015 15:17:15 +0000 Subject: [PATCH] fix requirements for SLES 12, not setting sles_version, but suse_version 1315, in obs and having a broken php5-tidy package --- doc/rpm-build/egroupware-epl.spec | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/doc/rpm-build/egroupware-epl.spec b/doc/rpm-build/egroupware-epl.spec index e5ad4a4777..f5942b12fb 100644 --- a/doc/rpm-build/egroupware-epl.spec +++ b/doc/rpm-build/egroupware-epl.spec @@ -1,5 +1,5 @@ Name: egroupware-epl -Version: 14.3.20150728 +Version: 14.3.20150811 Release: Summary: EGroupware is a web-based groupware suite written in php Group: Web/Database @@ -33,11 +33,15 @@ Prefix: /usr/share %define distribution SUSE Linux %{?suse_version} %if 0%{?sles_version} - # sle 10 and 11 does NOT contain libtidy - %define extra_requires apache2 mod_php_any php_any_db php-dom php-bz2 php-openssl php-zip php-ctype php-sqlite %{php}-xml %{php}-xmlreader %{php}-xmlwriter %{php}-dom - + # sles 10, 11 does NOT contain libtidy, 11sp3 does not contain php5-posix + %define extra_requires apache2 apache2-mod_php5 php_any_db %{php}-dom %{php}-bz2 %{php}-openssl %{php}-zip %{php}-ctype %{php}-sqlite %{php}-xml %{php}-xmlreader %{php}-xmlwriter %{php}-dom %else - %define extra_requires apache2 apache2-mod_php5 php_any_db php5-dom php5-bz2 php5-openssl php5-zip php5-ctype php5-sqlite php5-tidy %{php}-xml %{php}-xmlreader %{php}-xmlwriter %{php}-dom + # SLES 12 no longer sets sles_version, but suse_version == 1315: does contain broken php5-tidy, because no libtidy + %if 0%{?suse_version} == 1315 + %define extra_requires apache2 apache2-mod_php5 php_any_db %{php}-dom %{php}-bz2 %{php}-openssl %{php}-zip %{php}-ctype %{php}-sqlite %{php}-xml %{php}-xmlreader %{php}-xmlwriter %{php}-dom %{php}-posix + %else + %define extra_requires apache2 apache2-mod_php5 php_any_db %{php}-dom %{php}-bz2 %{php}-openssl %{php}-zip %{php}-ctype %{php}-sqlite %{php}-xml %{php}-xmlreader %{php}-xmlwriter %{php}-dom %{php}-posix %{php}-tidy + %endif %endif %define cron cron @@ -56,12 +60,12 @@ Prefix: /usr/share %if 0%{?fedora_version} %define osversion %{?fedora_version} %define distribution Fedora Core %{?fedora_version} - %define extra_requires httpd php-mysql php-xml php-tidy + %define extra_requires httpd php-mysql php-xml php-tidy php-posix %endif %if 0%{?mandriva_version} %define osversion %{?mandriva_version} %define distribution Mandriva %{?mandriva_version} - %define extra_requires apache php-mysql php-dom php-pdo_mysql php-pdo_sqlite php-tidy + %define extra_requires apache php-mysql php-dom php-pdo_mysql php-pdo_sqlite php-tidy php-posix # try to keep build from searching (for wrong) dependencys %undefine __find_provides %undefine __find_requires @@ -69,12 +73,12 @@ Prefix: /usr/share %if 0%{?rhel_version} %define osversion %{?rhel_version} %define distribution Red Hat %{?rhel_version} - %define extra_requires httpd php-mysql php-xml php-tidy + %define extra_requires httpd php-mysql php-xml php-tidy php-posix %endif %if 0%{?centos_version} %define osversion %{?centos_version} %define distribution CentOS %{?centos_version} - %define extra_requires httpd php-mysql php-xml php-tidy + %define extra_requires httpd php-mysql php-xml php-tidy php-posix %endif Distribution: %{distribution} @@ -205,7 +209,7 @@ Further contributed applications are available as separate packages. Summary: The EGroupware core Group: Web/Database Requires: %{php} >= 5.3.2 -Requires: %{php}-mbstring %{php}-gd %{php}-mcrypt %{php}-posix %{extra_requires} %{cron} zip %{php}-json %{php}-xsl +Requires: %{php}-mbstring %{php}-gd %{php}-mcrypt %{extra_requires} %{cron} zip %{php}-json %{php}-xsl Provides: egw-core %{version} Provides: egw-etemplate %{version} Provides: egw-addressbook %{version}