diff options
| -rw-r--r-- | .gbs.conf | 3 | ||||
| -rw-r--r-- | packaging/baselibs.conf | 2 | ||||
| -rw-r--r-- | packaging/libxslt.spec | 30 | ||||
| -rw-r--r-- | packaging/xslt-config.1.gz | bin | 472 -> 0 bytes | |||
| -rw-r--r-- | python/Makefile.am | 2 | ||||
| -rw-r--r-- | xslt-config.in | 2 | ||||
| -rw-r--r-- | xsltConf.sh.in | 2 | ||||
| -rw-r--r-- | xsltproc/xsltproc.c | 2 |
8 files changed, 16 insertions, 27 deletions
diff --git a/.gbs.conf b/.gbs.conf deleted file mode 100644 index 2877865d..00000000 --- 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 index d30a95dd..00000000 --- a/packaging/baselibs.conf +++ /dev/null @@ -1,2 +0,0 @@ -libxslt -libxslt-devel diff --git a/packaging/libxslt.spec b/packaging/libxslt.spec index cec05ee8..7c5ecbe8 100644 --- 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 Binary files differdeleted file mode 100644 index 6d437750..00000000 --- a/packaging/xslt-config.1.gz +++ /dev/null diff --git a/python/Makefile.am b/python/Makefile.am index af8c639a..fa58b78f 100644 --- 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 93351e84..45c3e28f 100644 --- 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 43ae001f..666774b6 100644 --- 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 7567258a..3c83abda 100644 --- 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++) { |