SPECS: php.spec, php4.spec - AC-branch merge: - -iconv needs iconv databa...

[glen]

Author: glen                         Date: Mon Jun 16 11:10:20 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- AC-branch merge:
  - -iconv needs iconv databases for charset conversion
  - require same arch gconv modules for -iconv

---- Files affected:
SPECS:
   php.spec (1.727 -> 1.728) , php4.spec (1.618 -> 1.619) 

---- Diffs:

================================================================
Index: SPECS/php.spec
diff -u SPECS/php.spec:1.727 SPECS/php.spec:1.728
--- SPECS/php.spec:1.727	Mon Jun 16 11:13:47 2008
+++ SPECS/php.spec	Mon Jun 16 13:10:14 2008
@@ -700,7 +700,9 @@
 Summary:	iconv extension module for PHP
 Summary(pl.UTF-8):	Moduł iconv dla PHP
 Group:		Libraries
+Requires:	%{_libdir}/gconv
 Requires:	%{name}-common = %{epoch}:%{version}-%{release}
+Requires:	iconv
 Provides:	php(iconv)
 
 %description iconv
@@ -2764,6 +2766,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.728  2008/06/16 11:10:14  glen
+- AC-branch merge:
+  - -iconv needs iconv databases for charset conversion
+  - require same arch gconv modules for -iconv
+
 Revision 1.727  2008/06/16 09:13:47  arekm
 - rel 7; properly link m4 macros
 

================================================================
Index: SPECS/php4.spec
diff -u SPECS/php4.spec:1.618 SPECS/php4.spec:1.619
--- SPECS/php4.spec:1.618	Mon Jun 16 11:34:02 2008
+++ SPECS/php4.spec	Mon Jun 16 13:10:14 2008
@@ -811,7 +811,9 @@
 Summary:	iconv extension module for PHP
 Summary(pl.UTF-8):	Moduł iconv dla PHP
 Group:		Libraries
+Requires:	%{_libdir}/gconv
 Requires:	%{name}-common = %{epoch}:%{version}-%{release}
+Requires:	iconv
 Provides:	php(iconv)
 
 %description iconv
@@ -3155,6 +3157,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.619  2008/06/16 11:10:14  glen
+- AC-branch merge:
+  - -iconv needs iconv databases for charset conversion
+  - require same arch gconv modules for -iconv
+
 Revision 1.618  2008/06/16 09:34:02  arekm
 - rel 15; lib64 fixes
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/php.spec?r1=1.727&r2=1.728&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/php4.spec?r1=1.618&r2=1.619&f=u