rpms/tcldom/EL-4 tcldom.spec,1.11,1.12

[Michael Thomas (wart)]

Author: wart

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

Modified Files:
	tcldom.spec 
Log Message:
Rebase to F-8




Index: tcldom.spec
===================================================================
RCS file: /cvs/extras/rpms/tcldom/EL-4/tcldom.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- tcldom.spec	9 Feb 2008 18:04:12 -0000	1.11
+++ tcldom.spec	28 Jun 2008 01:17:03 -0000	1.12
@@ -1,22 +1,21 @@
 %{!?tcl_version: %define tcl_version %(echo 'puts $tcl_version' | tclsh)}
 %{!?tcl_sitelib: %define tcl_sitelib %{_datadir}/tcl%{tcl_version}}
-%{!?tcl_sitearch: %define tcl_sitearch %{_libdir}/tcl%{tcl_version}}
 
 Summary: TclDOM is a package that provides a DOM binding for the Tcl scripting language
 Name: tcldom
 Version: 3.1
-Release: 12%{?dist}
+Release: 10%{?dist}
 License: BSD
 Group: Development/Libraries
 URL:   http://tclxml.sourceforge.net/
-Source0: http://downloads.sourceforge.net/tclxml/tcldom-3.1.tar.gz
+Source0: http://dl.sf.net/tclxml/tcldom-3.1.tar.gz
 Source1: pkgIndex.tcl.in.gui
 Patch0: tcldom.patch
 Patch1: tcldom-3.1-pkgprovides.patch
 Patch2: tcldom-3.1-cversion.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: tcl-devel libxml2-devel tclxml-devel expat-devel
-Requires: tcl(abi) = 8.5 tclxml tcllib
+Requires: tcl(abi) = 8.4 tclxml tcllib
 
 %description
 This package provides a DOM binding for Tcl.  It provides one of the following
@@ -88,15 +87,12 @@
 sed -e 's/@VERSION@/%{version}/' < library/pkgIndex.tcl.in > $RPM_BUILD_ROOT/%{tcl_sitelib}/%{name}%{version}/pkgIndex.tcl
 
 pushd src-libxml2
-mkdir -p $RPM_BUILD_ROOT%{tcl_sitearch}
 make install DESTDIR=$RPM_BUILD_ROOT
-mv $RPM_BUILD_ROOT%{_libdir}/tcldom_libxml23.1 $RPM_BUILD_ROOT%{tcl_sitearch}/%{name}_libxml2-%{version}
 popd
 
 pushd src
 make install DESTDIR=$RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT%{tcl_sitearch}
-mv $RPM_BUILD_ROOT%{_libdir}/tcldom3.1 $RPM_BUILD_ROOT%{tcl_sitearch}/%{name}_expat-%{version}
+mv $RPM_BUILD_ROOT%{_libdir}/tcldom3.1 $RPM_BUILD_ROOT%{_libdir}/%{name}_expat%{version}
 popd
 
 # Install the examples in a -gui subpackage
@@ -119,15 +115,15 @@
 
 %files expat
 %defattr(-,root,root)
-%dir %{tcl_sitearch}/%{name}_expat-%{version}
-%{tcl_sitearch}/%{name}_expat-%{version}/*.tcl
-%{tcl_sitearch}/%{name}_expat-%{version}/*.so
+%dir %{_libdir}/%{name}_expat%{version}
+%{_libdir}/%{name}_expat%{version}/*.tcl
+%{_libdir}/%{name}_expat%{version}/*.so
 
 %files libxml2
 %defattr(-,root,root)
-%dir %{tcl_sitearch}/%{name}_libxml2-%{version}
-%{tcl_sitearch}/%{name}_libxml2-%{version}/*.tcl
-%{tcl_sitearch}/%{name}_libxml2-%{version}/*.so
+%dir %{_libdir}/%{name}_libxml2%{version}
+%{_libdir}/%{name}_libxml2%{version}/*.tcl
+%{_libdir}/%{name}_libxml2%{version}/*.so
 
 %files gui
 %defattr(-,root,root)
@@ -138,16 +134,9 @@
 %defattr(-,root,root)
 %{_includedir}/*
 %{_libdir}/%{name}libxml2Config.sh
-%{tcl_sitearch}/%{name}_libxml2-%{version}/*.a
+%{_libdir}/%{name}_libxml2%{version}/*.a
 
 %changelog
-* Sat Feb 8 2008 Wart <wart at kobold.org> - 3.1-12
-- Rebuild for gcc 4.3
-
-* Thu Jan 3 2008 Wart <wart at kobold.org> - 3.1-11
-- Rebuild for Tcl 8.5
-- Better download URL
-
 * Fri Apr 13 2007 Wart <wart at kobold.org> - 3.1-10
 - Fix BuildRequires: for directory ownership in -devel subpackage