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

[Michael Thomas (wart)]

Author: wart

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

Modified Files:
	tclxml.spec 
Log Message:
Move install directory back to %{_libdir} so that it can be found in Tcl's
default package search path.




Index: tclxml.spec
===================================================================
RCS file: /cvs/extras/rpms/tclxml/devel/tclxml.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- tclxml.spec	2 Feb 2007 19:34:24 -0000	1.10
+++ tclxml.spec	4 Feb 2007 21:34:23 -0000	1.11
@@ -3,7 +3,7 @@
 Summary: TclXML is a package that provides XML parsing for the Tcl scripting language
 Name: tclxml
 Version: 3.1
-Release: 10%{?dist}
+Release: 11%{?dist}
 License: BSD
 Group: Development/Libraries
 URL:	http://tclxml.sourceforge.net/
@@ -46,7 +46,6 @@
 header files for the base, expat, and libxml2 subpackages.
 
 %prep
-echo "tcl_sitelib is %{tcl_sitelib}"
 %setup -q
 %patch0 -p1
 %patch1
@@ -96,39 +95,36 @@
 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 %{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}/Tclexpat%{version}
+%{_libdir}/Tclexpat%{version}
 
 %files libxml2
 %defattr(-,root,root)
-%{tcl_sitearch}/TclXML_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
+* 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.
+
 * Fri Feb 2 2007 Wart <wart at kobold.org> - 3.1-10
 - Fix sgmlparser version mismatch
 - Move package directories to tcl-specific directories