rpms/tclpro/EL-5 tclpro-compiler-startup.patch, 1.1, 1.2 tclpro.desktop, 1.1, 1.2 tclpro.spec, 1.2, 1.3

Wed Jan 28 22:46:06 UTC 2009

Author: wart

Update of /cvs/pkgs/rpms/tclpro/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4939

Modified Files:
	tclpro-compiler-startup.patch tclpro.desktop tclpro.spec 
Log Message:
Initial build for EPEL5; Import files from EL-4


tclpro-compiler-startup.patch:

Index: tclpro-compiler-startup.patch
===================================================================
RCS file: /cvs/pkgs/rpms/tclpro/EL-5/tclpro-compiler-startup.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2

--- tclpro-compiler-startup.patch	25 Nov 2006 23:50:24 -0000	1.1
+++ tclpro-compiler-startup.patch	28 Jan 2009 22:45:36 -0000	1.2
@@ -1,10 +1,18 @@
---- modules/compiler/src/startup.tcl.orig	2006-11-01 21:39:11.000000000 -0800
-+++ modules/compiler/src/startup.tcl	2006-11-01 21:39:38.000000000 -0800
+--- tclpro-20061030cvs/modules/compiler/src/startup.tcl.orig	2007-12-15 21:05:59.000000000 -0800
++++ tclpro-20061030cvs/modules/compiler/src/startup.tcl	2007-12-15 21:08:34.000000000 -0800
 @@ -1,3 +1,7 @@
 +#!/bin/sh
 +# \
-+exec wish "$0" ${1+"$@"}
++exec tclsh "$0" ${1+"$@"}
 +
  # startup.tcl --
  #
  #  Startup script for the TclPro bytecode compiler.
+@@ -13,6 +17,7 @@
+ 
+ package require projectInfo
+ package require cmdline
++package require procomp 1.0
+ 
+ # Set up hook to check TclPro license keys.
+ 


Index: tclpro.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/tclpro/EL-5/tclpro.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tclpro.desktop	25 Nov 2006 23:50:24 -0000	1.1
+++ tclpro.desktop	28 Jan 2009 22:45:36 -0000	1.2
@@ -7,5 +7,5 @@
 Icon=prodebug.png
 Terminal=false
 Type=Application
-Categories=Application;Programming;Development;
-Version=1.5.0
+Categories=Application;Development;Debugger;
+Version=1.0


Index: tclpro.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tclpro/EL-5/tclpro.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tclpro.spec	22 Aug 2007 01:42:59 -0000	1.2
+++ tclpro.spec	28 Jan 2009 22:45:36 -0000	1.3
@@ -1,9 +1,11 @@
+%{!?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: 7.%{cvsdate}cvs%{?dist}
+Release: 11.%{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
@@ -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 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)
@@ -33,13 +35,13 @@
 
 %prep
 %setup -q -n %{name}-%{cvsdate}cvs
-%patch0
-%patch1
-%patch2
-%patch3
-%patch4
-%patch5
-%patch6
+%patch0 -p0
+%patch1 -p0
+%patch2 -p1
+%patch3 -p0
+%patch4 -p0
+%patch5 -p0
+%patch6 -p0
 
 for i in debugger checker projectInfo compiler ; do 
     pushd modules/$i
@@ -49,7 +51,7 @@
 
 %build
 pushd modules/projectInfo
-%configure
+%configure --libdir=%{tcl_sitelib} --datadir=%{tcl_sitelib}
 make %{?_smp_mflags}
 popd
 
@@ -59,17 +61,18 @@
 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 modules/compiler/src/procomp.tcl $RPM_BUILD_ROOT/%{tcl_sitelib}/procomp1.5/
+install -m 644 %{SOURCE3} $RPM_BUILD_ROOT/%{tcl_sitelib}/procomp1.5/pkgIndex.tcl
 
 # 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                            \
@@ -82,19 +85,33 @@
 rm -rf $RPM_BUILD_ROOT
 
 %files
-%doc ChangeLog
 %defattr(-,root,root)
+%doc ChangeLog
 %{_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
+* Wed Jan 28 2009 Wart <wart at kobold.org> 1.5.0-11.20061030cvs
+- Rebuild for EPEL4
+
+* Sat Dec 15 2007 Wart <wart at kobold.org> 1.5.0-10.20061030cvs
+- Fix startup bug with procompile (BZ #425807)
+
+* Tue Aug 21 2007 Wart <wart at kobold.org> 1.5.0-9.20061030cvs
 - License tag clarification
 
+* Sat Aug 11 2007 Wart <wart at kobold.org> 1.5.0-8.20061030cvs
+- Use correct version in .desktop file
+- Clean up .desktop file categories
+
+* Sat Jun 2 2007 Wart <wart at kobold.org> 1.5.0-7.20061030cvs
+- 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
 


