|
@@ -7,6 +7,12 @@
|
|
|
|
|
|
%global php_confdir %{_sysconfdir}/%{_name}
|
|
%global php_confdir %{_sysconfdir}/%{_name}
|
|
|
|
|
|
|
|
+%if %{?_dist_release} == "vl6"
|
|
|
|
+%define gd_name gd21
|
|
|
|
+%else
|
|
|
|
+%define gd_name gd
|
|
|
|
+%endif
|
|
|
|
+
|
|
%{!?_without_pear:%global _with_pear 1}
|
|
%{!?_without_pear:%global _with_pear 1}
|
|
%global with_pear %{?_with_pear:1}%{!?_with_pear:0}
|
|
%global with_pear %{?_with_pear:1}%{!?_with_pear:0}
|
|
%if %{with_pear}
|
|
%if %{with_pear}
|
|
@@ -45,7 +51,7 @@
|
|
Name: php5
|
|
Name: php5
|
|
Summary: The PHP HTML-embedded scripting language. (PHP: Hypertext Preprocessor)
|
|
Summary: The PHP HTML-embedded scripting language. (PHP: Hypertext Preprocessor)
|
|
Summary(ja): HTML 埋め込み型スクリプト言語 PHP
|
|
Summary(ja): HTML 埋め込み型スクリプト言語 PHP
|
|
-Version: 5.5.4
|
|
|
|
|
|
+Version: 5.5.5
|
|
Release: 1%{_dist_release}
|
|
Release: 1%{_dist_release}
|
|
|
|
|
|
Vendor: Project Vine
|
|
Vendor: Project Vine
|
|
@@ -94,7 +100,7 @@ BuildRequires: coreutils
|
|
BuildRequires: flex
|
|
BuildRequires: flex
|
|
BuildRequires: freetype2-devel
|
|
BuildRequires: freetype2-devel
|
|
BuildRequires: gcc-c++
|
|
BuildRequires: gcc-c++
|
|
-BuildRequires: gd-devel
|
|
|
|
|
|
+BuildRequires: %{gd_name}-devel
|
|
BuildRequires: gdbm-devel
|
|
BuildRequires: gdbm-devel
|
|
BuildRequires: gmp-devel
|
|
BuildRequires: gmp-devel
|
|
BuildRequires: libjpeg-devel
|
|
BuildRequires: libjpeg-devel
|
|
@@ -945,6 +951,12 @@ rm -f files.*
|
|
|
|
|
|
#======================================================================
|
|
#======================================================================
|
|
%changelog
|
|
%changelog
|
|
|
|
+* Thu Oct 17 2013 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 5.5.5-1
|
|
|
|
+- new upstream release.
|
|
|
|
+
|
|
|
|
+* Mon Oct 07 2013 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 5.5.4-2
|
|
|
|
+- built for VinePlus/6.
|
|
|
|
+
|
|
* Wed Oct 02 2013 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 5.5.4-1
|
|
* Wed Oct 02 2013 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 5.5.4-1
|
|
- new upstream release.
|
|
- new upstream release.
|
|
- removed %%patch51 (commited to upstream).
|
|
- removed %%patch51 (commited to upstream).
|