Imported Upstream version 1.1.30_rc2

Change-Id: I7163f1e8d20d9963a92dea041decb566792ffad1
Signed-off-by: DongHun Kwak <dh0128.kwak@samsung.com>

diff --git a/libexslt/functions.c b/libexslt/functions.c
index 5fd48bc..3f4e92c 100644 (file)
--- a/libexslt/functions.c
+++ b/libexslt/functions.c
@@ -714,6 +714,7 @@ exsltFuncResultElem (xsltTransformContextPtr ctxt,
 
        ctxt->xpathCtxt->namespaces = comp->nsList;
        ctxt->xpathCtxt->nsNr = comp->nsNr;
+        ctxt->xpathCtxt->node = ctxt->node;
 
        ret = xmlXPathCompiledEval(comp->select, ctxt->xpathCtxt);
 
@@ -752,7 +753,7 @@ exsltFuncResultElem (xsltTransformContextPtr ctxt,
 
        oldInsert = ctxt->insert;
        ctxt->insert = (xmlNodePtr) container;
-       xsltApplyOneTemplate (ctxt, ctxt->xpathCtxt->node,
+       xsltApplyOneTemplate (ctxt, ctxt->node,
                              inst->children, NULL, NULL);
        ctxt->insert = oldInsert;
 

diff --git a/libxslt.spec b/libxslt.spec
index 900d95b..20299b5 100644 (file)
--- a/libxslt.spec
+++ b/libxslt.spec
@@ -1,10 +1,10 @@
 Summary: Library providing the GNOME XSLT engine
 Name: libxslt
 Version: 1.1.30
-Release: 0rc1%{?dist}%{?extra_release}
+Release: 0rc2%{?dist}%{?extra_release}
 License: MIT
 Group: Development/Libraries
-Source: ftp://xmlsoft.org/XSLT/libxslt-%{version}-rc1.tar.gz
+Source: ftp://xmlsoft.org/XSLT/libxslt-%{version}-rc2.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 URL: http://xmlsoft.org/XSLT/
 Requires: libxml2 >= 2.6.27
@@ -129,5 +129,5 @@ rm -fr %{buildroot}
 %doc python/tests/*.xsl
 
 %changelog
-* Tue Aug 29 2017 Daniel Veillard <veillard@redhat.com>
+* Thu Aug 31 2017 Daniel Veillard <veillard@redhat.com>
 - upstream release 1.1.30 see http://xmlsoft.org/XSLT/news.html

diff --git a/libxslt.spec.in b/libxslt.spec.in
index d1a9207..d9ed76e 100644 (file)
--- a/libxslt.spec.in
+++ b/libxslt.spec.in
@@ -1,10 +1,10 @@
 Summary: Library providing the GNOME XSLT engine
 Name: libxslt
 Version: @VERSION@
-Release: 0rc1%{?dist}%{?extra_release}
+Release: 0rc2%{?dist}%{?extra_release}
 License: MIT
 Group: Development/Libraries
-Source: ftp://xmlsoft.org/XSLT/libxslt-%{version}-rc1.tar.gz
+Source: ftp://xmlsoft.org/XSLT/libxslt-%{version}-rc2.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 URL: http://xmlsoft.org/XSLT/
 Requires: libxml2 >= @LIBXML_REQUIRED_VERSION@

diff --git a/python/Makefile.in b/python/Makefile.in
index 2ed442c..1cb49bc 100644 (file)
--- a/python/Makefile.in
+++ b/python/Makefile.in
@@ -796,8 +796,8 @@ distclean-generic:
 maintainer-clean-generic:
        @echo "This command is intended for maintainers to use"
        @echo "it deletes files that may require special tools to rebuild."
-@WITH_PYTHON_FALSE@uninstall-local:
 @WITH_PYTHON_FALSE@install-data-local:
+@WITH_PYTHON_FALSE@uninstall-local:
 clean: clean-recursive
 
 clean-am: clean-generic clean-libtool clean-pythonLTLIBRARIES \