[php-extras/el6/master] drop readline, it is in the main PHP already
Dmitry Butskoy
buc at fedoraproject.org
Wed Dec 22 15:09:03 UTC 2010
commit 9c58934ef06405250dee46172590593f899d9fe6
Author: Dmitry Butskoy <Dmitry at Butskoy.name>
Date: Wed Dec 22 18:08:34 2010 +0300
drop readline, it is in the main PHP already
php-extras-5.3.2-readline.patch | 20 --------------------
php-extras.spec | 18 +++---------------
2 files changed, 3 insertions(+), 35 deletions(-)
---
diff --git a/php-extras.spec b/php-extras.spec
index 695771c..b34c83b 100644
--- a/php-extras.spec
+++ b/php-extras.spec
@@ -1,15 +1,14 @@
-# EPEL6: readline, recode, mcrypt, tidy, mssql, interbase
+# EPEL6: recode, mcrypt, tidy, mssql, interbase
%define def() %%{!?_without_default:%%{!?_without_%1: %%global _with_%1 --with-%1}}
-%{expand:%def readline}
# recode
%{expand:%def mcrypt}
%{expand:%def tidy}
%{expand:%def mssql}
%{expand:%def interbase}
-%define list %{?_with_readline:readline} %{?_with_recode:recode} %{?_with_mcrypt:mcrypt} %{?_with_tidy:tidy} %{?_with_mssql:mssql pdo_dblib} %{?_with_interbase:interbase pdo_firebird}
+%define list %{?_with_recode:recode} %{?_with_mcrypt:mcrypt} %{?_with_tidy:tidy} %{?_with_mssql:mssql pdo_dblib} %{?_with_interbase:interbase pdo_firebird}
%define opts %{?_with_interbase:--with-interbase=%{_libdir}/firebird --with-pdo-firebird=%{_libdir}/firebird}
@@ -30,7 +29,7 @@ Source0: http://www.php.net/distributions/php-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: php-devel = %{version}
-Patch1: php-extras-5.3.2-readline.patch
+
%description
PHP is an HTML-embedded scripting language.
@@ -39,16 +38,6 @@ This package contains various additional modules for PHP, which
have not been included in the basic PHP package for Fedora Core.
-%package -n php-readline
-Summary: Standard PHP module provides readline library support
-Group: Development/Languages
-Requires: php >= %{version}, php-api = %{apiver}
-%{?_with_readline:BuildRequires: readline-devel}
-
-%description -n php-readline
-Standard PHP module provides readline library support
-
-
%package -n php-recode
Summary: Standard PHP module provides GNU recode support
Group: Development/Languages
@@ -238,7 +227,6 @@ rm -rf $RPM_BUILD_ROOT
#%%files
%define fil() %%{?_with_%1:%%files -n php-%1 -f files.%1}
-%{expand:%fil readline}
%{expand:%fil recode}
%{expand:%fil mcrypt}
%{expand:%fil tidy}
More information about the scm-commits
mailing list