SPECS (DEVEL): php.spec - revert mime_magic removal (depricated but still w...

[zergin]

Author: zergin                       Date: Sun Jul 27 16:28:05 2008 GMT
Module: SPECS                         Tag: DEVEL
---- Log message:
- revert mime_magic removal (depricated but still working)
- add >= 0.82 version on freetds-devel BR (as on HEAD)

---- Files affected:
SPECS:
   php.spec (1.688.2.14 -> 1.688.2.15) 

---- Diffs:

================================================================
Index: SPECS/php.spec
diff -u SPECS/php.spec:1.688.2.14 SPECS/php.spec:1.688.2.15
--- SPECS/php.spec:1.688.2.14	Sun Jul 27 17:50:08 2008
+++ SPECS/php.spec	Sun Jul 27 18:27:59 2008
@@ -26,6 +26,7 @@
 %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
@@ -139,7 +140,7 @@
 %{?with_fdf:BuildRequires:	fdftk-devel}
 BuildRequires:	flex
 %if %{with mssql} || %{with sybase_ct}
-BuildRequires:	freetds-devel
+BuildRequires:	freetds-devel >= 0.82
 %endif
 BuildRequires:	freetype-devel >= 2.0
 BuildRequires:	gd-devel >= 2.0.28-4
@@ -813,6 +814,22 @@
 %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
@@ -1716,6 +1733,7 @@
 	%{?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} \
@@ -1994,6 +2012,7 @@
 %extension_scripts mbstring
 %extension_scripts mcrypt
 %extension_scripts mhash
+%extension_scripts mime_magic
 %extension_scripts ming
 %extension_scripts mssql
 %extension_scripts mysql
@@ -2095,6 +2114,9 @@
 %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
 
@@ -2408,6 +2430,13 @@
 %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)
@@ -2673,6 +2702,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.688.2.15  2008/07/27 16:27:59  zergin
+- revert mime_magic removal (depricated but still working)
+- add >= 0.82 version on freetds-devel BR (as on HEAD)
+
 Revision 1.688.2.14  2008/07/27 15:50:08  zergin
 - removed mime_magic: functionality now provided by fileinfo
 - fileinfo now available in core
================================================================

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