Author: glen Date: Sat Dec 6 19:53:27 2008 GMT
Module: SPECS Tag: HEAD
---- Log message:
- separate list for main<>subpkg loops
---- Files affected:
SPECS:
rpm-whiteout.spec (1.15 -> 1.16)
---- Diffs:
================================================================
Index: SPECS/rpm-whiteout.spec
diff -u SPECS/rpm-whiteout.spec:1.15 SPECS/rpm-whiteout.spec:1.16
--- SPECS/rpm-whiteout.spec:1.15 Wed Nov 26 23:57:53 2008
+++ SPECS/rpm-whiteout.spec Sat Dec 6 20:53:22 2008
@@ -10,8 +10,9 @@
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
-PLD Linux RPM macros dealing with loop errors in RPM packages in PLD Linux
-Distribution that can't solved easily or not wanted to be solved.
+PLD Linux RPM macros dealing with loop errors in RPM packages in PLD
+Linux Distribution that can't solved easily or not wanted to be
+solved.
%prep
%setup -qcT
@@ -31,17 +32,13 @@
# and that both p and q are package names (i.e. no version/release).
%%_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 \
- lighttpd>lighttpd-mod_dirlisting \
- lighttpd>lighttpd-mod_indexfile \
- lighttpd>lighttpd-mod_staticfile \
java-sun-jre>java-sun-tools \
- glibc>glibc-misc \
- glibc64>glibc-misc \
ZendFramework>ZendFramework-Zend_Date \
ZendFramework>ZendFramework-Zend_Exception \
ZendFramework>ZendFramework-Zend_Http \
@@ -54,12 +51,24 @@
ZendFramework-Zend_Controller>ZendFramework-Zend_View \
ZendFramework-Zend_Json>ZendFramework-Zend_Cache \
ZendFramework-Zend_Layout>ZendFramework-Zend_View \
- gtk+2>gtk+2-cups \
kdelibs>kdelibs-shared \
perl-dirs>perl-base \
+%%{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 \
+ glibc>glibc-misc \
+ glibc64>glibc-misc \
+ gtk+2>gtk+2-cups \
hal>hal-info \
amarok>amarok-xine \
+ util-vserver>vserver-distro-pld \
%%{nil}
+
EOF
%clean
@@ -76,6 +85,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.16 2008/12/06 19:53:22 glen
+- separate list for main<>subpkg loops
+
Revision 1.15 2008/11/26 22:57:53 glen
- typo
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/rpm-whiteout.spec?r1=1.15&r2=1.16&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
