SPECS (DEVEL): php.spec - up to snap 2008.11.08 21:30 - Patch38 (tds) obsol...

zergin zergin at pld-linux.org
Sun Nov 9 02:36:58 CET 2008


Author: zergin                       Date: Sun Nov  9 01:36:57 2008 GMT
Module: SPECS                         Tag: DEVEL
---- Log message:
- up to snap 2008.11.08 21:30
- Patch38 (tds) obsolete, already upstream
- dropped mime_magic, finaly fully dropped from upstream
- NfFY (Not fully Functional Yet ;-) ) - work in progress
  compiles --without ming, sybase_ct, xmlrpc

---- Files affected:
SPECS:
   php.spec (1.688.2.17 -> 1.688.2.18) 

---- Diffs:

================================================================
Index: SPECS/php.spec
diff -u SPECS/php.spec:1.688.2.17 SPECS/php.spec:1.688.2.18
--- SPECS/php.spec:1.688.2.17	Wed Aug 13 10:22:34 2008
+++ SPECS/php.spec	Sun Nov  9 02:36:51 2008
@@ -26,7 +26,6 @@
 %bcond_without	interbase	# without InterBase extension module
 %bcond_without	ldap		# without LDAP extension module
 %bcond_without	mhash		# without mhash extension module
-%bcond_without	mime_magic	# without mime-magic module
 %bcond_without	ming		# without ming extension module
 %bcond_without	mm		# without mm support for session storage
 %bcond_without	mssql		# without MS SQL extension module
@@ -68,7 +67,7 @@
 %endif
 
 %define	_rel	0.18
-%define	_snap	200808101830
+%define	_snap	200811082130
 Summary:	PHP: Hypertext Preprocessor
 Summary(fr.UTF-8):	Le langage de script embarque-HTML PHP
 Summary(pl.UTF-8):	Język skryptowy PHP
@@ -82,7 +81,7 @@
 License:	PHP
 Group:		Libraries
 Source0:	http://snaps.php.net/%{name}%{version}-%{_snap}.tar.bz2
-# Source0-md5:	efc03522ee7fe966f2fb827bc1a0ab31
+# Source0-md5:	e4e977f880e3df1b3ff9c0d3210ab9b7
 Source2:	zend.gif
 Source3:	%{name}-mod_%{name}.conf
 Source4:	%{name}-cgi-fcgi.ini
@@ -122,6 +121,7 @@
 Patch29:	%{name}-config-dir.patch
 Patch31:	%{name}-fcgi-graceful.patch
 Patch38:	%{name}-tds.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}
@@ -799,22 +799,6 @@
 %description mhash -l pl.UTF-8
 Moduł PHP udostępniający funkcje mieszające z biblioteki mhash.
 
-%package mime_magic
-Summary:	mime_magic extension module for PHP
-Summary(pl.UTF-8):	Moduł mime_magic dla PHP
-Group:		Libraries
-Requires:	%{name}-common = %{epoch}:%{version}-%{release}
-Requires:	/usr/share/file/magic.mime
-Provides:	php(mime_magic)
-
-%description mime_magic
-This PHP module adds support for MIME type lookup via file magic
-numbers using magic.mime database.
-
-%description mime_magic -l pl.UTF-8
-Moduł PHP dodający obsługę wyszukiwania typów MIME według magicznych
-znaczników plików z użyciem bazy danych magic.mime.
-
 %package ming
 Summary:	ming extension module for PHP
 Summary(pl.UTF-8):	Moduł ming dla PHP
@@ -1526,7 +1510,7 @@
 %patch9 -p1
 
 cp php.ini-dist php.ini
-%patch10 -p1
+#%patch10 -p1
 %patch12 -p1
 %patch13 -p1
 %patch14 -p1
@@ -1548,7 +1532,7 @@
 
 %patch29 -p1
 %patch31 -p1
-%patch38 -p1
+#%patch38 -p1
 
 # conflict seems to be resolved by recode patches
 rm -f ext/recode/config9.m4
@@ -1708,7 +1692,7 @@
 	--with-iconv=shared \
 	--with-freetype-dir=shared \
 	--with-gettext=shared \
-	--with-gd=shared,/usr \
+	--with-gd=shared \
 	--with-gdbm \
 	--with-gmp=shared \
 	%{?with_imap:--with-imap=shared --with-imap-ssl} \
@@ -1717,7 +1701,6 @@
 	%{?with_ldap:--with-ldap=shared --with-ldap-sasl} \
 	--with-mcrypt=shared \
 	%{?with_mhash:--with-mhash=shared} \
-	%{?with_mime_magic:--with-mime-magic=shared,/usr/share/file/magic}%{!?with_mime_magic:--disable-mime-magic} \
 	%{?with_ming:--with-ming=shared} \
 	%{?with_mm:--with-mm} \
 	%{?with_mssql:--with-mssql=shared} \
@@ -1995,7 +1978,6 @@
 %extension_scripts mbstring
 %extension_scripts mcrypt
 %extension_scripts mhash
-%extension_scripts mime_magic
 %extension_scripts ming
 %extension_scripts mssql
 %extension_scripts mysql
@@ -2094,9 +2076,6 @@
 %triggerun mhash -- %{name}-mhash < 4:5.0.4-9.1
 %{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*mhash\.so/d' %{_sysconfdir}/php.ini
 
-%triggerun mime_magic -- %{name}-mime_magic < 4:5.0.4-9.1
-%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*mime_magic\.so/d' %{_sysconfdir}/php.ini
-
 %triggerun ming -- %{name}-ming < 4:5.0.4-9.1
 %{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*ming\.so/d' %{_sysconfdir}/php.ini
 
@@ -2405,13 +2384,6 @@
 %attr(755,root,root) %{php_extensiondir}/mhash.so
 %endif
 
-%if %{with mime_magic}
-%files mime_magic
-%defattr(644,root,root,755)
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/mime_magic.ini
-%attr(755,root,root) %{php_extensiondir}/mime_magic.so
-%endif
-
 %if %{with ming}
 %files ming
 %defattr(644,root,root,755)
@@ -2677,6 +2649,14 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.688.2.18  2008/11/09 01:36:51  zergin
+- up to snap 2008.11.08 21:30
+- Patch38 (tds) obsolete, already upstream
+- dropped mime_magic, finaly fully dropped from upstream
+
+- NfFY (Not fully Functional Yet ;-) ) - work in progress
+  compiles --without ming, sybase_ct, xmlrpc
+
 Revision 1.688.2.17  2008/08/13 08:22:34  zergin
 - fix pcre provides
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/php.spec?r1=1.688.2.17&r2=1.688.2.18&f=u



More information about the pld-cvs-commit mailing list