diff options
Diffstat (limited to 'source/l/libxml2')
| -rw-r--r-- | source/l/libxml2/libxml2-2.7.8.broken.versioning.diff | 23 | ||||
| -rwxr-xr-x | source/l/libxml2/libxml2.SlackBuild | 12 |
2 files changed, 4 insertions, 31 deletions
diff --git a/source/l/libxml2/libxml2-2.7.8.broken.versioning.diff b/source/l/libxml2/libxml2-2.7.8.broken.versioning.diff deleted file mode 100644 index c629d21a..00000000 --- a/source/l/libxml2/libxml2-2.7.8.broken.versioning.diff +++ /dev/null @@ -1,23 +0,0 @@ -From 00819877651b87842ed878898ba17dba489820f0 Mon Sep 17 00:00:00 2001 -From: Daniel Veillard <veillard@redhat.com> -Date: Thu, 04 Nov 2010 20:53:14 +0000 -Subject: Reactivate the shared library versionning script - ---- -diff --git a/configure.in b/configure.in -index 59d0629..a1d2c89 100644 ---- a/configure.in -+++ b/configure.in -@@ -84,7 +84,7 @@ else - esac - fi - AC_SUBST(VERSION_SCRIPT_FLAGS) --AM_CONDITIONAL([USE_VERSION_SCRIPT], [test -z "$VERSION_SCRIPT_FLAGS"]) -+AM_CONDITIONAL([USE_VERSION_SCRIPT], [test -n "$VERSION_SCRIPT_FLAGS"]) - - dnl - dnl We process the AC_ARG_WITH first so that later we can modify --- -cgit v0.8.3.1 - - diff --git a/source/l/libxml2/libxml2.SlackBuild b/source/l/libxml2/libxml2.SlackBuild index 23cce062..bd1b759a 100755 --- a/source/l/libxml2/libxml2.SlackBuild +++ b/source/l/libxml2/libxml2.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2008, 2009, 2010, 2011 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2010, 2011, 2012 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ PKGNAM=libxml2 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-3} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -68,10 +68,6 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -zcat $CWD/libxml2-2.7.8.broken.versioning.diff.gz | patch -p1 --verbose || exit 1 -# This is needed after the patch above: -autoreconf || exit 1 - CFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ @@ -104,8 +100,8 @@ cat $CWD/slack-desc > $PKG/install/slack-desc # Be sure to clobber any .pyc files that might have been generated so that # the new .py files will be used instead of the already compiled copies cat << EOF > $PKG/install/doinst.sh -rm -f /usr/lib${LIBDIRSUFFIX}/python26/site-packages/libxml2.pyc -rm -f /usr/lib${LIBDIRSUFFIX}/python26/site-packages/drv_libxml2.pyc +rm -f /usr/lib${LIBDIRSUFFIX}/python2.7/site-packages/libxml2.pyc +rm -f /usr/lib${LIBDIRSUFFIX}/python2.7/site-packages/drv_libxml2.pyc EOF cd $PKG |