rpms/tdom/EL-4 tdom.spec,1.5,1.6

[Michael Thomas (wart)]

Author: wart

Update of /cvs/pkgs/rpms/tdom/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9104

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




Index: tdom.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tdom/EL-4/tdom.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- tdom.spec	4 Jun 2008 19:47:26 -0000	1.5
+++ tdom.spec	25 Jun 2008 22:02:40 -0000	1.6
@@ -1,8 +1,6 @@
-%{!?tcl_sitearch: %define tcl_sitearch %{_libdir}/tcl%(echo 'puts $tcl_version' | tclsh)}
-
 Name:           tdom
 Version:        0.8.2
-Release:        4%{?dist}
+Release:        2%{?dist}
 Summary:        DOM parser for Tcl
 
 Group:          Development/Libraries
@@ -15,7 +13,6 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  tcl-devel expat-devel
-Requires:       tcl(abi) = 8.5
 
 %description
 tDOM combines high performance XML data processing with easy and powerful Tcl
@@ -38,19 +35,11 @@
 %configure --enable-threads
 make %{?_smp_mflags}
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
-mkdir -p $RPM_BUILD_ROOT%{tcl_sitearch}
-mv $RPM_BUILD_ROOT%{_libdir}/%{name}%{version}/*.so $RPM_BUILD_ROOT%{_libdir}
-mv $RPM_BUILD_ROOT%{_libdir}/%{name}%{version}/*.a $RPM_BUILD_ROOT%{_libdir}
-mv $RPM_BUILD_ROOT%{_libdir}/%{name}%{version} $RPM_BUILD_ROOT%{tcl_sitearch}
-
-# Adjust some paths to reflect the new file locations
-sed -i -e 's/file join $dir libtdom/file join $dir .. .. libtdom/' $RPM_BUILD_ROOT%{tcl_sitearch}/%{name}%{version}/pkgIndex.tcl
-
-sed -i -e "s#%{_libdir}/%{name}%{version}#%{_libdir}#" $RPM_BUILD_ROOT%{_libdir}/tdomConfig.sh
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -59,9 +48,8 @@
 %files
 %defattr(-,root,root,-)
 %doc README LICENSE CHANGES ChangeLog doc/*.html NPL-1_1Final.html
-%{tcl_sitearch}/%{name}%{version}
-%{_libdir}/*.so
-%exclude %{_libdir}/*.a
+%{_libdir}/%{name}%{version}
+%exclude %{_libdir}/%{name}%{version}/*.a
 %{_mandir}/mann/*.gz
 
 %files devel
@@ -69,18 +57,12 @@
 %{_libdir}/%{name}Config.sh
 # This static library is a 'stub' library that is used to assist with
 # shared lib linking across library versions:  http://wiki.tcl.tk/285
-%{_libdir}/*.a
+%{_libdir}/%{name}%{version}/*.a
 %{_includedir}/*.h
 
 
 
 %changelog
-* Wed Jun 4 2008 Wart <wart at kobold.org> - 0.8.2-4
-- Change installation directory for faster loading
-
-* Sat Feb 9 2008 Wart <wart at kobold.org> - 0.8.2-3
-- Rebuild for gcc 4.3
-
 * Sun Sep 23 2007 Wart <wart at kobold.org> - 0.8.2-2
 - Added missing linkage against -lexpat