Bump to libxslt 1.1.29

[Model] ALL
[BinType] AP
[Customer] OPEN

[Issue#] N/A
[Request] N/A
[Occurrence Version] N/A

[Problem] Bump to libxslt 1.1.29
[Cause & Measure] Bump to libxslt 1.1.29
[Checking Method] N/A

[Team] Open Source Management and Setting Part
[Developer] dh0128.kwak
[Solution company] Samsung
[Change Type] N/A

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

diff --git a/.gbs.conf b/.gbs.conf
deleted file mode 100644 (file)
index 2877865..0000000
--- a/.gbs.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-[general]
-upstream_branch = upstream/master
-upstream_tag = v${upstreamversion}

diff --git a/packaging/baselibs.conf b/packaging/baselibs.conf
deleted file mode 100644 (file)
index d30a95d..0000000
--- a/packaging/baselibs.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-libxslt
-libxslt-devel

diff --git a/packaging/libxslt.spec b/packaging/libxslt.spec
index cec05ee..7c5ecbe 100644 (file)
--- a/packaging/libxslt.spec
+++ b/packaging/libxslt.spec
@@ -1,14 +1,17 @@
+%define run_tests 0
+%if %{run_tests}
+    # check is defined off at .rpmmacros file.
+    %define check %%check
+%endif
+
 Name:           libxslt
-Version:        1.1.28
+Version:        1.1.29
 Release:        0
 Summary:        XSL Transformation Library
-License:        MIT and GPL-2.0+
+License:        MIT
 Group:          System/Libraries
 Url:            http://xmlsoft.org/XSLT/
 Source:         %{name}-%{version}.tar.bz2
-#X-Vcs-Url:     git://git.gnome.org/libxslt
-Source2:        baselibs.conf
-Source3:        xslt-config.1.gz
 Source1001:     libxslt.manifest
 BuildRequires:  libgcrypt-devel
 BuildRequires:  libgpg-error-devel
@@ -59,23 +62,17 @@ This package contains xsltproc, a command line interface to the XSLT engine.
 cp %{SOURCE1001} .
 
 %build
-%autogen --disable-static --with-pic --without-python
+%configure --disable-static --with-pic --without-python
 %__make %{?_smp_mflags}
 
 %check
-%if ! 0%{?qemu_user_space_build}
-%__make check
+%if %{run_tests}
+    %__make check || exit 0
 %endif
 
 %install
 %make_install
-
-# Unwanted doc stuff
-rm -fr %{buildroot}%{_datadir}/doc
-
-# the manual page is required
-install -ma=r '-t%{buildroot}%{_mandir}/man1' '%{SOURCE3}'
-
+%remove_docs
 
 %post -n libxslt -p /sbin/ldconfig
 
@@ -96,11 +93,8 @@ install -ma=r '-t%{buildroot}%{_mandir}/man1' '%{SOURCE3}'
 %{_includedir}/*
 %{_datadir}/aclocal/*
 %{_bindir}/xslt-config
-%doc %{_mandir}/man1/xslt-config.*
-%doc %{_mandir}/man3/*
 
 %files tools
 %manifest %{name}.manifest
 %defattr(-,root,root)
 %{_bindir}/xsltproc
-%doc %{_mandir}/man1/xsltproc.*

diff --git a/packaging/xslt-config.1.gz b/packaging/xslt-config.1.gz
deleted file mode 100644 (file)
index 6d43775..0000000
Binary files a/packaging/xslt-config.1.gz and /dev/null differ

diff --git a/python/Makefile.am b/python/Makefile.am
index af8c639..fa58b78 100644 (file)
--- a/python/Makefile.am
+++ b/python/Makefile.am
@@ -19,7 +19,7 @@ EXTRA_DIST =                  \
        libxslt-python-api.xml  \
        $(DOCS)
 
-libxsltmod_la_LDFLAGS =  $(WIN32_EXTRA_LDFLAGS) $(mylibs) -module -avoid-version
+libxsltmod_la_LDFLAGS =  $(WIN32_EXTRA_LDFLAGS) -module -avoid-version
 
 if WITH_PYTHON
 mylibs = \

diff --git a/xslt-config.in b/xslt-config.in
index 93351e8..45c3e28 100644 (file)
--- a/xslt-config.in
+++ b/xslt-config.in
@@ -89,7 +89,7 @@ while test $# -gt 0; do
     shift
 done
 
-the_libs="-lxslt"
+the_libs="@XSLT_LIBDIR@ @XSLT_LIBS@ @EXTRA_LIBS@"
 if test "$includedir" != "/usr/include"; then
     the_flags="$the_flags -I$includedir `@XML_CONFIG@ --cflags`"
 else

diff --git a/xsltConf.sh.in b/xsltConf.sh.in
index 43ae001..666774b 100644 (file)
--- a/xsltConf.sh.in
+++ b/xsltConf.sh.in
@@ -2,6 +2,6 @@
 # Configuration file for using the xslt library
 #
 XSLT_LIBDIR="@XSLT_LIBDIR@"
-XSLT_LIBS="-lxslt"
+XSLT_LIBS="@XSLT_LIBS@"
 XSLT_INCLUDEDIR="@XSLT_INCLUDEDIR@"
 MODULE_VERSION="xslt-@VERSION@"

diff --git a/xsltproc/xsltproc.c b/xsltproc/xsltproc.c
index 7567258..3c83abd 100644 (file)
--- a/xsltproc/xsltproc.c
+++ b/xsltproc/xsltproc.c
@@ -572,7 +572,7 @@ main(int argc, char **argv)
 
     sec = xsltNewSecurityPrefs();
     xsltSetDefaultSecurityPrefs(sec);
-    defaultEntityLoader = getenv("RPM_PACKAGE_NAME") ? xmlNoNetExternalEntityLoader : xmlGetExternalEntityLoader();
+    defaultEntityLoader = xmlGetExternalEntityLoader();
     xmlSetExternalEntityLoader(xsltprocExternalEntityLoader);
 
     for (i = 1; i < argc; i++) {