|
|
@@ -2,7 +2,6 @@
|
|
|
%global _name php%{majorver}
|
|
|
|
|
|
%global srcname php-%{version}
|
|
|
-#%%global srcname php5.2-200605090430
|
|
|
|
|
|
%global php_confdir %{_sysconfdir}/%{_name}
|
|
|
|
|
|
@@ -25,10 +24,12 @@
|
|
|
%global apache2_cgidir %{apache2_contentdir}/cgi-bin
|
|
|
%global apache2_fcgidir %{apache2_contentdir}/fcgi-bin
|
|
|
|
|
|
-Summary: The PHP HTML-embedded scripting language. (PHP: Hypertext Preprocessor)
|
|
|
Name: php5
|
|
|
-Version: 5.3.1
|
|
|
+Summary: The PHP HTML-embedded scripting language. (PHP: Hypertext Preprocessor)
|
|
|
+Summary(ja): HTML 埋め込み型スクリプト言語 PHP
|
|
|
+Version: 5.3.3
|
|
|
Release: 1%{_dist_release}
|
|
|
+
|
|
|
License: The PHP License
|
|
|
Group: Development/Languages
|
|
|
URL: http://www.php.net/
|
|
|
@@ -64,8 +65,11 @@ BuildRequires: gdbm-devel
|
|
|
BuildRequires: gmp-devel
|
|
|
BuildRequires: libjpeg-devel
|
|
|
BuildRequires: libpng-devel
|
|
|
+%if %{?_dist_release} == "vl5"
|
|
|
BuildRequires: libstdc++34-devel
|
|
|
-BuildRequires: libtool >= 1.4.3
|
|
|
+%else
|
|
|
+BuildRequires: libstdc++-devel
|
|
|
+%endif
|
|
|
BuildRequires: libtool-ltdl-devel
|
|
|
BuildRequires: libxml2-devel
|
|
|
BuildRequires: libxslt-devel >= 1.0.18
|
|
|
@@ -79,10 +83,10 @@ BuildRequires: postfix
|
|
|
BuildRequires: readline-devel
|
|
|
BuildRequires: sqlite3-devel
|
|
|
BuildRequires: zlib-devel
|
|
|
-%if %{?_dist_release}!="vl4"
|
|
|
+%if %{?_dist_release} != "vl4"
|
|
|
BuildRequires: krb5-devel
|
|
|
%endif
|
|
|
-PreReq: alternatives
|
|
|
+Requires(post,preun): alternatives
|
|
|
%{?_with_pear:Requires: %{name}-pear = %{version}-%{release}}
|
|
|
Conflicts: php <= 4.4.2-0vl1.2
|
|
|
Provides: php = %{version}-%{release}
|
|
|
@@ -98,18 +102,19 @@ mod_php module enables the Apache Web server to understand and process
|
|
|
the embedded PHP language in Web pages.
|
|
|
|
|
|
%description -l ja
|
|
|
-PHP はHTML埋め込み型のスクリプト言語です。開発者にとって、動的に生成され
|
|
|
-るWeb ページを簡単に書けるように考えて作られています。さらに、商用、非商
|
|
|
-用を問わず、数々のデータベース管理システムについての統合データベース環境
|
|
|
-が組み込まれています。このため、データベースを使ったWeb ページがかなり簡
|
|
|
-単に書けます。PHP の用途のほとんどは、既存のCGI スクリプトの置き換えに使
|
|
|
-われているのではないでしょうか。また mod_php を使うと、Apache Web サーバ
|
|
|
-がWeb ページに埋めこまれたPHP 言語を理解して処理できるようになります。
|
|
|
+PHP は HTML 埋め込み型のスクリプト言語です．開発者にとって，動的に生成
|
|
|
+される Web ページを簡単に書けるように考えて作られています．さらに，商用，
|
|
|
+非商用を問わず，数々のデータベース管理システムについての統合データベース
|
|
|
+環境が組み込まれています．そのため，データベースを使った Web ページを簡
|
|
|
+単に書くことができます．PHP の用途のほとんどは、既存の CGI スクリプトの
|
|
|
+置き換えに使われているのではないでしょうか．また，mod_php を使うことで，
|
|
|
+Apache Web サーバが Web ページに埋めこまれた PHP 言語を理解して処理でき
|
|
|
+るようになります．
|
|
|
|
|
|
#----------------------------------------------------------------------
|
|
|
%package devel
|
|
|
-Group: Development/Libraries
|
|
|
Summary: Files needed for building PHP extensions.
|
|
|
+Group: Development/Libraries
|
|
|
Requires: %{name} = %{version}-%{release}
|
|
|
Requires: autoconf
|
|
|
Requires: automake
|
|
|
@@ -125,7 +130,7 @@ need to install this package.
|
|
|
%package pear
|
|
|
Group: Development/Languages
|
|
|
Summary: PHP Extension and Application Repository Components
|
|
|
-PreReq: alternatives
|
|
|
+Requires(post): alternatives
|
|
|
Requires: %{name} = %{version}-%{release}
|
|
|
Conflicts: php-pear <= 4.4.2-0vl2
|
|
|
Provides: php-pear = %{version}-%{release}
|
|
|
@@ -137,12 +142,12 @@ components. This package contains the basic PEAR components.
|
|
|
|
|
|
#----------------------------------------------------------------------
|
|
|
%package apache
|
|
|
-Group: System Environment/Daemons
|
|
|
Summary: php5 module for Apache version 1
|
|
|
Summary(ja): Apache バージョン 1 用の php5 モジュール
|
|
|
+Group: System Environment/Daemons
|
|
|
BuildRequires: apache-devel
|
|
|
-PreReq: %{name} = %{version}-%{release}
|
|
|
-PreReq: apache
|
|
|
+Requires: %{name} = %{version}-%{release}
|
|
|
+Requires: apache
|
|
|
Provides: php-apache = %{version}-%{release}
|
|
|
|
|
|
%description apache
|
|
|
@@ -154,8 +159,8 @@ Group: System Environment/Daemons
|
|
|
Summary: php5 module for Apache version 2
|
|
|
Summary(ja): Apache バージョン 2 用の php5 モジュール
|
|
|
BuildRequires: apache2-devel >= 2.0.50-0vl2
|
|
|
-PreReq: %{name} = %{version}-%{release}
|
|
|
-PreReq: apache2 >= 2.0.50-0vl2
|
|
|
+Requires: %{name} = %{version}-%{release}
|
|
|
+Requires: apache2 >= 2.0.50-0vl2
|
|
|
Provides: php-apache2 = %{version}-%{release}
|
|
|
|
|
|
%description apache2
|
|
|
@@ -300,7 +305,7 @@ BuildRequires: bzip2-devel
|
|
|
BuildRequires: glibc-devel
|
|
|
BuildRequires: libelf-devel
|
|
|
BuildRequires: net-snmp-devel >= 5.1.1
|
|
|
-BuildRequires: popt
|
|
|
+BuildRequires: popt-devel
|
|
|
BuildRequires: rpm-devel
|
|
|
BuildRequires: zlib-devel
|
|
|
Requires: %{name} = %{version}-%{release}
|
|
|
@@ -361,21 +366,6 @@ mkdir build-cgi build-apache build-apache2
|
|
|
|
|
|
#======================================================================
|
|
|
%build
|
|
|
-%if %{?_dist_release} != "vl4"
|
|
|
-# Vine Linux 5
|
|
|
-# aclocal workaround - to be improved
|
|
|
-cat `aclocal --print-ac-dir`/{libtool,ltoptions,ltsugar,ltversion,lt~obsolete}.m4 >>aclocal.m4
|
|
|
-
|
|
|
-# Force use of system libtool:
|
|
|
-libtoolize --force --copy
|
|
|
-cat `aclocal --print-ac-dir`/{libtool,ltoptions,ltsugar,ltversion,lt~obsolete}.m4 >build/libtool.m4
|
|
|
-%else
|
|
|
-# Vine Linux 4
|
|
|
-# Force use of system libtool:
|
|
|
-libtoolize --force --copy
|
|
|
-cat `aclocal --print-ac-dir`/libtool.m4 >build/libtool.m4
|
|
|
-%endif
|
|
|
-
|
|
|
# Regenerate configure scripts (patches change config.m4's)
|
|
|
./buildconf --force
|
|
|
|
|
|
@@ -451,8 +441,6 @@ make %{?_smp_mflags}
|
|
|
# Build /usr/bin/php{,-cgi}, and all the shared extensions
|
|
|
pushd build-cgi
|
|
|
build \
|
|
|
- --enable-force-cgi-redirect --enable-discard-path \
|
|
|
- --with-ncurses \
|
|
|
--with-readline
|
|
|
popd
|
|
|
|
|
|
@@ -602,40 +590,41 @@ done
|
|
|
|
|
|
#----------------------------------------------------------------------
|
|
|
%post
|
|
|
-update-alternatives --install %{_bindir}/php php %{_bindir}/php%{majorver} %{majorver}0
|
|
|
+/sbin/update-alternatives --install %{_bindir}/php \
|
|
|
+ php %{_bindir}/php%{majorver} %{majorver}0
|
|
|
|
|
|
# fix broken symlink if it's there
|
|
|
if [ ! -f %{_bindir}/php ] ; then
|
|
|
- update-alternatives --auto php
|
|
|
+ /sbin/update-alternatives --auto php
|
|
|
fi
|
|
|
|
|
|
%triggerpostun -- php5 < 5.1.4-0vl1
|
|
|
-update-alternatives --auto php
|
|
|
+/sbin/update-alternatives --auto php
|
|
|
|
|
|
%preun
|
|
|
if [ "$1" = 0 ]; then
|
|
|
- update-alternatives --remove php %{_bindir}/php%{majorver}
|
|
|
- update-alternatives --auto php
|
|
|
+ /sbin/update-alternatives --remove php %{_bindir}/php%{majorver}
|
|
|
+ /sbin/update-alternatives --auto php
|
|
|
fi
|
|
|
|
|
|
%post pear
|
|
|
-update-alternatives \
|
|
|
+/sbin/update-alternatives \
|
|
|
--install %{_bindir}/pear pear %{_bindir}/pear%{majorver} %{majorver}0 \
|
|
|
--slave %{_bindir}/peardev peardev %{_bindir}/peardev%{majorver} \
|
|
|
--slave %{_bindir}/pecl pecl %{_bindir}/pecl%{majorver}
|
|
|
|
|
|
# fix broken symlink if it's there
|
|
|
if [ ! -f %{_bindir}/pear ] ; then
|
|
|
- update-alternatives --auto pear
|
|
|
+ /sbin/update-alternatives --auto pear
|
|
|
fi
|
|
|
|
|
|
%triggerpostun pear -- php5-pear < 5.1.4-0vl1
|
|
|
-update-alternatives --auto pear
|
|
|
+/sbin/update-alternatives --auto pear
|
|
|
|
|
|
%preun pear
|
|
|
if [ "$1" = "0" ]; then
|
|
|
- update-alternatives --remove pear %{_bindir}/pear%{majorver}
|
|
|
- update-alternatives --auto pear
|
|
|
+ /sbin/update-alternatives --remove pear %{_bindir}/pear%{majorver}
|
|
|
+ /sbin/update-alternatives --auto pear
|
|
|
fi
|
|
|
|
|
|
%post apache
|
|
|
@@ -717,6 +706,9 @@ rm -f files.*
|
|
|
|
|
|
#======================================================================
|
|
|
%changelog
|
|
|
+* Sun Sep 5 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 5.3.3-1
|
|
|
+- new upstream release
|
|
|
+
|
|
|
* Fri Nov 20 2009 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 5.3.1-1
|
|
|
- new upstream release.
|
|
|
|
inagaki