rpms/php-extras/FC-4 php-extras-4.3.11-readline.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 php-extras.spec, 1.1, 1.2 sources, 1.2, 1.3 php-extras-5.1.2-readline.patch, 1.1, NONE
Dmitry Butskoy (buc)
fedora-extras-commits at redhat.com
Thu Mar 30 10:19:21 UTC 2006
Author: buc
Update of /cvs/extras/rpms/php-extras/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28377
Modified Files:
.cvsignore php-extras.spec sources
Added Files:
php-extras-4.3.11-readline.patch
Removed Files:
php-extras-5.1.2-readline.patch
Log Message:
php-extras-4.3.11-readline.patch:
--- NEW FILE php-extras-4.3.11-readline.patch ---
diff -Nrbu php-4.3.11/ext/readline/config.m4 php-4.3.11-OK/ext/readline/config.m4
--- php-4.3.11/ext/readline/config.m4 2003-10-01 06:54:04.000000000 +0400
+++ php-4.3.11-OK/ext/readline/config.m4 2005-10-17 19:25:13.000000000 +0400
@@ -22,10 +22,12 @@
AC_CHECK_LIB(ncurses, tgetent,
[
PHP_ADD_LIBRARY(ncurses,,READLINE_SHARED_LIBADD)
+ PHP_ADD_LIBRARY(ncurses,,LIBS)
],[
AC_CHECK_LIB(termcap, tgetent,
[
PHP_ADD_LIBRARY(termcap,,READLINE_SHARED_LIBADD)
+ PHP_ADD_LIBRARY(termcap,,LIBS)
])
])
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-extras/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 25 Mar 2006 18:13:47 -0000 1.2
+++ .cvsignore 30 Mar 2006 10:19:21 -0000 1.3
@@ -1 +1 @@
-php-5.1.2.tar.gz
+php-5.0.4.tar.gz
Index: php-extras.spec
===================================================================
RCS file: /cvs/extras/rpms/php-extras/FC-4/php-extras.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- php-extras.spec 25 Mar 2006 18:13:47 -0000 1.1
+++ php-extras.spec 30 Mar 2006 10:19:21 -0000 1.2
@@ -1,28 +1,29 @@
-# FC5: dbase, readline, recode, mcrypt, mhash, tidy, mssql
+# FC4: dbase, fam, readline, recode, mcrypt, mhash, sqlite, tidy, mssql
%define def() %%{!?_without_default:%%{!?_without_%1: %%global _with_%1 --with-%1}}
%{expand:%def dbase}
+# fam
%{expand:%def readline}
# recode
%{expand:%def mcrypt}
%{expand:%def mhash}
+# sqlite
%{expand:%def tidy}
# mssql
-%define list %{?_with_dbase:dbase} %{?_with_readline:readline} %{?_with_recode:recode} %{?_with_mcrypt:mcrypt} %{?_with_mhash:mhash} %{?_with_tidy:tidy} %{?_with_mssql:mssql}
+%define list %{?_with_dbase:dbase} %{?_with_fam:fam} %{?_with_readline:readline} %{?_with_recode:recode} %{?_with_mcrypt:mcrypt} %{?_with_mhash:mhash} %{?_with_sqlite:sqlite} %{?_with_tidy:tidy} %{?_with_mssql:mssql}
%define extdir %(php-config --extension-dir)
-%define apiver %(echo PHP_API_VERSION | %{__cc} -E --include=php.h `php-config --includes` - | tail -1)
Name: php-extras
Summary: Additional PHP modules from the standard PHP distribution
#Version: %(php-config --version)
-Version: 5.1.2
-Release: 2%{?dist}
+Version: 5.0.4
+Release: 3%{?dist}
Group: Development/Languages
License: The PHP License
URL: http://www.php.net/
@@ -30,7 +31,8 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: php-devel = %{version}
-Patch1: php-extras-5.1.2-readline.patch
+Requires: php = %{version}
+Patch1: php-extras-4.3.11-readline.patch
%description
@@ -43,16 +45,26 @@
%package -n php-dbase
Summary: Standard dBase module for PHP applications
Group: Development/Languages
-Requires: php >= %{version}, php-api = %{apiver}
+Requires: php = %{version}
%description -n php-dbase
Standard dBase module for PHP applications
+%package -n php-fam
+Summary: Standard PHP module provides FAM support
+Group: Development/Languages
+Requires: php = %{version}
+%{?_with_fam:BuildRequires: gamin-devel}
+
+%description -n php-fam
+Standard PHP module provides FAM support
+
+
%package -n php-readline
Summary: Standard PHP module provides readline library support
Group: Development/Languages
-Requires: php >= %{version}, php-api = %{apiver}
+Requires: php = %{version}
%{?_with_readline:BuildRequires: readline-devel}
%description -n php-readline
@@ -62,7 +74,7 @@
%package -n php-recode
Summary: Standard PHP module provides GNU recode support
Group: Development/Languages
-Requires: php >= %{version}, php-api = %{apiver}
+Requires: php = %{version}
%{?_with_recode:BuildRequires: recode-devel}
%description -n php-recode
@@ -72,7 +84,7 @@
%package -n php-mcrypt
Summary: Standard PHP module provides mcrypt library support
Group: Development/Languages
-Requires: php >= %{version}, php-api = %{apiver}
+Requires: php = %{version}
%{?_with_mcrypt:BuildRequires: libmcrypt-devel}
%description -n php-mcrypt
@@ -82,17 +94,27 @@
%package -n php-mhash
Summary: Standard PHP module provides mhash support
Group: Development/Languages
-Requires: php >= %{version}, php-api = %{apiver}
+Requires: php = %{version}
%{?_with_mhash:BuildRequires: mhash-devel}
%description -n php-mhash
Standard PHP module provides mhash support
+%package -n php-sqlite
+Summary: Standard PHP module provides sqlite support
+Group: Development/Languages
+Requires: php = %{version}
+#%%{?_with_sqlite:BuildRequires: sqlite-devel}
+
+%description -n php-sqlite
+Standard PHP module provides sqlite support
+
+
%package -n php-tidy
Summary: Standard PHP module provides tidy library support
Group: Development/Languages
-Requires: php >= %{version}, php-api = %{apiver}
+Requires: php = %{version}
%{?_with_tidy:BuildRequires: libtidy-devel}
%description -n php-tidy
@@ -102,7 +124,7 @@
%package -n php-mssql
Summary: Standard PHP module provides mssql support
Group: Development/Languages
-Requires: php >= %{version}, php-api = %{apiver}
+Requires: php = %{version}
%{?_with_mssql:BuildRequires: freetds-devel}
%description -n php-mssql
@@ -130,7 +152,7 @@
# cause libtool to avoid passing -rpath when linking
# (this hack is well-known as "libtool rpath workaround")
sed -i 's|^hardcode_libdir_flag_spec|hardcode_libdir_flag_spec=" -D__LIBTOOL_IS_A_FOOL__ "|' libtool
-
+
make %{?_smp_mflags}
popd
@@ -241,29 +263,26 @@
#%%files
%define fil() %%{?_with_%1:%%files -n php-%1 -f files.%1}
%{expand:%fil dbase}
+%{expand:%fil fam}
%{expand:%fil readline}
%{expand:%fil recode}
%{expand:%fil mcrypt}
%{expand:%fil mhash}
+%{expand:%fil sqlite}
%{expand:%fil tidy}
%{expand:%fil mssql}
%changelog
-* Wed Mar 1 2006 Dmitry Butskoy <Dmitry at Butskoy.name> - 5.1.2-2
-- more accurate Requires for the main php
- (using php-api, provided now by the Core php package).
-
-* Tue Feb 28 2006 Dmitry Butskoy <Dmitry at Butskoy.name> - 5.1.2-1
-- update to 5.1.2
-- replace readline patch (old issue go away and a new appears).
+* Tue Feb 28 2006 Dmitry Butskoy <Dmitry at Butskoy.name> - 5.0.4-3
- apply well-known "libtool-rpath-workaround" (see in Internet ;-))
to avoid use -rpath for linking
-* Sat Dec 17 2005 Dmitry Butskoy <Dmitry at Butskoy.name> - 5.1.1-1
-- upgrade to 5.1.1 for FC5
-- drop now missed "fam" and obsolete "sqlite" (sqlite2) modules
+* Sat Dec 17 2005 Dmitry Butskoy <Dmitry at Butskoy.name> - 5.0.4-2
+- don't build "fam" and "sqlite" by default.
+ ("fam" will disappear in php >= 5.1, bundled "sqlite" is sqlite 2.x,
+ but php >= 5.1 use system's sqlite >= 3.0.0)
* Mon Nov 14 2005 Dmitry Butskoy <Dmitry at Butskoy.name> - 5.0.4-1
- spec file cleanups
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-extras/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 25 Mar 2006 18:13:47 -0000 1.2
+++ sources 30 Mar 2006 10:19:21 -0000 1.3
@@ -1 +1 @@
-b5b6564e8c6a0d5bc1d2b4787480d792 php-5.1.2.tar.gz
+8edf259bcfab4cfc890a4bb4e7c3649f php-5.0.4.tar.gz
--- php-extras-5.1.2-readline.patch DELETED ---
More information about the fedora-extras-commits
mailing list