Author: glen                         Date: Sun Feb 25 02:11:57 2007 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- 4.4.5; using bundled gd

---- Files affected:
SPECS:
   php4.spec (1.576 -> 1.576.2.1) 

---- Diffs:

================================================================
Index: SPECS/php4.spec
diff -u SPECS/php4.spec:1.576 SPECS/php4.spec:1.576.2.1
--- SPECS/php4.spec:1.576       Sun Dec 31 20:40:45 2006
+++ SPECS/php4.spec     Sun Feb 25 03:11:52 2007
@@ -73,7 +73,7 @@
 %undefine      with_msession
 %endif
 
-%define        _rel 13
+%define        _rel 1
 Summary:       PHP: Hypertext Preprocessor
 Summary(fr):   Le langage de script embarque-HTML PHP
 Summary(pl):   Język skryptowy PHP
@@ -81,13 +81,13 @@
 Summary(ru):   PHP ÷ĹŇÓÉÉ 4 - ŃÚŮË ĐŇĹĐŇĎĂĹÓÓÉŇĎ×ÁÎÉŃ HTML-ĆÁĘĚĎ×, ×ŮĐĎĚÎŃĹÍŮĘ 
ÎÁ ÓĹŇ×ĹŇĹ
 Summary(uk):   PHP ÷ĹŇÓŚ§ 4 - ÍĎ×Á ĐŇĹĐŇĎĂĹÓŐ×ÁÎÎŃ HTML-ĆÁĘĚŚ×, ×ÉËĎÎŐ×ÁÎÁ ÎÁ 
ÓĹŇ×ĹŇŚ
 Name:          php4
-Version:       4.4.4
+Version:       4.4.5
 Release:       %{_rel}%{?with_hardening:hardened}
 Epoch:         3
 License:       PHP
 Group:         Libraries
 Source0:       http://www.php.net/distributions/php-%{version}.tar.bz2
-# Source0-md5: bc6fa8908e2ac36e93bab9f7d42cda3a
+# Source0-md5: bf61d557c82962dc9533f6ef35283d4c
 Source2:       zend.gif
 Source3:       %{name}-mod_php.conf
 Source4:       %{name}-cgi-fcgi.ini
@@ -128,7 +128,7 @@
 Patch29:       %{name}-lib64.patch
 Patch30:       %{name}-mnogosearch-fix.patch
 Patch31:       %{name}-stupidapache_version.patch
-Patch32:       %{name}-gd_imagerotate_enable.patch
+Patch32:       %{name}-interbase.patch
 Patch33:       %{name}-uint32_t.patch
 Patch34:       %{name}-install_gd_headers.patch
 Patch35:       %{name}-both-apxs.patch
@@ -140,11 +140,10 @@
 # XXX: obsolete?
 Patch41:       %{name}-openssl-huge-hack.patch
 Patch42:       %{name}-apr-apu.patch
-Patch43:       %{name}-branch.diff
-Patch44:       %{name}-curl.patch
+#Patch43:      %{name}-branch.diff
 Patch45:       %{name}-config-dir.patch
 Patch46:       %{name}-phpinfo_no_configure.patch
-Patch47:       %{name}-imap-2006-fix.patch
+Patch47:       %{name}-ming.patch
 URL:           http://www.php.net/
 %{?with_interbase:%{!?with_interbase_inst:BuildRequires:       Firebird-devel 
>= 1.0.2.908-2}}
 %{?with_pspell:BuildRequires:  aspell-devel >= 2:0.50.0}
@@ -169,8 +168,6 @@
 %endif
 BuildRequires: freetype-devel >= 2.0
 %{?with_fribidi:BuildRequires: fribidi-devel >= 0.10.4}
-BuildRequires: gd-devel >= 2.0.28-2
-BuildRequires: gd-devel(gif)
 BuildRequires: gdbm-devel
 BuildRequires: gmp-devel
 %{?with_imap:BuildRequires:    heimdal-devel >= 0.7}
@@ -1544,7 +1541,7 @@
 
 %prep
 %setup -q -n php-%{version}
-%patch43 -p1
+#%patch43 -p1
 %patch40 -p1
 %patch0 -p1
 %patch1 -p1
@@ -1595,7 +1592,6 @@
 # XXX: I believe this one is obsolete as of 4.4.3
 #%patch41 -p1
 %patch42 -p1
-%patch44 -p1
 %patch45 -p1
 %patch46 -p1
 %patch47 -p1
@@ -1723,7 +1719,7 @@
        --with-filepro=shared \
        --with-freetype-dir=shared \
        %{?with_fribidi:--with-fribidi=shared} \
-       --with-gd=shared,/usr --enable-gd-native-ttf \
+       --with-gd=shared --enable-gd-native-ttf \
        --with-gdbm \
        --with-gettext=shared \
        --with-gmp=shared \
@@ -3130,6 +3126,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.576.2.1  2007/02/25 02:11:52  glen
+- 4.4.5; using bundled gd
+
 Revision 1.576  2006/12/31 19:40:45  hawk
 - fixed building with imap 2006
 - release 13
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/php4.spec?r1=1.576&r2=1.576.2.1&f=u

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to