fix interdependencies

perl-xml/perl-xml.spec

@@ -24,37 +24,40 @@
 ##
 
 #   versions of individual parts
-%define       V_xml_parser           2.34
-%define       V_xml_libxml_common    0.13
-%define       V_xml_libxml           1.56
-%define       V_xml_libxslt          1.53
-%define       V_xml_regexp           0.03
-%define       V_xml_dom              1.43
-%define       V_xml_simple           2.09
-%define       V_xml_namespacesupport 1.08
-%define       V_xml_sax              0.12
-%define       V_xml_sax_base         1.02
-%define       V_xml_sax_expat        0.37
-%define       V_xml_xslt             0.45
-%define       V_xml_twig             3.12
-%define       V_xml_xpath            1.13
-%define       V_xml_xpath_simple     0.05
-%define       V_xml_easyobj          1.12
-%define       V_xml_rss              1.02
-%define       V_xml_dtdparser        1.7
-%define       V_xml_quote            1.02
-%define       V_xml_xupdate_libxml   0.5.0
-%define       V_html_tagset          3.03
-%define       V_html_parser          3.35
-%define       V_html_tree            3.18
-%define       V_html_table           1.20
-%define       V_html_tagreader       1.06
-%define       V_html_simpleparse     0.12
-%define       V_xml_xsh              1.8.2
-%define       V_xml_gdome            0.85
-%define       V_xml_libxml_perl      0.07
-%define       V_xml_writer           0.4
-%define       V_xml_writer_string    0.1
+%define       V_html_parser             3.35
+%define       V_html_simpleparse        0.12
+%define       V_html_table              1.20
+%define       V_html_tagreader          1.06
+%define       V_html_tagset             3.03
+%define       V_html_tree               3.18
+%define       V_xml_dom                 1.43
+%define       V_xml_dtdparser           1.7
+%define       V_xml_easyobj             1.12
+%define       V_xml_gdome               0.85
+%define       V_xml_libxml              1.56
+%define       V_xml_libxml_common       0.13
+%define       V_xml_libxml_iterator     1.00
+%define       V_xml_libxml_perl         0.07
+%define       V_xml_libxml_xpathcontext 0.06
+%define       V_xml_libxslt             1.53
+%define       V_xml_namespacesupport    1.08
+%define       V_xml_nodefilter          0.01
+%define       V_xml_parser              2.34
+%define       V_xml_quote               1.02
+%define       V_xml_regexp              0.03
+%define       V_xml_rss                 1.02
+%define       V_xml_sax                 0.12
+%define       V_xml_sax_base            1.02
+%define       V_xml_sax_expat           0.37
+%define       V_xml_simple              2.09
+%define       V_xml_twig                3.12
+%define       V_xml_writer              0.4
+%define       V_xml_writer_string       0.1
+%define       V_xml_xpath               1.13
+%define       V_xml_xpath_simple        0.05
+%define       V_xml_xsh                 1.8.2
+%define       V_xml_xslt                0.45
+%define       V_xml_xupdate_libxml      0.5.0
 
 #   package information
 Name:         perl-xml
@@ -65,8 +68,8 @@ Packager:     The OpenPKG Project
 Distribution: OpenPKG [BASE]
 Group:        Language
 License:      GPL/Artistic
-Version:      20040129
-Release:      20040129
+Version:      20040201
+Release:      20040201
 
 #   package options
 %option       with_libxml            no
@@ -103,18 +106,21 @@ Source15:     http://www.cpan.org/modules/by-module/XML/XML-DTDParser-%{V_xml_dt
 Source16:     http://www.cpan.org/modules/by-module/XML/XML-Quote-%{V_xml_quote}.tar.gz
 Source17:     http://www.cpan.org/modules/by-module/XML/XML-Writer-%{V_xml_writer}.tar.gz
 Source18:     http://www.cpan.org/modules/by-module/XML/XML-Writer-String-%{V_xml_writer_string}.tar.gz
