rpms/tktable/devel tktable.spec,1.17,1.18

[Sergio Pascual (sergiopr)]

Author: sergiopr

Update of /cvs/pkgs/rpms/tktable/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32471

Modified Files:
	tktable.spec 
Log Message:
* Fri Jan 04 2008 Sergio Pascual <sergiopr at fedoraproject.org> 2.9-10
- Rebuilt for tcl 8.5
- Following PackagingDrafts/Tcl



Index: tktable.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tktable/devel/tktable.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- tktable.spec	1 Mar 2006 17:23:33 -0000	1.17
+++ tktable.spec	5 Jan 2008 14:59:54 -0000	1.18
@@ -1,7 +1,10 @@
+%{!?tcl_version: %define tcl_version %(echo 'puts $tcl_version' | tclsh)}
+%{!?tcl_sitearch: %define tcl_sitearch %{_libdir}/tcl%{tcl_version}}
+
 Summary: Table/matrix widget extension to Tcl/Tk
 Name: tktable
-Version: 2.9
-Release: 9%{?dist}
+Version: 2.10
+Release: 10%{?dist}
 License: BSD-like
 Group: Development/Libraries
 Source: http://download.sourceforge.net/tktable/Tktable2.9.tar.gz
@@ -10,6 +13,8 @@
 Requires: tk >= 8.4.7
 BuildRoot: %_tmppath/%name-%version-%release-root-%(%__id_u -n)
 
+Requires: tcl(abi) = 8.5
+
 %description
 Tktable provides a table/matrix widget for Tk programs. Features:
 multi-line cells, embedded windows, variable width columns/height rows
@@ -26,12 +31,12 @@
 # of Tcl (quoting bug in the file that was not exposed until bash
 # 3.1 was packaged with FC5)
 sed -i -e "s,relid',relid," configure
-%configure --with-tcl=%_libdir --with-tk=%_libdir --x-libraries=%_libdir --x-includes=%_includedir/X11
+%configure --with-tcl=%_libdir --with-tk=%_libdir --x-libraries=%_libdir --x-includes=%_includedir/X11 --libdir=%{tcl_sitearch}
 make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-DIRECTORY=$RPM_BUILD_ROOT%_libdir/%name%version
+DIRECTORY=$RPM_BUILD_ROOT%tcl_sitearch/%name%version
 install -d $DIRECTORY
 install -p libTktable2.9.so $DIRECTORY/
 install -m 644 -p pkgIndex.tcl library/tkTable.tcl $DIRECTORY
@@ -45,10 +50,14 @@
 %defattr(-,root,root)
 %doc ChangeLog README.txt README.blt license.txt doc/tkTable.html
 %_mandir/mann/tkTable.*
-%_libdir/%name%version
+%{tcl_sitearch}/%name%version
 
 
 %changelog
+* Fri Jan 04 2008 Sergio Pascual <sergiopr at fedoraproject.org> 2.9-10
+- Rebuilt for tcl 8.5
+- Following PackagingDrafts/Tcl
+
 * Tue Mar 1 2006 Jean-Luc Fontaine <jfontain at free.fr> 2.9-9
 - fixed problem in configuration stage