packages: rpm-whiteout/rpm-whiteout.spec - sort lists

glen glen at pld-linux.org
Tue Jul 20 07:07:10 CEST 2010


Author: glen                         Date: Tue Jul 20 05:07:10 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- sort lists

---- Files affected:
packages/rpm-whiteout:
   rpm-whiteout.spec (1.34 -> 1.35) 

---- Diffs:

================================================================
Index: packages/rpm-whiteout/rpm-whiteout.spec
diff -u packages/rpm-whiteout/rpm-whiteout.spec:1.34 packages/rpm-whiteout/rpm-whiteout.spec:1.35
--- packages/rpm-whiteout/rpm-whiteout.spec:1.34	Fri May 21 13:19:43 2010
+++ packages/rpm-whiteout/rpm-whiteout.spec	Tue Jul 20 07:07:05 2010
@@ -37,35 +37,10 @@
 
 %%_dependency_whiteout	\
 	%%{_dependency_whiteouts_subpkg}	\
-	php-pear-PEAR-core>php-pear-Console_Getopt \
-	vim-rt>vim \
-	vim-rt>vim-plugin-securemodelines \
-	vim-rt>vim-syntax-spec \
-	vim-rt>vim-syntax-poldek \
-	java-sun-jre>java-sun-tools \
-	openjdk-jre>openjdk-tools \
+	esound-libs>esound-alsa \
 	glibc>nss-softokn-freebl \
 	glibc>tzdata \
-	ZendFramework-Zend_Controller>ZendFramework-Zend_Dojo \
-	ZendFramework-Zend_Controller>ZendFramework-Zend_Json \
-	ZendFramework-Zend_Controller>ZendFramework-Zend_Layout \
-	ZendFramework-Zend_Controller>ZendFramework-Zend_Session \
-	ZendFramework-Zend_Controller>ZendFramework-Zend_View \
-	ZendFramework-Zend_Controller>ZendFramework-Zend_Uri \
-	ZendFramework-Zend_Validate>ZendFramework-Zend_Uri \
-	ZendFramework-Zend_Cache>ZendFramework-Zend_Json \
-	ZendFramework-Zend_Cache>ZendFramework-Zend_Log \
-	ZendFramework-Zend_Layout>ZendFramework-Zend_View \
-	kdelibs>kdelibs-shared \
-	kdebase-desktop>kde-kside-PLD \
-	kdebase-desktop>kde-logoutpic-PLD \
-	kdebase-desktop>kde-splash-Default \
-	konqueror>kdeaddons-fsview \
-	konqueror>kdeaddons-konqueror \
-	konqueror>kdemultimedia-audiocd \
-	koffice-kexi>koffice-kspread \
-	rc-scripts>blockdev \
-	esound-libs>esound-alsa \
+	gmplayer>mplayer-skin-KDE \
 	initramfs-tools>cryptsetup-luks-initramfs \
 	initramfs-tools>dmraid-initramfs \
 	initramfs-tools>lvm2-initramfs \
@@ -74,32 +49,57 @@
 	initramfs-tools>openct-initramfs \
 	initramfs-tools>opensc-initramfs \
 	initramfs-tools>udev-initramfs \
-	gmplayer>mplayer-skin-KDE \
+	java-sun-jre>java-sun-tools \
+	kdebase-desktop>kde-kside-PLD \
+	kdebase-desktop>kde-logoutpic-PLD \
+	kdebase-desktop>kde-splash-Default \
+	kdelibs>kdelibs-shared \
+	koffice-kexi>koffice-kspread \
+	konqueror>kdeaddons-fsview \
+	konqueror>kdeaddons-konqueror \
+	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 \
+	ZendFramework-Zend_Cache>ZendFramework-Zend_Json \
+	ZendFramework-Zend_Cache>ZendFramework-Zend_Log \
+	ZendFramework-Zend_Controller>ZendFramework-Zend_Dojo \
+	ZendFramework-Zend_Controller>ZendFramework-Zend_Json \
+	ZendFramework-Zend_Controller>ZendFramework-Zend_Layout \
+	ZendFramework-Zend_Controller>ZendFramework-Zend_Session \
+	ZendFramework-Zend_Controller>ZendFramework-Zend_Uri \
+	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	\
-	lighttpd>lighttpd-mod_dirlisting \
-	lighttpd>lighttpd-mod_indexfile \
-	lighttpd>lighttpd-mod_staticfile \
+	amarok>amarok-xine \
+	glibc-localedb-all>glibc \
 	glibc-misc>glibc \
 	glibc-misc>glibc64 \
-	glibc-localedb-all>glibc \
-	localedb-src>glibc \
 	gtk+2>gtk+2-cups \
 	hal>hal-info \
-	amarok>amarok-xine \
-	util-vserver>vserver-distro-pld \
-	util-vserver-build>vserver-distro-pld \
-	roundcubemail>roundcubemail-skin-default \
-	php-simplexml>php-spl \
+	lighttpd>lighttpd-mod_dirlisting \
+	lighttpd>lighttpd-mod_indexfile \
+	lighttpd>lighttpd-mod_staticfile \
+	localedb-src>glibc \
 	phorum>phorum-db-mysql \
 	phorum>phorum-db-mysqli \
 	phorum>phorum-db-sql_pool \
+	php-simplexml>php-spl \
+	roundcubemail>roundcubemail-skin-default \
+	util-vserver-build>vserver-distro-pld \
+	util-vserver>vserver-distro-pld \
 %%{nil}
 
 EOF
@@ -118,6 +118,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.35  2010/07/20 05:07:05  glen
+- sort lists
+
 Revision 1.34  2010/05/21 11:19:43  jajcus
 - upstart>dbus
 
================================================================

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



More information about the pld-cvs-commit mailing list