From 664d112a5ec91ba07d0e58e000ff7c66f36589af Mon Sep 17 00:00:00 2001
From: sibel <lesibel@free.fr>
Date: Tue, 28 Dec 2010 16:01:56 +0000
Subject: libxml2#2.7.8-2, maj port

---
 extra/libxml2/.footprint                       | 13 ++++++++++---
 extra/libxml2/.md5sum                          |  1 +
 extra/libxml2/Pkgfile                          |  9 ++++++---
 extra/libxml2/shared_library_versionning.patch | 21 +++++++++++++++++++++
 4 files changed, 38 insertions(+), 6 deletions(-)
 create mode 100644 extra/libxml2/shared_library_versionning.patch

(limited to 'extra/libxml2')

diff --git a/extra/libxml2/.footprint b/extra/libxml2/.footprint
index 196fbcedd..31377f99f 100644
--- a/extra/libxml2/.footprint
+++ b/extra/libxml2/.footprint
@@ -56,11 +56,18 @@ drwxr-xr-x	root/root	usr/include/libxml2/libxml/
 drwxr-xr-x	root/root	usr/lib/
 -rw-r--r--	root/root	usr/lib/libxml2.a
 -rwxr-xr-x	root/root	usr/lib/libxml2.la
-lrwxrwxrwx	root/root	usr/lib/libxml2.so -> libxml2.so.2.7.7
-lrwxrwxrwx	root/root	usr/lib/libxml2.so.2 -> libxml2.so.2.7.7
--rwxr-xr-x	root/root	usr/lib/libxml2.so.2.7.7
+lrwxrwxrwx	root/root	usr/lib/libxml2.so -> libxml2.so.2.7.8
+lrwxrwxrwx	root/root	usr/lib/libxml2.so.2 -> libxml2.so.2.7.8
+-rwxr-xr-x	root/root	usr/lib/libxml2.so.2.7.8
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/libxml-2.0.pc
+drwxr-xr-x	root/root	usr/lib/python2.7/
+drwxr-xr-x	root/root	usr/lib/python2.7/site-packages/
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/drv_libxml2.py
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/libxml2.py
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/libxml2mod.a
+-rwxr-xr-x	root/root	usr/lib/python2.7/site-packages/libxml2mod.la
+-rwxr-xr-x	root/root	usr/lib/python2.7/site-packages/libxml2mod.so
 -rw-r--r--	root/root	usr/lib/xml2Conf.sh
 drwxr-xr-x	root/root	usr/share/
 drwxr-xr-x	root/root	usr/share/aclocal/
diff --git a/extra/libxml2/.md5sum b/extra/libxml2/.md5sum
index f97674627..41575035c 100644
--- a/extra/libxml2/.md5sum
+++ b/extra/libxml2/.md5sum
@@ -1,3 +1,4 @@
 5ad4915665608ebfa5b89f7908467a72  largefile64.patch
 8127a65e8c3b08856093099b52599c86  libxml2-2.7.8.tar.gz
+84aeb7c6db023eae044e95d9211dba53  shared_library_versionning.patch
 0365d5397164b8739219e56e5ca069d1  zlib.patch
diff --git a/extra/libxml2/Pkgfile b/extra/libxml2/Pkgfile
index c00452fc6..febe37f90 100755
--- a/extra/libxml2/Pkgfile
+++ b/extra/libxml2/Pkgfile
@@ -6,16 +6,19 @@
 
 name=libxml2
 version=2.7.8
-release=1
+release=2
 source=(ftp://xmlsoft.org/libxml2/$name-$version.tar.gz \
 	largefile64.patch \
-	zlib.patch )
+	zlib.patch
+	shared_library_versionning.patch )
 
 build() {
 	cd $name-$version
-	patch -Np1 -i "$SRC/largefile64.patch"
+	patch -Np1 -i $SRC/largefile64.patch
+	patch -Np1 -i $SRC/shared_library_versionning.patch
 #	patch -p1 -i "$SRC/zlib.patch"
 
+	autoreconf -fi
 	./configure --prefix=/usr \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
diff --git a/extra/libxml2/shared_library_versionning.patch b/extra/libxml2/shared_library_versionning.patch
new file mode 100644
index 000000000..a0b62bca9
--- /dev/null
+++ b/extra/libxml2/shared_library_versionning.patch
@@ -0,0 +1,21 @@
+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
-- 
cgit v1.2.3-70-g09d2