-Source19:     http://www.cpan.org/modules/by-module/HTML/HTML-Tagset-%{V_html_tagset}.tar.gz
-Source20:     http://www.cpan.org/modules/by-module/HTML/HTML-Parser-%{V_html_parser}.tar.gz
-Source21:     http://www.cpan.org/modules/by-module/HTML/HTML-Tree-%{V_html_tree}.tar.gz
-Source22:     http://www.cpan.org/modules/by-module/HTML/HTML-Table-%{V_html_table}.tar.gz
-Source23:     http://www.cpan.org/modules/by-module/HTML/HTML-TagReader-%{V_html_tagreader}.tar.gz
-Source24:     http://www.cpan.org/modules/by-module/HTML/HTML-SimpleParse-%{V_html_simpleparse}.tar.gz
-Source25:     http://www.cpan.org/authors/id/P/PH/PHISH/XML-LibXML-Common-%{V_xml_libxml_common}.tar.gz
-Source26:     http://www.cpan.org/authors/id/P/PH/PHISH/XML-LibXML-%{V_xml_libxml}.tar.gz
-Source27:     http://www.cpan.org/modules/by-module/XML/XML-XUpdate-LibXML-%{V_xml_xupdate_libxml}.tar.gz
-Source28:     http://osdn.dl.sourceforge.net/sourceforge/xsh/XML-XSH-%{V_xml_xsh}.tar.gz
-Source29:     http://www.cpan.org/authors/id/M/MS/MSERGEANT/XML-LibXSLT-%{V_xml_libxslt}.tar.gz
-Source30:     http://www.cpan.org/modules/by-module/XML/XML-GDOME-%{V_xml_gdome}.tar.gz
+Source19:     http://www.cpan.org/modules/by-module/XML/XML-NodeFilter-%{V_xml_nodefilter}.tar.gz
+Source20:     http://www.cpan.org/modules/by-module/HTML/HTML-Tagset-%{V_html_tagset}.tar.gz
+Source21:     http://www.cpan.org/modules/by-module/HTML/HTML-Parser-%{V_html_parser}.tar.gz
+Source22:     http://www.cpan.org/modules/by-module/HTML/HTML-Tree-%{V_html_tree}.tar.gz
+Source23:     http://www.cpan.org/modules/by-module/HTML/HTML-Table-%{V_html_table}.tar.gz
+Source24:     http://www.cpan.org/modules/by-module/HTML/HTML-TagReader-%{V_html_tagreader}.tar.gz
+Source25:     http://www.cpan.org/modules/by-module/HTML/HTML-SimpleParse-%{V_html_simpleparse}.tar.gz
+Source26:     http://www.cpan.org/authors/by-module/XML/XML-LibXML-Common-%{V_xml_libxml_common}.tar.gz
+Source27:     http://www.cpan.org/authors/by-module/XML/XML-LibXML-%{V_xml_libxml}.tar.gz
+Source28:     http://www.cpan.org/modules/by-module/XML/XML-LibXML-Iterator-%{V_xml_libxml_iterator}.tar.gz
+Source29:     http://www.cpan.org/modules/by-module/XML/XML-LibXML-XPathContext-%{V_xml_libxml_xpathcontext}.tar.gz
+Source30:     http://www.cpan.org/modules/by-module/XML/XML-XUpdate-LibXML-%{V_xml_xupdate_libxml}.tar.gz
+Source31:     http://www.cpan.org/modules/by-module/XML/XML-LibXSLT-%{V_xml_libxslt}.tar.gz
+Source32:     http://osdn.dl.sourceforge.net/sourceforge/xsh/XML-XSH-%{V_xml_xsh}.tar.gz
+Source33:     http://www.cpan.org/modules/by-module/XML/XML-GDOME-%{V_xml_gdome}.tar.gz
 
 #   build information
 Prefix:       %{l_prefix}
@@ -141,14 +147,17 @@ AutoReqProv:  no
 %description
     Perl modules for use with XML:
     - XML::Parser (%{V_xml_parser})
+    - XML::NodeFilter (%{V_xml_nodefilter})
 %if "%{with_libxml}" == "yes"
     - XML::LibXML::Common (%{V_xml_libxml_common})
     - XML::LibXML (%{V_xml_libxml})
+    - XML::LibXML::Iterator (%{V_xml_libxml_iterator})
+    - XML::LibXML::XPathContext (%{V_xml_libxml_xpathcontext})
     - XML::XUpdate::LibXML (%{V_xml_xupdate_libxml})
-    - XML::XSH (%{V_xml_xsh})
 %endif
 %if "%{with_libxslt}" == "yes"
     - XML::LibXSLT (%{V_xml_libxslt})
+    - XML::XSH (%{V_xml_xsh})
 %endif
 %if "%{with_libgdome}" == "yes"
     - XML::GDOME (%{V_xml_gdome})
@@ -209,7 +218,10 @@ AutoReqProv:  no
     %setup28 -q -T -D -a 28
     %setup29 -q -T -D -a 29
     %setup30 -q -T -D -a 30
-    #   FIXME: rse: required in XML-LibXML 1.53 for libxml 2.6.2
+    %setup31 -q -T -D -a 31
+    %setup32 -q -T -D -a 32
+    %setup33 -q -T -D -a 33
+    #   FIXME: rse: required in XML-LibXML 1.56 for libxml 2.6.x
     %{l_shtool} subst \
         -e 's;LIBXML_DLL_IMPORT extern;LIBXML_DLL_IMPORT;g' \
         XML-LibXML-%{V_xml_libxml}/LibXML.xs
@@ -246,17 +258,20 @@ AutoReqProv:  no
     %{l_prefix}/bin/perl-openpkg -d %{SOURCE22} configure build install
     %{l_prefix}/bin/perl-openpkg -d %{SOURCE23} configure build install
     %{l_prefix}/bin/perl-openpkg -d %{SOURCE24} configure build install
+    %{l_prefix}/bin/perl-openpkg -d %{SOURCE25} configure build install
 %if "%{with_libxml}" == "yes"
-    %{l_prefix}/bin/perl-openpkg -d %{SOURCE25} --args XMLPREFIX=%{l_prefix} configure build install
     %{l_prefix}/bin/perl-openpkg -d %{SOURCE26} --args XMLPREFIX=%{l_prefix} configure build install
     %{l_prefix}/bin/perl-openpkg -d %{SOURCE27} --args XMLPREFIX=%{l_prefix} configure build install
     %{l_prefix}/bin/perl-openpkg -d %{SOURCE28} configure build install
+    %{l_prefix}/bin/perl-openpkg -d %{SOURCE29} configure build install
+    %{l_prefix}/bin/perl-openpkg -d %{SOURCE30} --args XMLPREFIX=%{l_prefix} configure build install
 %endif
 %if "%{with_libxslt}" == "yes"
-    %{l_prefix}/bin/perl-openpkg -d %{SOURCE29} --args XMLPREFIX=%{l_prefix} configure build install
+    %{l_prefix}/bin/perl-openpkg -d %{SOURCE31} --args XMLPREFIX=%{l_prefix} configure build install
+    %{l_prefix}/bin/perl-openpkg -d %{SOURCE32} configure build install
 %endif
 %if "%{with_libgdome}" == "yes"
-    %{l_prefix}/bin/perl-openpkg -d %{SOURCE30} configure build install
+    %{l_prefix}/bin/perl-openpkg -d %{SOURCE33} configure build install
 %endif
 
     #   pre-activate the XML::SAX parsers