Changes - j0ke.net Open Build Service

[-] [+]	Changed	horde-webmail.spec
@@ -7,6 +7,10 @@ %define _pversion 1.2.4 Name: horde-webmail +%if 0%{?suse_version} > 1020 +BuildRequires: fdupes +%endif + %if 0%{?suse_version} >= 1010 \|\| 0%{?sles_version} >= 10 %define _phpdir php5 %define _apxs /usr/sbin/apxs2 @@ -41,6 +45,7 @@ Patch3: horde-webmail-php5_exec.patch Patch4: horde-imp-php5_exec.patch Patch5: horde-kronolith-php5_exec.patch +Patch6: horde-kronolith-php5_exec2.patch URL: http://www.horde.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch @@ -64,6 +69,7 @@ %patch3 %patch4 %patch5 +%patch6 %build : if the following command fails, then apache dependencies are not met @@ -77,8 +83,13 @@ cd %{buildroot}%{apache_horde} %__rm -rf docs po COPYING README README* %__install -d %{buildroot}/var/log/horde +sed -i 's#@PHP-BIN@#/usr/bin/php5#' %{buildroot}%{apache_horde}/pear/pear-dh-ini2xml # remove .orig files from patches find %{buildroot}%{apache_horde} -name \*.orig -exec rm {} \; +%if 0%{?suse_version} > 1020 +# create symlinks for man pages +%fdupes $RPM_BUILD_ROOT/%{apache_horde} +%endif %clean %__rm -rf %{buildroot}