From 44cc5dc67cd878fe57f892a7b4824bf2b8e9c449 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 20 Jun 2014 12:59:25 +0200 Subject: [PATCH] - rebuild for https://fedoraproject.org/wiki/Changes/Php56 - add numerical prefix to extension configuration file - drop unneeded dependency on pecl - add provides php-lasso --- lasso.spec | 28 ++++++++++++++++++++++------ 1 file changed, 22 insertions(+), 6 deletions(-) diff --git a/lasso.spec b/lasso.spec index a3df27a..ad5ec5b 100644 --- a/lasso.spec +++ b/lasso.spec @@ -5,7 +5,11 @@ %global with_wsf 0 %if %{with_php} -%{!?__pecl: %{expand: %%global __pecl %{_bindir}/pecl}} +%if "%{php_version}" < "5.6" +%global ini_name %{name}.ini +%else +%global ini_name 40-%{name}.ini +%endif %endif Summary: Liberty Alliance Single Sign On @@ -76,10 +80,10 @@ Group: Development/Libraries BuildRequires: php-devel, expat-devel BuildRequires: python2 Requires: %{name}%{?_isa} = %{version}-%{release} -Requires(post): %{__pecl} -Requires(postun): %{__pecl} Requires: php(zend-abi) = %{php_zend_api} Requires: php(api) = %{php_core_api} +Provides: php-lasso = %{version}-%{release} +Provides: php-lasso%{?_isa} = %{version}-%{release} %description php PHP language bindings for the lasso (Liberty Alliance Single Sign On) library. @@ -119,7 +123,7 @@ library. %endif %if %{with_php} --enable-php5=yes \ - --with-php5-config-dir=%{_sysconfdir}/php.d \ + --with-php5-config-dir=%{php_inidir} \ %else --enable-php5=no \ %endif @@ -157,6 +161,12 @@ fi %if %{with_php} install -m 755 -d %{buildroot}%{_datadir}/php/%{name} mv %{buildroot}%{_datadir}/php/lasso.php %{buildroot}%{_datadir}/php/%{name} + +# rename the PHP config file when needed (PHP 5.6+) +if [ "%{name}.ini" != "%{ini_name}" ]; then + mv %{buildroot}%{php_inidir}/%{name}.ini \ + %{buildroot}%{php_inidir}/%{ini_name} +fi %endif # Remove bogus doc files @@ -192,8 +202,8 @@ rm -fr %{buildroot}%{_defaultdocdir}/%{name} %if %{with_php} %files php %defattr(-,root,root) -%attr(755,root,root) %{_libdir}/php/modules/lasso.so -%config(noreplace) %attr(644,root,root) %{_sysconfdir}/php.d/%{name}.ini +%attr(755,root,root) %{php_extdir}/lasso.so +%config(noreplace) %attr(644,root,root) %{php_inidir}/%{ini_name} %attr(755,root,root) %dir %{_datadir}/php/%{name} %attr(644,root,root) %{_datadir}/php/%{name}/lasso.php %endif @@ -206,6 +216,12 @@ rm -fr %{buildroot}%{_defaultdocdir}/%{name} %endif %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 +- drop unneeded dependency on pecl +- add provides php-lasso + * Sat Jun 07 2014 Fedora Release Engineering - 2.4.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild