diff options
| -rw-r--r-- | packaging/baselibs.conf | 7 | ||||
| -rw-r--r-- | packaging/libxslt-1.1.24-linkflags.patch | 13 | ||||
| -rw-r--r-- | packaging/libxslt-1.1.24-no-net-autobuild.patch | 11 | ||||
| -rw-r--r-- | packaging/libxslt-config-fixes.patch | 21 |
4 files changed, 52 insertions, 0 deletions
diff --git a/packaging/baselibs.conf b/packaging/baselibs.conf new file mode 100644 index 00000000..7284ca24 --- /dev/null +++ b/packaging/baselibs.conf @@ -0,0 +1,7 @@ +libxslt1 + obsoletes "libxslt-<targettype>" +libxslt-devel + requires -libxslt-<targettype> + requires "libxslt1-<targettype> = <version>" + obsoletes "libxslt-devel-<targettype> < <version>" + provides "libxslt-devel-<targettype> = <version>" diff --git a/packaging/libxslt-1.1.24-linkflags.patch b/packaging/libxslt-1.1.24-linkflags.patch new file mode 100644 index 00000000..222493a5 --- /dev/null +++ b/packaging/libxslt-1.1.24-linkflags.patch @@ -0,0 +1,13 @@ +Index: python/Makefile.am +=================================================================== +--- python/Makefile.am.orig 2009-05-12 08:29:34.000000000 +0200 ++++ python/Makefile.am 2010-07-21 15:22:21.000000000 +0200 +@@ -24,7 +24,7 @@ EXTRA_DIST = \ + libxslt-python-api.xml \ + $(DOCS) + +-libxsltmod_la_LDFLAGS = $(WIN32_EXTRA_LDFLAGS) -module -avoid-version ++libxsltmod_la_LDFLAGS = $(WIN32_EXTRA_LDFLAGS) $(mylibs) -module -avoid-version + + if WITH_PYTHON + mylibs = \ diff --git a/packaging/libxslt-1.1.24-no-net-autobuild.patch b/packaging/libxslt-1.1.24-no-net-autobuild.patch new file mode 100644 index 00000000..a6643843 --- /dev/null +++ b/packaging/libxslt-1.1.24-no-net-autobuild.patch @@ -0,0 +1,11 @@ +--- xsltproc/xsltproc.c ++++ xsltproc/xsltproc.c +@@ -544,7 +544,7 @@ + + sec = xsltNewSecurityPrefs(); + xsltSetDefaultSecurityPrefs(sec); +- defaultEntityLoader = xmlGetExternalEntityLoader(); ++ defaultEntityLoader = getenv("RPM_PACKAGE_NAME") ? xmlNoNetExternalEntityLoader : xmlGetExternalEntityLoader(); + xmlSetExternalEntityLoader(xsltprocExternalEntityLoader); + + for (i = 1; i < argc; i++) { diff --git a/packaging/libxslt-config-fixes.patch b/packaging/libxslt-config-fixes.patch new file mode 100644 index 00000000..57d455d0 --- /dev/null +++ b/packaging/libxslt-config-fixes.patch @@ -0,0 +1,21 @@ +--- xslt-config.in.orig ++++ xslt-config.in +@@ -89,7 +89,7 @@ while test $# -gt 0; do + shift + done + +-the_libs="@XSLT_LIBDIR@ @XSLT_LIBS@" ++the_libs="-lxslt" + if test "$includedir" != "/usr/include"; then + the_flags="$the_flags -I$includedir `@XML_CONFIG@ --cflags`" + else +--- xsltConf.sh.in.orig ++++ xsltConf.sh.in +@@ -2,6 +2,6 @@ + # Configuration file for using the xslt library + # + XSLT_LIBDIR="@XSLT_LIBDIR@" +-XSLT_LIBS="@XSLT_LIBS@" ++XSLT_LIBS="-lxslt" + XSLT_INCLUDEDIR="@XSLT_INCLUDEDIR@" + MODULE_VERSION="xslt-@VERSION@" |