rpms/tclxml/devel tclxml.patch,1.1,1.2
Michael Thomas (wart)
fedora-extras-commits at redhat.com
Thu Jan 12 01:17:47 UTC 2006
Author: wart
Update of /cvs/extras/rpms/tclxml/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24576
Modified Files:
tclxml.patch
Log Message:
Fix quoting bug that only appears with bash >= 3.1. Adjust some *Config.sh values.
tclxml.patch:
Index: tclxml.patch
===================================================================
RCS file: /cvs/extras/rpms/tclxml/devel/tclxml.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tclxml.patch 5 Dec 2005 17:56:35 -0000 1.1
+++ tclxml.patch 12 Jan 2006 01:17:47 -0000 1.2
@@ -1,6 +1,6 @@
diff -Naur --exclude '*.swp' tclxml-3.1/configure tclxml-3.1.new/configure
--- tclxml-3.1/configure 2005-11-03 22:26:33.000000000 -0800
-+++ tclxml-3.1.new/configure 2005-11-26 23:47:56.000000000 -0800
++++ tclxml-3.1.new/configure 2006-01-11 16:59:27.000000000 -0800
@@ -1530,7 +1530,8 @@
# check in a few common install locations
@@ -11,9 +11,18 @@
`ls -d ${prefix}/lib 2>/dev/null` \
`ls -d /usr/local/lib 2>/dev/null` \
`ls -d /usr/contrib/lib 2>/dev/null` \
+@@ -3771,7 +3772,7 @@
+ # results, and the version is kept in special file).
+
+ if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then
+- system=MP-RAS-`awk '{print }' /etc/.relid'`
++ system=MP-RAS-`awk '{print }' /etc/.relid`
+ fi
+ if test "`uname -s`" = "AIX" ; then
+ system=AIX-`uname -v`.`uname -r`
diff -Naur --exclude '*.swp' tclxml-3.1/expat/configure tclxml-3.1.new/expat/configure
--- tclxml-3.1/expat/configure 2004-08-14 00:41:11.000000000 -0700
-+++ tclxml-3.1.new/expat/configure 2005-11-26 23:50:36.000000000 -0800
++++ tclxml-3.1.new/expat/configure 2006-01-11 17:07:15.000000000 -0800
@@ -1532,7 +1532,8 @@
# check in a few common install locations
@@ -24,6 +33,15 @@
`ls -d ${prefix}/lib 2>/dev/null` \
`ls -d /usr/local/lib 2>/dev/null` \
`ls -d /usr/contrib/lib 2>/dev/null` \
+@@ -3860,7 +3861,7 @@
+ # results, and the version is kept in special file).
+
+ if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then
+- system=MP-RAS-`awk '{print }' /etc/.relid'`
++ system=MP-RAS-`awk '{print }' /etc/.relid`
+ fi
+ if test "`uname -s`" = "AIX" ; then
+ system=AIX-`uname -v`.`uname -r`
diff -Naur --exclude '*.swp' tclxml-3.1/expat/Makefile.in tclxml-3.1.new/expat/Makefile.in
--- tclxml-3.1/expat/Makefile.in 2002-10-09 14:17:21.000000000 -0700
+++ tclxml-3.1.new/expat/Makefile.in 2005-11-27 12:46:23.000000000 -0800
@@ -37,7 +55,7 @@
-I$(srcdir)/xmlwf
diff -Naur --exclude '*.swp' tclxml-3.1/libxml2/configure tclxml-3.1.new/libxml2/configure
--- tclxml-3.1/libxml2/configure 2005-11-03 22:26:52.000000000 -0800
-+++ tclxml-3.1.new/libxml2/configure 2005-11-26 23:55:32.000000000 -0800
++++ tclxml-3.1.new/libxml2/configure 2006-01-11 17:07:25.000000000 -0800
@@ -1540,7 +1540,8 @@
# check in a few common install locations
@@ -48,6 +66,15 @@
`ls -d ${prefix}/lib 2>/dev/null` \
`ls -d /usr/local/lib 2>/dev/null` \
`ls -d /usr/contrib/lib 2>/dev/null` \
+@@ -3912,7 +3913,7 @@
+ # results, and the version is kept in special file).
+
+ if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then
+- system=MP-RAS-`awk '{print }' /etc/.relid'`
++ system=MP-RAS-`awk '{print }' /etc/.relid`
+ fi
+ if test "`uname -s`" = "AIX" ; then
+ system=AIX-`uname -v`.`uname -r`
@@ -5468,7 +5469,9 @@
for d in \
$with_xml2lib \
@@ -58,9 +85,21 @@
/usr/local/lib
do
if test -f "$d/libxml2.so" ; then
+@@ -5603,9 +5606,9 @@
+ # pkglibdir must be a fully qualified path and (not ${exec_prefix}/lib)
+ eval pkglibdir="${libdir}/${PACKAGE}${VERSION}"
+ if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then
+- eval tcllibxml2_LIB_FLAG="-ltcllibxml2${VERSION}${DBGX}"
++ eval tcllibxml2_LIB_FLAG="-lTclXML_libxml2${VERSION}${DBGX}"
+ else
+- eval tcllibxml2_LIB_FLAG="-ltcllibxml2`echo ${VERSION} | tr -d .`${DBGX}"
++ eval tcllibxml2_LIB_FLAG="-lTclXML_libxml2`echo ${VERSION} | tr -d .`${DBGX}"
+ fi
+ tcllibxml2_BUILD_LIB_SPEC="-L`pwd` ${tcllibxml2_LIB_FLAG}"
+ tcllibxml2_LIB_SPEC="-L${pkglibdir} ${tcllibxml2_LIB_FLAG}"
diff -Naur --exclude '*.swp' tclxml-3.1/libxml2/configure.in tclxml-3.1.new/libxml2/configure.in
--- tclxml-3.1/libxml2/configure.in 2004-08-14 00:41:11.000000000 -0700
-+++ tclxml-3.1.new/libxml2/configure.in 2005-11-26 23:54:28.000000000 -0800
++++ tclxml-3.1.new/libxml2/configure.in 2005-12-17 20:53:20.000000000 -0800
@@ -247,7 +247,9 @@
for d in \
$with_xml2lib \
@@ -71,6 +110,76 @@
/usr/local/lib
do
if test -f "$d/libxml2.so" ; then
+@@ -347,9 +349,9 @@
+ # pkglibdir must be a fully qualified path and (not ${exec_prefix}/lib)
+ eval pkglibdir="${libdir}/${PACKAGE}${VERSION}"
+ if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then
+- eval tcllibxml2_LIB_FLAG="-ltcllibxml2${VERSION}${DBGX}"
++ eval tcllibxml2_LIB_FLAG="-lTclXML_libxml2${VERSION}${DBGX}"
+ else
+- eval tcllibxml2_LIB_FLAG="-ltcllibxml2`echo ${VERSION} | tr -d .`${DBGX}"
++ eval tcllibxml2_LIB_FLAG="-lTclXML_libxml2`echo ${VERSION} | tr -d .`${DBGX}"
+ fi
+ tcllibxml2_BUILD_LIB_SPEC="-L`pwd` ${tcllibxml2_LIB_FLAG}"
+ tcllibxml2_LIB_SPEC="-L${pkglibdir} ${tcllibxml2_LIB_FLAG}"
+diff -Naur --exclude '*.swp' tclxml-3.1/libxml2/Makefile.in tclxml-3.1.new/libxml2/Makefile.in
+--- tclxml-3.1/libxml2/Makefile.in 2003-12-03 12:06:35.000000000 -0800
++++ tclxml-3.1.new/libxml2/Makefile.in 2005-12-17 19:58:39.000000000 -0800
+@@ -232,6 +232,8 @@
+ echo "Installing $$i" ; \
+ $(INSTALL_DATA) $$i $(DESTDIR)$(includedir)/tclxml-libxml2 ; \
+ done;
++ @mkdir -p $(DESTDIR)$(pkglibdir)
++ $(INSTALL_DATA) tcllibxml2Config.sh $(DESTDIR)$(libdir)
+ @echo "libraries done"
+
+ #========================================================================
+diff -Naur --exclude '*.swp' tclxml-3.1/libxml2/tcllibxml2Config.sh.in tclxml-3.1.new/libxml2/tcllibxml2Config.sh.in
+--- tclxml-3.1/libxml2/tcllibxml2Config.sh.in 2003-12-03 12:06:35.000000000 -0800
++++ tclxml-3.1.new/libxml2/tcllibxml2Config.sh.in 2005-12-17 20:25:15.000000000 -0800
+@@ -18,34 +18,34 @@
+ tclxml_libxml2_RELEASE_LEVEL='@PATCHLEVEL@'
+
+ # The name of the TclXML/libxml2 library (may be either a .a file or a shared library):
+-tclxml_libxml2_LIB_FILE=@tcldomxml_LIB_FILE@
++tclxml_libxml2_LIB_FILE=@tcllibxml2_LIB_FILE@
+
+ # String to pass to linker to pick up the tcldomxml library from its
+ # build directory.
+-tclxml_libxml2_BUILD_LIB_SPEC='@tclxml_libxml2_BUILD_LIB_SPEC@'
++tclxml_libxml2_BUILD_LIB_SPEC='@tcllibxml2_BUILD_LIB_SPEC@'
+
+ # String to pass to linker to pick up the TclXML/libxml2 library from its
+ # installed directory.
+-tclxml_libxml2_LIB_SPEC='@tclxml_libxml2_LIB_SPEC@'
++tclxml_libxml2_LIB_SPEC='@tcllibxml2_LIB_SPEC@'
+
+ # The name of the TclXML/libxml2 stub library (a .a file):
+-tclxml_libxml2_STUB_LIB_FILE=@tclxml_libxml2_stub_LIB_FILE@
++tclxml_libxml2_STUB_LIB_FILE=@tcllibxml2_stub_LIB_FILE@
+
+ # String to pass to linker to pick up the TclXML/libxml2 stub library from its
+ # build directory.
+-tclxml_libxml2_BUILD_STUB_LIB_SPEC='@tclxml_libxml2_BUILD_STUB_LIB_SPEC@'
++tclxml_libxml2_BUILD_STUB_LIB_SPEC='@tcllibxml2_BUILD_STUB_LIB_SPEC@'
+
+ # String to pass to linker to pick up the TclXML/libxml2 stub library from its
+ # installed directory.
+-tclxml_libxml2_STUB_LIB_SPEC='@tclxml_libxml2_STUB_LIB_SPEC@'
++tclxml_libxml2_STUB_LIB_SPEC='@tcllibxml2_STUB_LIB_SPEC@'
+
+ # String to pass to linker to pick up the TclXML/libxml2 stub library from its
+ # build directory.
+-tclxml_libxml2_BUILD_STUB_LIB_PATH='@tclxml_libxml2_BUILD_STUB_LIB_PATH@'
++tclxml_libxml2_BUILD_STUB_LIB_PATH='@tcllibxml2_BUILD_STUB_LIB_PATH@'
+
+ # String to pass to linker to pick up the TclXML/libxml2 stub library from its
+ # installed directory.
+-tclxml_libxml2_STUB_LIB_PATH='@tclxml_libxml2_STUB_LIB_PATH@'
++tclxml_libxml2_STUB_LIB_PATH='@tcllibxml2_STUB_LIB_PATH@'
+
+ # Location of the top-level source directories from which TclXML/libxml2
+ # was built. This is the directory that contains generic, unix, etc.
diff -Naur --exclude '*.swp' tclxml-3.1/tclconfig/tcl.m4 tclxml-3.1.new/tclconfig/tcl.m4
--- tclxml-3.1/tclconfig/tcl.m4 2003-12-03 12:06:35.000000000 -0800
+++ tclxml-3.1.new/tclconfig/tcl.m4 2005-11-27 11:58:42.000000000 -0800
More information about the fedora-extras-commits
mailing list