summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2014-12-23 13:28:59 +0100
committerRemi Collet <fedora@famillecollet.com>2014-12-23 13:28:59 +0100
commit422079500c9771970a476b9c1ab5a86ecece6bd1 (patch)
tree65301b3f4a3659b590966faf801841b926fdafe7
parenta7eac385a1915d0c680e35ae6e84252c61ae1aae (diff)
php54-php: add back tokyocabinet support from dba (EL-5)
-rw-r--r--php54.spec11
1 files changed, 4 insertions, 7 deletions
diff --git a/php54.spec b/php54.spec
index c02698e..60a4ac8 100644
--- a/php54.spec
+++ b/php54.spec
@@ -82,7 +82,7 @@
Summary: PHP scripting language for creating dynamic web sites
Name: php
Version: 5.4.36
-Release: 1%{?dist}
+Release: 1%{?dist}.1
# All files licensed under PHP version 3.01, except
# Zend is licensed under Zend
# TSRM is licensed under BSD
@@ -673,9 +673,7 @@ Group: Development/Languages
# All files licensed under PHP version 3.01
License: PHP
BuildRequires: %{db_devel}, gdbm-devel
-%if 0%{?rhel} != 5
BuildRequires: tokyocabinet-devel
-%endif
Requires: php-common%{?_isa} = %{version}-%{release}
Obsoletes: php53-dba, php53u-dba, php54-dba, php54w-dba
@@ -1046,9 +1044,7 @@ build --libdir=%{_libdir}/php \
--enable-bcmath=shared \
--enable-dba=shared --with-db4=%{_prefix} \
--with-gdbm=%{_prefix} \
-%if 0%{?rhel} != 5
--with-tcadb=%{_prefix} \
-%endif
--with-xmlrpc=shared \
--with-ldap=shared --with-ldap-sasl \
--enable-mysqlnd=shared \
@@ -1170,9 +1166,7 @@ build --includedir=%{_includedir}/php-zts \
--enable-bcmath=shared \
--enable-dba=shared --with-db4=%{_prefix} \
--with-gdbm=%{_prefix} \
-%if 0%{?rhel} != 5
--with-tcadb=%{_prefix} \
-%endif
--with-xmlrpc=shared \
--with-ldap=shared --with-ldap-sasl \
--enable-mysqlnd=shared \
@@ -1705,6 +1699,9 @@ fi
%changelog
+* Tue Dec 23 2014 Remi Collet <remi@fedoraproject.org> 5.4.36-1.1
+- add back tokyocabinet support from dba (EL-5)
+
* Fri Dec 19 2014 Remi Collet <remi@fedoraproject.org> 5.4.36-1
- Update to 5.4.36
http://www.php.net/releases/5_4_36.php