rpms/php-extras/EL-4 php-extras-4.3.11-readline.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 php-extras.spec, 1.10, 1.11 sources, 1.6, 1.7
Dmitry Butskoy (buc)
fedora-extras-commits at redhat.com
Mon Jun 16 15:57:05 UTC 2008
Author: buc
Update of /cvs/extras/rpms/php-extras/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23946
Modified Files:
.cvsignore php-extras.spec sources
Added Files:
php-extras-4.3.11-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/EL-4/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore 19 Feb 2007 12:25:15 -0000 1.6
+++ .cvsignore 16 Jun 2008 15:56:04 -0000 1.7
@@ -1 +1 @@
-php-5.2.1.tar.gz
+php-4.3.9.tar.gz
Index: php-extras.spec
===================================================================
RCS file: /cvs/extras/rpms/php-extras/EL-4/php-extras.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- php-extras.spec 19 Feb 2007 12:25:15 -0000 1.10
+++ php-extras.spec 16 Jun 2008 15:56:04 -0000 1.11
@@ -1,26 +1,28 @@
-# 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
+%{expand:%def mssql}
-%define list %{?_with_dbase:dbase} %{?_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}
-%global extdir %(php-config --extension-dir 2>/dev/null || echo "undefined")
-%global apiver %((echo 0; php -i 2>/dev/null | sed -n 's/^PHP API => //p') | tail -1)
+%define extdir %(php-config --extension-dir)
Name: php-extras
Summary: Additional PHP modules from the standard PHP distribution
-#Version: %(php-config --version 2>/dev/null || echo 0)
-Version: 5.2.1
+#Version: %(php-config --version)
+Version: 4.3.9
Release: 1%{?dist}
Group: Development/Languages
License: The PHP License
@@ -29,6 +31,8 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: php-devel = %{version}
+Requires: php = %{version}
+Patch1: php-extras-4.3.11-readline.patch
%description
@@ -41,16 +45,36 @@
%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}
+%{?_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
-Requires: php >= %{version}, php-api = %{apiver}
+Requires: php = %{version}
%{?_with_recode:BuildRequires: recode-devel}
%description -n php-recode
@@ -60,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
@@ -70,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
@@ -90,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
@@ -100,11 +134,12 @@
%prep
%setup -q -n php-%{version}
+%patch1 -p1
%build
-export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -Wno-pointer-sign"
+export CFLAGS="$RPM_OPT_FLAGS -Wall -fno-strict-aliasing"
for mod in %{list}
@@ -117,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
@@ -228,66 +263,21 @@
#%%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
-* Mon Feb 19 2007 Dmitry Butskoy <Dmitry at Butskoy.name> - 5.2.1-1
-- update to 5.2.1
-
-* Thu Feb 1 2007 Dmitry Butskoy <Dmitry at Butskoy.name> - 5.2.0-1
-- upgrade to 5.2.0
-- drop readline support (now in the main php package)
-
-* Fri Sep 1 2006 Dmitry Butskoy <Dmitry at Butskoy.name> - 5.1.6-1
-- update to 5.1.6
-
-* Thu Jun 22 2006 Dmitry Butskoy <Dmitry at Butskoy.name> - 5.1.4-2
-- auto-detect extdir and apiver again (needed for x86_64)
-
-* Fri Jun 16 2006 Dmitry Butskoy <Dmitry at Butskoy.name> - 5.1.4-1
-- update to upstream php 5.1.4
-- an easier way to auto-detect php-api version
-- specify extdir and apiver explicitly, because FE build system
- is not able to auto-detect it now.
-
-* Fri Mar 31 2006 Dmitry Butskoy <Dmitry at Butskoy.name> - 5.1.2-3
-- ppc arch hack: change dir before %%apiver auto-detecting
-
-* Sat Mar 25 2006 Dmitry Butskoy <Dmitry at Butskoy.name> - 5.1.2-2
-- Accepted for Fedora Extras
- (review by Tom "spot" Callaway <tcallawa at redhat.com>)
-
-* 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).
-- 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
-
-* Mon Nov 14 2005 Dmitry Butskoy <Dmitry at Butskoy.name> - 5.0.4-1
-- spec file cleanups
-
-* Mon Oct 10 2005 Dmitry Butskoy <Dmitry at Butskoy.name> - 5.0.4-0
-- adaptation for php5
-- drop tests patch (no more needed).
-
-* Fri Oct 7 2005 Dmitry Butskoy <Dmitry at Butskoy.name> - 4.3.11-0
-- initial release
+* Mon Jun 16 2008 Dmitry Butskoy <Dmitry at Butskoy.name> - 4.3.9-1
+- initial release for EPEL4, derived from FC4 work
- create test stuff for check section. A lot of work because we play
with extra modules by our own way...
-- add patch to fix some pathes in tests
- add patch for readline configure
-
+- avoid using -rpath for linking
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-extras/EL-4/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources 19 Feb 2007 12:25:15 -0000 1.6
+++ sources 16 Jun 2008 15:56:04 -0000 1.7
@@ -1 +1 @@
-604eaee2b834bb037d2c83e53e300d3f php-5.2.1.tar.gz
+c685cb76bff996a4dff87097c43e6987 php-4.3.9.tar.gz
More information about the fedora-extras-commits
mailing list