rpms/tclxml/devel tclxml.spec,1.11,1.12

[Michael Thomas (wart)]

Author: wart

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

Modified Files:
	tclxml.spec 
Log Message:
Rebuild for Tcl 8.5




Index: tclxml.spec
===================================================================
RCS file: /cvs/extras/rpms/tclxml/devel/tclxml.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- tclxml.spec	4 Feb 2007 21:34:23 -0000	1.11
+++ tclxml.spec	4 Jan 2008 08:02:48 -0000	1.12
@@ -3,7 +3,7 @@
 Summary: TclXML is a package that provides XML parsing for the Tcl scripting language
 Name: tclxml
 Version: 3.1
-Release: 11%{?dist}
+Release: 12%{?dist}
 License: BSD
 Group: Development/Libraries
 URL:	http://tclxml.sourceforge.net/
@@ -12,7 +12,7 @@
 Patch1: tclxml-3.1-sgmlversion.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: tcl-devel libxml2-devel expat-devel
-Requires: tcl tcllib
+Requires: tcl(abi) = 8.5 tcllib
 
 %description
 TclXML is a package that provides XML parsing for the Tcl scripting language.
@@ -88,6 +88,11 @@
 cd ../libxml2
 make install DESTDIR=$RPM_BUILD_ROOT
 
+mkdir -p $RPM_BUILD_ROOT%{tcl_sitearch}
+mv $RPM_BUILD_ROOT%{_libdir}/Tclxml3.1 $RPM_BUILD_ROOT%{tcl_sitearch}/
+mv $RPM_BUILD_ROOT%{_libdir}/TclXML_libxml23.1 $RPM_BUILD_ROOT%{tcl_sitearch}/%{name}-libxml2-%{version}
+mv $RPM_BUILD_ROOT%{_libdir}/Tclexpat3.1 $RPM_BUILD_ROOT%{tcl_sitearch}/%{name}-expat-%{version}
+
 # Remove the following header files which really don't need
 # to be installed.  They conflict with headers from
 # libwww-devel
@@ -100,27 +105,30 @@
 
 %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}/%{name}-expat-%{version}
 
 %files libxml2
 %defattr(-,root,root)
-%{_libdir}/TclXML_libxml2%{version}
+%{tcl_sitearch}/%{name}-libxml2-%{version}
 
 %files devel
 %defattr(-,root,root)
 %{_includedir}/*
 %{_libdir}/TclxmlConfig.sh
-%{_libdir}/Tclxml%{version}/*.a
+%{tcl_sitearch}/Tclxml%{version}/*.a
 
 %changelog
+* Thu Jan 3 2008 Wart <wart at kobold.org> - 3.1-12
+- Rebuild for Tcl 8.5
+
 * Sun Feb 4 2007 Wart <wart at kobold.org> - 3.1-11
 - Move package directory back to %%{_libdir} until %%{tcl_sitearch}
   is part of the default package search path in Tcl.