rpms/php-extras/devel php-extras-5.1.2-readline.patch, NONE, 1.1 php-extras.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Dmitry Butskoy (buc)
fedora-extras-commits at redhat.com
Sat Mar 25 18:13:47 UTC 2006
Author: buc
Update of /cvs/extras/rpms/php-extras/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19329/devel
Modified Files:
.cvsignore sources
Added Files:
php-extras-5.1.2-readline.patch php-extras.spec
Log Message:
auto-import php-extras-5.1.2-2 on branch devel from php-extras-5.1.2-2.src.rpm
php-extras-5.1.2-readline.patch:
--- NEW FILE php-extras-5.1.2-readline.patch ---
diff -Nrbu php-5.1.2/ext/readline/config.m4 php-5.1.2-OK/ext/readline/config.m4
--- php-5.1.2/ext/readline/config.m4 2005-11-29 02:04:01.000000000 +0300
+++ php-5.1.2-OK/ext/readline/config.m4 2006-02-28 18:53:48.000000000 +0300
@@ -5,10 +5,8 @@
PHP_ARG_WITH(libedit,for libedit readline replacement,
[ --with-libedit[=DIR] Include libedit readline replacement (CLI/CGI only)])
-if test "$PHP_LIBEDIT" = "no"; then
PHP_ARG_WITH(readline,for readline support,
[ --with-readline[=DIR] Include readline support (CLI/CGI only)])
-fi
if test "$PHP_READLINE" && test "$PHP_READLINE" != "no"; then
for i in $PHP_READLINE /usr/local /usr; do
--- NEW FILE php-extras.spec ---
# FC5: dbase, readline, recode, mcrypt, mhash, tidy, mssql
%define def() %%{!?_without_default:%%{!?_without_%1: %%global _with_%1 --with-%1}}
%{expand:%def dbase}
%{expand:%def readline}
# recode
%{expand:%def mcrypt}
%{expand:%def mhash}
%{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 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}
Group: Development/Languages
License: The PHP License
URL: http://www.php.net/
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.1.2-readline.patch
%description
PHP is an HTML-embedded scripting language.
This package contains various additional modules for PHP, which
have not been included in the basic PHP package for Fedora Core.
%package -n php-dbase
Summary: Standard dBase module for PHP applications
Group: Development/Languages
Requires: php >= %{version}, php-api = %{apiver}
%description -n php-dbase
Standard dBase module for PHP applications
%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
Requires: php >= %{version}, php-api = %{apiver}
%{?_with_recode:BuildRequires: recode-devel}
%description -n php-recode
Standard PHP module provides GNU recode support
%package -n php-mcrypt
Summary: Standard PHP module provides mcrypt library support
Group: Development/Languages
Requires: php >= %{version}, php-api = %{apiver}
%{?_with_mcrypt:BuildRequires: libmcrypt-devel}
%description -n php-mcrypt
Standard PHP module provides mcrypt library support
%package -n php-mhash
Summary: Standard PHP module provides mhash support
Group: Development/Languages
Requires: php >= %{version}, php-api = %{apiver}
%{?_with_mhash:BuildRequires: mhash-devel}
%description -n php-mhash
Standard PHP module provides mhash support
%package -n php-tidy
Summary: Standard PHP module provides tidy library support
Group: Development/Languages
Requires: php >= %{version}, php-api = %{apiver}
%{?_with_tidy:BuildRequires: libtidy-devel}
%description -n php-tidy
Standard PHP module provides tidy library support
%package -n php-mssql
Summary: Standard PHP module provides mssql support
Group: Development/Languages
Requires: php >= %{version}, php-api = %{apiver}
%{?_with_mssql:BuildRequires: freetds-devel}
%description -n php-mssql
Standard PHP module provides mssql support
%prep
%setup -q -n php-%{version}
%patch1 -p1
%build
export CFLAGS="$RPM_OPT_FLAGS -Wall -fno-strict-aliasing"
for mod in %{list}
do
pushd ext/$mod
phpize
%configure
# 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
done
%check
#
# As we don't build whole php here, we must do all the tests
# with the system php executable. Unfortunately, we cannot use
# system's /usr/bin/php directly, therefore a wrapper is needed.
#
# Some reasons for such a wrapper are:
# - /usr/bin/php cannot handle "-d extension=" etc. on the command line
# (probably because of the CGI-oriented variant of php executable is
# installed as /usr/bin/php). We should use own config file for this.
# - During "run-tests.php" execution, php is invoked again (recursively).
# (i.e. we cannot explicitly set another config for deeper php invokation).
# - We cannot exclude /etc/php.d/* files on the host machine. It can lead to
# some stderr reports, which spoil the tests' output. To omit extra warnings,
# the stderr is redirected to /dev/null
# - When invoked again, some CGI-related environment variables are set
# by default, which confuse php a lot. Therefore the environment is cleared,
# and only needed variables are provided.
#
# The test stuff is derived from the original tests in the php tarball,
# with preserving some needed specifications etc.
#
mkdir modules || exit 1
cat >modules.ini <<EOF
open_basedir=
safe_mode=0
output_buffering=0
extension_dir=$PWD/modules
EOF
for mod in %{list}
do
cp -a ext/$mod/modules/${mod}.so modules
echo "extension=${mod}.so" >>modules.ini
done
cat >php <<EOF
#!/bin/sh
exec 2>/dev/null
env -i TEST_PHP_EXECUTABLE=$PWD/php TEST_PHP_SRCDIR=\$TEST_PHP_SRCDIR \
NO_INTERACTION=1 REPORT_EXIT_STATUS=1 MALLOC_CHECK_=2 \
%{_bindir}/php -c $PWD/modules.ini "\$@"
EOF
chmod +x ./php
for mod in %{list}
do
[ -d ext/$mod/tests ] || continue
pushd ext/$mod
TEST_PHP_SRCDIR=$PWD ../../php ../../run-tests.php tests
set +x
fail=0
for f in tests/*.diff
do
[ -f "$f" ] || continue
echo "TEST FAILURE: $PWD/$f --"
cat $f
echo
echo "-- $PWD/$f result ends."
fail=1
done
[ $fail -ne 0 ] && exit $fail
popd
done
%install
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT%{extdir}
install -d $RPM_BUILD_ROOT%{_sysconfdir}/php.d
for mod in %{list}
do
install -m755 ext/${mod}/modules/*.so $RPM_BUILD_ROOT%{extdir}
cat > $RPM_BUILD_ROOT%{_sysconfdir}/php.d/${mod}.ini <<EOF
; Enable ${mod} extension module
extension=${mod}.so
EOF
cat > files.${mod} <<EOF
%defattr(-,root,root)
%{extdir}/${mod}.so
%config(noreplace) %attr(644,root,root) %{_sysconfdir}/php.d/${mod}.ini
EOF
done
%clean
rm -rf $RPM_BUILD_ROOT
#%%files
%define fil() %%{?_with_%1:%%files -n php-%1 -f files.%1}
%{expand:%fil dbase}
%{expand:%fil readline}
%{expand:%fil recode}
%{expand:%fil mcrypt}
%{expand:%fil mhash}
%{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).
- 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
- 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
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-extras/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 25 Mar 2006 18:11:00 -0000 1.1
+++ .cvsignore 25 Mar 2006 18:13:47 -0000 1.2
@@ -0,0 +1 @@
+php-5.1.2.tar.gz
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-extras/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 25 Mar 2006 18:11:00 -0000 1.1
+++ sources 25 Mar 2006 18:13:47 -0000 1.2
@@ -0,0 +1 @@
+b5b6564e8c6a0d5bc1d2b4787480d792 php-5.1.2.tar.gz
More information about the fedora-extras-commits
mailing list