Author: glen Date: Tue Jul 20 05:08:09 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- move subpackage deps to second list
---- Files affected:
packages/rpm-whiteout:
rpm-whiteout.spec (1.35 -> 1.36)
---- Diffs:
================================================================
Index: packages/rpm-whiteout/rpm-whiteout.spec
diff -u packages/rpm-whiteout/rpm-whiteout.spec:1.35
packages/rpm-whiteout/rpm-whiteout.spec:1.36
--- packages/rpm-whiteout/rpm-whiteout.spec:1.35 Tue Jul 20 07:07:05 2010
+++ packages/rpm-whiteout/rpm-whiteout.spec Tue Jul 20 07:08:04 2010
@@ -49,7 +49,6 @@
initramfs-tools>openct-initramfs \
initramfs-tools>opensc-initramfs \
initramfs-tools>udev-initramfs \
- java-sun-jre>java-sun-tools \
kdebase-desktop>kde-kside-PLD \
kdebase-desktop>kde-logoutpic-PLD \
kdebase-desktop>kde-splash-Default \
@@ -60,14 +59,18 @@
konqueror>kdemultimedia-audiocd \
openjdk-jre>openjdk-tools \
php-pear-PEAR-core>php-pear-Console_Getopt \
- QtGui>Qt3Support \
- QtGui>QtSvg \
rc-scripts>blockdev \
upstart>dbus \
- vim-rt>vim \
vim-rt>vim-plugin-securemodelines \
vim-rt>vim-syntax-poldek \
vim-rt>vim-syntax-spec \
+%%{nil}
+
+# dependency whiteouts if main pkg requires it's subpkg, this should be handed
+# somehow in rpm itself, but for now keep the list.
+%%_dependency_whiteouts_subpkg \
+ QtGui>Qt3Support \
+ QtGui>QtSvg \
ZendFramework-Zend_Cache>ZendFramework-Zend_Json \
ZendFramework-Zend_Cache>ZendFramework-Zend_Log \
ZendFramework-Zend_Controller>ZendFramework-Zend_Dojo \
@@ -78,17 +81,13 @@
ZendFramework-Zend_Controller>ZendFramework-Zend_View \
ZendFramework-Zend_Layout>ZendFramework-Zend_View \
ZendFramework-Zend_Validate>ZendFramework-Zend_Uri \
-%%{nil}
-
-# dependency whiteouts if main pkg requires it's subpkg, this should be handed
-# somehow in rpm itself, but for now keep the list.
-%%_dependency_whiteouts_subpkg \
amarok>amarok-xine \
glibc-localedb-all>glibc \
glibc-misc>glibc \
glibc-misc>glibc64 \
gtk+2>gtk+2-cups \
hal>hal-info \
+ java-sun-jre>java-sun-tools \
lighttpd>lighttpd-mod_dirlisting \
lighttpd>lighttpd-mod_indexfile \
lighttpd>lighttpd-mod_staticfile \
@@ -100,6 +99,7 @@
roundcubemail>roundcubemail-skin-default \
util-vserver-build>vserver-distro-pld \
util-vserver>vserver-distro-pld \
+ vim-rt>vim \
%%{nil}
EOF
@@ -118,6 +118,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.36 2010/07/20 05:08:04 glen
+- move subpackage deps to second list
+
Revision 1.35 2010/07/20 05:07:05 glen
- sort lists
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rpm-whiteout/rpm-whiteout.spec?r1=1.35&r2=1.36&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
