Author: glen Date: Fri Aug 28 14:25:32 2009 GMT
Module: packages Tag: PHP_5_2
---- Log message:
- magic.mime path distro dependant
---- Files affected:
packages/php:
php.spec (1.805.2.7 -> 1.805.2.8)
---- Diffs:
================================================================
Index: packages/php/php.spec
diff -u packages/php/php.spec:1.805.2.7 packages/php/php.spec:1.805.2.8
--- packages/php/php.spec:1.805.2.7 Wed Aug 19 12:30:41 2009
+++ packages/php/php.spec Fri Aug 28 16:25:26 2009
@@ -87,6 +87,12 @@
%undefine with_filter
%endif
+%if "%{pld_release}" == "ac"
+%define magic_mime /usr/share/misc/magic.mime
+%else
+%define magic_mime /usr/share/file/magic.mime
+%endif
+
Summary: PHP: Hypertext Preprocessor
Summary(fr.UTF-8): Le langage de script embarque-HTML PHP
Summary(pl.UTF-8): Język skryptowy PHP
@@ -889,7 +895,7 @@
Summary(pl.UTF-8): Moduł mime_magic dla PHP
Group: Libraries
Requires: %{name}-common = %{epoch}:%{version}-%{release}
-Requires: /usr/share/misc/magic.mime
+Requires: %{magic_mime}
Provides: php(mime_magic)
%description mime_magic
@@ -1870,7 +1876,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/misc/magic.mime}%{!?with_mime_magic:--disable-mime-magic}
\
+
%{?with_mime_magic:--with-mime-magic=shared,%{magic_mime}}%{!?with_mime_magic:--disable-mime-magic}
\
%{?with_ming:--with-ming=shared} \
%{?with_mm:--with-mm} \
%{?with_mssql:--with-mssql=shared} \
@@ -2887,6 +2893,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.805.2.8 2009/08/28 14:25:26 glen
+- magic.mime path distro dependant
+
Revision 1.805.2.7 2009/08/19 10:30:41 arekm
- rel 12; build fixed
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/php/php.spec?r1=1.805.2.7&r2=1.805.2.8&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
