packages: rpm-whiteout/rpm-whiteout.spec - updated php, ZF, java-sun, glibc...

[glen]

Author: glen                         Date: Tue Jul 20 05:26:01 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated php, ZF, java-sun, glibc; added fontpostinst deps

---- Files affected:
packages/rpm-whiteout:
   rpm-whiteout.spec (1.37 -> 1.38) 

---- Diffs:

================================================================
Index: packages/rpm-whiteout/rpm-whiteout.spec
diff -u packages/rpm-whiteout/rpm-whiteout.spec:1.37 packages/rpm-whiteout/rpm-whiteout.spec:1.38
--- packages/rpm-whiteout/rpm-whiteout.spec:1.37	Tue Jul 20 07:09:36 2010
+++ packages/rpm-whiteout/rpm-whiteout.spec	Tue Jul 20 07:25:56 2010
@@ -37,6 +37,7 @@
 
 %%_dependency_whiteout	\
 	%%{_dependency_whiteouts_subpkg}	\
+	fontpostinst>t1lib \
 	glibc>nss-softokn-freebl \
 	glibc>tzdata \
 	gmplayer>mplayer-skin-KDE \
@@ -56,7 +57,6 @@
 	konqueror>kdeaddons-fsview \
 	konqueror>kdeaddons-konqueror \
 	konqueror>kdemultimedia-audiocd \
-	openjdk-jre>openjdk-tools \
 	php-pear-PEAR-core>php-pear-Console_Getopt \
 	rc-scripts>blockdev \
 	upstart>dbus \
@@ -80,22 +80,34 @@
 	ZendFramework-Zend_Controller>ZendFramework-Zend_View \
 	ZendFramework-Zend_Layout>ZendFramework-Zend_View \
 	ZendFramework-Zend_Validate>ZendFramework-Zend_Uri \
+	ZendFramework>ZendFramework-Zend_Date \
+	ZendFramework>ZendFramework-Zend_Exception \
+	ZendFramework>ZendFramework-Zend_Http \
+	ZendFramework>ZendFramework-Zend_Loader \
+	ZendFramework>ZendFramework-Zend_Loader \
+	ZendFramework>ZendFramework-Zend_Registry \
 	amarok>amarok-xine \
 	esound-libs>esound-alsa \
-	glibc-localedb-all>glibc \
-	glibc-misc>glibc \
-	glibc-misc>glibc64 \
+	glibc64>glibc-misc \
+	glibc>glibc-localedb-all \
+	glibc>glibc-misc \
 	glibc>localedb-src \
 	gtk+2>gtk+2-cups \
 	hal>hal-info \
+	java-sun-jre>java-sun-jre-X11 \
 	java-sun-jre>java-sun-tools \
 	lighttpd>lighttpd-mod_dirlisting \
 	lighttpd>lighttpd-mod_indexfile \
 	lighttpd>lighttpd-mod_staticfile \
+	openjdk-jre>openjdk-tools \
 	phorum>phorum-db-mysql \
 	phorum>phorum-db-mysqli \
 	phorum>phorum-db-sql_pool \
-	php-simplexml>php-spl \
+	php-common>php-pcre \
+	php-common>php-session \
+	php-common>php-simplexml \
+	php-common>php-spl \
+	php-spl>php-simplexml \
 	roundcubemail>roundcubemail-skin-default \
 	util-vserver-build>vserver-distro-pld \
 	util-vserver>vserver-distro-pld \
@@ -118,6 +130,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.38  2010/07/20 05:25:56  glen
+- updated php, ZF, java-sun, glibc; added fontpostinst deps
+
 Revision 1.37  2010/07/20 05:09:36  glen
 - fix order
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rpm-whiteout/rpm-whiteout.spec?r1=1.37&r2=1.38&f=u