diff --git a/zarafa.spec b/zarafa.spec index c1e13db..97dc8af 100644 --- a/zarafa.spec +++ b/zarafa.spec @@ -16,6 +16,11 @@ # RPM 4.9 %global __provides_exclude_from %{?__provides_exclude_from:%__provides_exclude_from|}%{_libdir}/%{name}/.*\\.so$ %global __provides_exclude_from %{__provides_exclude_from}|%{_libdir}/php/modules/.*\\.so$ +%if "%{php_version}" < "5.6" +%global ini_name %{name}.ini +%else +%global ini_name 40-%{name}.ini +%endif Summary: Open Source Edition of the Zarafa Collaboration Platform Name: zarafa @@ -23,7 +28,7 @@ Version: 7.1.9 %if %{beta_or_rc} Release: 0.%{actual_release}.svn%{svnrevision}%{?dist}.1 %else -Release: %{actual_release}%{?dist}.1 +Release: %{actual_release}%{?dist}.2 %endif # Red Hat Legal has been advised by email from Zarafa that no license is # required in order to use the letter string "zarafa" (combined with other @@ -518,8 +523,15 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}-webaccess/client/widgets/swfupload/ # Remove files only required by proprietary web services rm -rf $RPM_BUILD_ROOT{%{_sysconfdir}/%{name}/ws.cfg,%{_datadir}/zarafa/timezones} +# rename the PHP config file when needed (PHP 5.6+) +if [ "%{name}.ini" != "%{ini_name}" ]; then + mv %{buildroot}%{_sysconfdir}/php.d/%{name}.ini \ + %{buildroot}%{_sysconfdir}/php.d/%{ini_name} +fi + %find_lang %{name} + %clean rm -rf $RPM_BUILD_ROOT @@ -877,7 +889,7 @@ fi %files -n php-mapi %defattr(-,root,root,-) -%config(noreplace) %{_sysconfdir}/php.d/%{name}.ini +%config(noreplace) %{_sysconfdir}/php.d/%{ini_name} %{_datadir}/php/mapi/ %{_libdir}/php/modules/mapi.so @@ -886,6 +898,10 @@ fi %{python_sitearch}/* %changelog +* Fri Jun 20 2014 Remi Collet - 7.1.9-2.1 +- rebuild for https://fedoraproject.org/wiki/Changes/Php56 +- add numerical prefix to extension configuration file + * Sat Jun 07 2014 Fedora Release Engineering - 7.1.9-2.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild