From 68eba648864026f37c2e13dd02790e3e6ee070c5 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 19 Jun 2014 17:54:08 +0200 Subject: [PATCH] rebuild for https://fedoraproject.org/wiki/Changes/Php56 --- uuid.spec | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/uuid.spec b/uuid.spec index 8be3775..2bafb89 100644 --- a/uuid.spec +++ b/uuid.spec @@ -1,16 +1,22 @@ %define php_extdir %(php-config --extension-dir 2>/dev/null || echo %{_libdir}/php4) %global php_apiver %((echo 0; php -i 2>/dev/null | sed -n 's/^PHP API => //p') | tail -1) +%if 0%{?fedora} < 20 && 0%{?rhel} < 7 # Private libraries are not be exposed globally by RPM -# RPM 4.8 %{?filter_provides_in: %filter_provides_in %{php_extdir}/.*\.so$} %{?filter_setup} -# RPM 4.9 +%endif + %global __provides_exclude_from %{?__provides_exclude_from:%__provides_exclude_from|}%{php_extdir}/.*\\.so$ +%if "%{php_version}" < "5.6" +%global ini_name %{name}.ini +%else +%global ini_name 40-%{name}.ini +%endif Name: uuid Version: 1.6.2 -Release: 25%{?dist} +Release: 26%{?dist} Summary: Universally Unique Identifier library License: MIT Group: System Environment/Libraries @@ -186,7 +192,7 @@ popd # Put the php config bit into place %{__mkdir_p} %{buildroot}%{_sysconfdir}/php.d -%{__cat} << __EOF__ > %{buildroot}%{_sysconfdir}/php.d/%{name}.ini +%{__cat} << __EOF__ > %{buildroot}%{_sysconfdir}/php.d/%{ini_name} ; Enable %{name} extension module extension=%{name}.so __EOF__ @@ -259,7 +265,7 @@ rm -rf $RPM_BUILD_ROOT %files php %defattr(-,root,root,-) -%config(noreplace) %{_sysconfdir}/php.d/%{name}.ini +%config(noreplace) %{_sysconfdir}/php.d/%{ini_name} %{php_extdir}/%{name}.so %files dce @@ -272,6 +278,10 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libossp-uuid_dce.so %changelog +* Thu Jun 19 2014 Remi Collet - 1.6.2-26 +- rebuild for https://fedoraproject.org/wiki/Changes/Php56 +- add numerical prefix to PHP extension configuration file + * Sun Jun 08 2014 Fedora Release Engineering - 1.6.2-25 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild