rpms/tclxml/devel tclxml.patch,1.2,1.3 tclxml.spec,1.5,1.6
Michael Thomas (wart)
fedora-extras-commits at redhat.com
Thu Jan 12 01:43:48 UTC 2006
Author: wart
Update of /cvs/extras/rpms/tclxml/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24985
Modified Files:
tclxml.patch tclxml.spec
Log Message:
Remove broken parts of patch
Clean up build root before installing.
tclxml.patch:
Index: tclxml.patch
===================================================================
RCS file: /cvs/extras/rpms/tclxml/devel/tclxml.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tclxml.patch 12 Jan 2006 01:17:47 -0000 1.2
+++ tclxml.patch 12 Jan 2006 01:43:48 -0000 1.3
@@ -85,18 +85,6 @@
/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-12-17 20:53:20.000000000 -0800
@@ -110,76 +98,6 @@
/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
Index: tclxml.spec
===================================================================
RCS file: /cvs/extras/rpms/tclxml/devel/tclxml.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- tclxml.spec 12 Jan 2006 01:28:34 -0000 1.5
+++ tclxml.spec 12 Jan 2006 01:43:48 -0000 1.6
@@ -1,7 +1,7 @@
Summary: TclXML is a package that provides XML parsing for the Tcl scripting language
Name: tclxml
Version: 3.1
-Release: 5%{?dist}
+Release: 6%{?dist}
License: BSD
Group: Development/Libraries
URL: http://tclxml.sourceforge.net/
@@ -83,6 +83,7 @@
make %{?_smp_mflags}
%install
+rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
cd expat
make install DESTDIR=$RPM_BUILD_ROOT
@@ -122,6 +123,9 @@
%{_libdir}/Tclxml%{version}/*.a
%changelog
+* Wed Jan 11 2006 Wart <wart at kobold.org> - 3.1-6
+- Remove broken parts of patch
+- Clean up build root before installing.
* Wed Jan 11 2006 Wart <wart at kobold.org> - 3.1-5
- Added missing ChangeLog entries.
* Wed Jan 11 2006 Wart <wart at kobold.org> - 3.1-4
More information about the fedora-extras-commits
mailing list