rpms/tclxml/EL-4 tclxml.spec,1.13,1.14

[Michael Thomas (wart)]

Author: wart

Update of /cvs/extras/rpms/tclxml/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15645

Modified Files:
	tclxml.spec 
Log Message:
Rebase to F-8 which has a more compatible specfile for use with EL-4




Index: tclxml.spec
===================================================================
RCS file: /cvs/extras/rpms/tclxml/EL-4/tclxml.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- tclxml.spec	9 Feb 2008 16:49:59 -0000	1.13
+++ tclxml.spec	23 Jun 2008 23:19:39 -0000	1.14
@@ -3,7 +3,7 @@
 Summary: TclXML is a package that provides XML parsing for the Tcl scripting language
 Name:    tclxml
 Version: 3.1
-Release: 13%{?dist}
+Release: 11%{?dist}
 License: BSD
 Group:   Development/Libraries
 URL:     http://tclxml.sourceforge.net/
@@ -11,8 +11,8 @@
 Patch0:  tclxml.patch
 Patch1:  tclxml-3.1-sgmlversion.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  tcl-devel libxml2-devel expat-devel
-Requires:       tcl(abi) = 8.5 tcllib
+BuildRequires: tcl-devel libxml2-devel expat-devel
+Requires: tcl tcllib
 
 %description
 TclXML is a package that provides XML parsing for the Tcl scripting language.
@@ -88,11 +88,6 @@
 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
@@ -105,34 +100,27 @@
 
 %files
 %defattr(-,root,root)
-%dir %{tcl_sitearch}/Tclxml%{version}
-%{tcl_sitearch}/Tclxml%{version}/*.so
-%{tcl_sitearch}/Tclxml%{version}/*.tcl
+%dir %{_libdir}/Tclxml%{version}
+%{_libdir}/Tclxml%{version}/*.so
+%{_libdir}/Tclxml%{version}/*.tcl
 %doc LICENSE ANNOUNCE ChangeLog README RELNOTES
 %doc doc/*
 
 %files expat
 %defattr(-,root,root)
-%{tcl_sitearch}/%{name}-expat-%{version}
+%{_libdir}/Tclexpat%{version}
 
 %files libxml2
 %defattr(-,root,root)
-%{tcl_sitearch}/%{name}-libxml2-%{version}
+%{_libdir}/TclXML_libxml2%{version}
 
 %files devel
 %defattr(-,root,root)
 %{_includedir}/*
 %{_libdir}/TclxmlConfig.sh
-%{tcl_sitearch}/Tclxml%{version}/*.a
+%{_libdir}/Tclxml%{version}/*.a
 
 %changelog
-* Sat Feb 8 2008 Wart <wart at kobold.org> - 3.1-13
-- Better download URL
-- rebuild for gcc 4.3
-
-* 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.