rpms/tclxml/devel tclxml-3.1-sgmlversion.patch, NONE, 1.1 tclxml.spec, 1.9, 1.10

[Michael Thomas (wart)]

Author: wart

Update of /cvs/extras/rpms/tclxml/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7313

Modified Files:
	tclxml.spec 
Added Files:
	tclxml-3.1-sgmlversion.patch 
Log Message:
- Fix sgmlparser version mismatch
- Move package directories to tcl-specific directories



tclxml-3.1-sgmlversion.patch:

--- NEW FILE tclxml-3.1-sgmlversion.patch ---
--- library/sgmlparser.tcl.orig	2007-02-02 09:09:04.000000000 -0800
+++ library/sgmlparser.tcl	2007-02-02 09:09:12.000000000 -0800
@@ -20,7 +20,7 @@
 
 package require uri 1.1
 
-package provide sgmlparser 1.0
+package provide sgmlparser 1.1
 
 namespace eval sgml {
     namespace export tokenise parseEvent


Index: tclxml.spec
===================================================================
RCS file: /cvs/extras/rpms/tclxml/devel/tclxml.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- tclxml.spec	28 Aug 2006 16:39:14 -0000	1.9
+++ tclxml.spec	2 Feb 2007 19:34:24 -0000	1.10
@@ -1,14 +1,17 @@
+%{!?tcl_sitearch: %define tcl_sitearch %{_libdir}/tcl%(echo 'puts $tcl_version' | tclsh)}
+
 Summary: TclXML is a package that provides XML parsing for the Tcl scripting language
 Name: tclxml
 Version: 3.1
-Release: 9%{?dist}
+Release: 10%{?dist}
 License: BSD
 Group: Development/Libraries
 URL:	http://tclxml.sourceforge.net/
 Source: http://dl.sf.net/tclxml/tclxml-3.1.tar.gz
 Patch0: tclxml.patch
+Patch1: tclxml-3.1-sgmlversion.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: tcl tcl-devel libxml2-devel expat-devel
+BuildRequires: tcl-devel libxml2-devel expat-devel
 Requires: tcl tcllib
 
 %description
@@ -43,8 +46,10 @@
 header files for the base, expat, and libxml2 subpackages.
 
 %prep
+echo "tcl_sitelib is %{tcl_sitelib}"
 %setup -q
 %patch0 -p1
+%patch1
 
 # Clean up rpmlint warning about line endings on
 # one of the documentation files.
@@ -91,32 +96,43 @@
 rm -f $RPM_BUILD_ROOT/usr/include/xmltok.h
 rm -f $RPM_BUILD_ROOT/usr/include/xmlrole.h
 
+# Don't pollute the system lib directory; move this package to
+# a tcl-specific location
+mkdir -p $RPM_BUILD_ROOT%{tcl_sitearch}
+mv $RPM_BUILD_ROOT%{_libdir}/Tclxml%{version} $RPM_BUILD_ROOT%{tcl_sitearch}/Tclxml%{version}
+mv $RPM_BUILD_ROOT%{_libdir}/Tclexpat%{version} $RPM_BUILD_ROOT%{tcl_sitearch}/Tclexpat%{version}
+mv $RPM_BUILD_ROOT%{_libdir}/TclXML_libxml2%{version} $RPM_BUILD_ROOT%{tcl_sitearch}/TclXML_libxml2%{version}
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
-%dir %{_libdir}/Tclxml%{version}
-%{_libdir}/Tclxml%{version}/*.so
-%{_libdir}/Tclxml%{version}/*.tcl
+%dir %{tcl_sitearch}/Tclxml%{version}
+%{tcl_sitearch}/Tclxml%{version}/*.so
+%{tcl_sitearch}/Tclxml%{version}/*.tcl
 %doc LICENSE ANNOUNCE ChangeLog README RELNOTES
 %doc doc/*
 
 %files expat
 %defattr(-,root,root)
-%{_libdir}/Tclexpat%{version}
+%{tcl_sitearch}/Tclexpat%{version}
 
 %files libxml2
 %defattr(-,root,root)
-%{_libdir}/TclXML_libxml2%{version}
+%{tcl_sitearch}/TclXML_libxml2%{version}
 
 %files devel
 %defattr(-,root,root)
 %{_includedir}/*
 %{_libdir}/TclxmlConfig.sh
-%{_libdir}/Tclxml%{version}/*.a
+%{tcl_sitearch}/Tclxml%{version}/*.a
 
 %changelog
+* Fri Feb 2 2007 Wart <wart at kobold.org> - 3.1-10
+- Fix sgmlparser version mismatch
+- Move package directories to tcl-specific directories
+
 * Mon Aug 28 2006 Wart <wart at kobold.org> - 3.1-9
 - Rebuild for Fedora Extras