rpms/tclpro/F-7 tclpro.spec,1.1,1.2

[Michael Thomas (wart)]

Author: wart

Update of /cvs/extras/rpms/tclpro/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32345

Modified Files:
	tclpro.spec 
Log Message:
License tag clarification
Move to a tcl-specific directory for faster loading




Index: tclpro.spec
===================================================================
RCS file: /cvs/extras/rpms/tclpro/F-7/tclpro.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tclpro.spec	25 Nov 2006 23:50:24 -0000	1.1
+++ tclpro.spec	22 Aug 2007 01:41:19 -0000	1.2
@@ -1,10 +1,12 @@
+%{!?tcl_version: %define tcl_version %(echo 'puts $tcl_version' | tclsh)}
+%{!?tcl_sitelib: %define tcl_sitelib %{_datadir}/tcl%{tcl_version}}
 %define cvsdate 20061030
 
 Summary: Development and debugging tools for Tcl applications
 Name: tclpro
 Version: 1.5.0
-Release: 6.%{cvsdate}cvs%{?dist}
-License: BSD
+Release: 7.%{cvsdate}cvs%{?dist}
+License: TCL
 Group: Development/Tools
 # cvs -d:pserver:anonymous at tclpro.cvs.sourceforge.net:/cvsroot/tclpro export -D 2006-10-30 -d tclpro-20061030cvs tbcload
 # tar czf tclpro-20061030cvs.tgz ./tclpro-20061030cvs
@@ -20,7 +22,7 @@
 Patch5: tclpro-1.5.0-about.patch
 Patch6: tclpro-1.5.0-helpurl.patch
 URL: http://tclpro.sourceforge.net/
-Requires: tk >= 0:8.3.2 tcllib tclcompiler tcldebugger tclchecker
+Requires: tcl(abi) = 8.4 tk >= 0:8.3.2 tcllib tclcompiler tcldebugger tclchecker
 BuildRequires: tcl-devel autoconf
 BuildRequires: desktop-file-utils
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -49,7 +51,7 @@
 
 %build
 pushd modules/projectInfo
-%configure
+%configure --libdir=%{tcl_sitelib} --datadir=%{tcl_sitelib}
 make %{?_smp_mflags}
 popd
 
@@ -59,17 +61,17 @@
 make install DESTDIR=$RPM_BUILD_ROOT
 popd
 mkdir -p $RPM_BUILD_ROOT%{_bindir}
-sed -e 's#@imagedir@#%{_datadir}/tcldebugger1.4#' < modules/debugger/src/startup.tcl > $RPM_BUILD_ROOT/%{_bindir}/prodebug
+sed -e 's#@imagedir@#%{tcl_sitelib}/tcldebugger1.4#' < modules/debugger/src/startup.tcl > $RPM_BUILD_ROOT/%{_bindir}/prodebug
 chmod 755 $RPM_BUILD_ROOT/%{_bindir}/prodebug
 install -m 755 modules/checker/src/startup.tcl $RPM_BUILD_ROOT/%{_bindir}/procheck
 install -m 755 modules/compiler/src/startup.tcl $RPM_BUILD_ROOT/%{_bindir}/procompile
 
 # The Tcl compiler application needs an extra file/package to run.
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/procomp1.5
-install -m 644 %{SOURCE3} modules/compiler/src/procomp.tcl $RPM_BUILD_ROOT/%{_datadir}/procomp1.5/
+mkdir -p $RPM_BUILD_ROOT%{tcl_sitelib}/procomp1.5
+install -m 644 %{SOURCE3} modules/compiler/src/procomp.tcl $RPM_BUILD_ROOT/%{tcl_sitelib}/procomp1.5/
 
 # Fix a few file permissions for rpmlint
-chmod a-x $RPM_BUILD_ROOT%{_datadir}/projectInfo1.4/*.tcl
+chmod a-x $RPM_BUILD_ROOT%{tcl_sitelib}/projectInfo1.4/*.tcl
 
 
 desktop-file-install --vendor fedora                            \
@@ -87,12 +89,16 @@
 %{_bindir}/procheck
 %{_bindir}/prodebug
 %{_bindir}/procompile
-%{_datadir}/procomp1.5
-%{_datadir}/projectInfo1.4
+%{tcl_sitelib}/procomp1.5
+%{tcl_sitelib}/projectInfo1.4
 %{_datadir}/applications/fedora-tclpro.desktop
 %{_datadir}/pixmaps/prodebug.png
 
 %changelog
+* Tue Aug 21 2007 Wart <wart at kobold.org> 1.5.0-7.20061030cvs
+- License tag clarification
+- Move to a tcl-specific directory for faster loading
+
 * Tue Oct 31 2006 Wart <wart at kobold.org> 1.5.0-6.20061030cvs
 - Initial package for Fedora