rpms/tclpro/devel procomp_pkgIndex.tcl, NONE, 1.1 prodebug.png, NONE, 1.1 tclpro-1.5.0-about.patch, NONE, 1.1 tclpro-1.5.0-helpurl.patch, NONE, 1.1 tclpro-1.5.0-tclm4cvs.patch, NONE, 1.1 tclpro-checker-startup.patch, NONE, 1.1 tclpro-compiler-package.patch, NONE, 1.1 tclpro-compiler-startup.patch, NONE, 1.1 tclpro-projectInfo.patch, NONE, 1.1 tclpro.desktop, NONE, 1.1 tclpro.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

Michael Thomas (wart) fedora-extras-commits at redhat.com
Sat Nov 25 23:50:54 UTC 2006


Author: wart

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

Modified Files:
	.cvsignore sources 
Added Files:
	procomp_pkgIndex.tcl prodebug.png tclpro-1.5.0-about.patch 
	tclpro-1.5.0-helpurl.patch tclpro-1.5.0-tclm4cvs.patch 
	tclpro-checker-startup.patch tclpro-compiler-package.patch 
	tclpro-compiler-startup.patch tclpro-projectInfo.patch 
	tclpro.desktop tclpro.spec 
Log Message:
auto-import tclpro-1.5.0-6.20061030cvs on branch devel from tclpro-1.5.0-6.20061030cvs.src.rpm


--- NEW FILE procomp_pkgIndex.tcl ---
package ifneeded procomp 1.0 [list source [file join $dir procomp.tcl]]

tclpro-1.5.0-about.patch:

--- NEW FILE tclpro-1.5.0-about.patch ---
--- modules/debugger/src/startup.tcl.orig	2006-11-01 15:41:10.000000000 -0800
+++ modules/debugger/src/startup.tcl	2006-11-01 21:38:34.000000000 -0800
@@ -1,3 +1,7 @@
+#!/bin/sh
+# \
+exec wish "$0" ${1+"$@"}
+
 # startup.tcl --
 #
 #	This file is the primary entry point for the 
@@ -11,11 +15,13 @@
 # Initialize the debugger library
 
 package require projectInfo
+  
+set imageDir @imagedir@
 
 # Specify the additional debugger parameters.
 
 set parameters [list \
-	aboutCmd {::TclProAboutBox images/about.gif images/logo.gif} \
+	aboutCmd "::TclProAboutBox $imageDir/images/about.gif $imageDir/images/logo.gif" \
 	aboutCopyright "$::projectInfo::copyright\nVersion $::projectInfo::patchLevel" \
 	appType local \
 	]
@@ -24,7 +30,7 @@
     package require Winico
     lappend parameters iconImage [winico load dbg scicons.dll]
 } else {
-    lappend parameters iconImage images/debugUnixIcon.gif
+    lappend parameters iconImage $imageDir/images/debugUnixIcon.gif
 }
 
 # ::TclProAboutBox --
@@ -73,23 +79,17 @@
     set f2 [frame $f1.f2 -bg white -bd 0]
     pack $f2 -padx 6 -pady 6 -side bottom -fill both -expand 1
 
-    label $f2.logo -bd 0 -bg white -padx 0 -pady 0 -highlightthickness 0 \
-	    -image logo
-    pack $f2.logo -side left -anchor nw -padx 0 -pady 0
-
-if {0} {
-    # No room for this
     set okBut [button $f2.ok -text "OK" -width 6 -default active \
 	    -command {destroy .about}]
-    pack $okBut -side right -anchor se -padx 0 -pady 0
-}
+    pack $okBut -side left -anchor nw -padx 0 -pady 0
 
     label $f2.version -bd 0 -bg white -padx 10 -pady 0 -highlightthickness 0 \
-	    -text $::debugger::parameters(aboutCopyright) -justify left
+	    -text $::debugger::parameters(aboutCopyright) -justify left \
+            -wraplength 400
     pack $f2.version -side top -anchor nw
 
     label $f2.url -bd 0 -bg white -padx 10 -pady 0 -highlightthickness 0 \
-	    -text "http://www.ajubasolutions.com" -fg blue \
+	    -text "http://tclpro.sourceforge.net" -fg blue \
 	    -cursor hand2
     pack $f2.url -side top -anchor nw
 

tclpro-1.5.0-helpurl.patch:

--- NEW FILE tclpro-1.5.0-helpurl.patch ---
--- modules/projectInfo/projectInfo.tcl.orig	2006-11-01 16:10:57.000000000 -0800
+++ modules/projectInfo/projectInfo.tcl	2006-11-01 16:11:05.000000000 -0800
@@ -215,7 +215,7 @@
 	set helpFile(thisProduct) $tmp
     } else {
 	set helpFile(thisProduct) \
-		http://www.ajubasolutions.com/products/tclpro/doc/
+		http://tclpro.sourceforge.net
     }
 
     # By defining these variables the startup sequence will check licenses

tclpro-1.5.0-tclm4cvs.patch:

--- NEW FILE tclpro-1.5.0-tclm4cvs.patch ---
--- config/tcl.m4.orig	2006-11-01 12:17:21.000000000 -0800
+++ config/tcl.m4	2006-11-01 12:18:23.000000000 -0800
@@ -68,7 +68,10 @@
 
 	    # check in a few common install locations
 	    if test x"${ac_cv_c_tclconfig}" = x ; then
-		for i in `ls -d ${prefix}/lib 2>/dev/null` \
+		for i in `ls -d ${libdir} 2>/dev/null` \
+		        `ls -d ${exec_prefix}/lib 2>/dev/null` \
+		        `ls -d ${prefix}/lib 2>/dev/null` \
+			`ls -d /usr/lib64 2>/dev/null` \
 			`ls -d /usr/lib 2>/dev/null` \
 			`ls -d /usr/local/lib 2>/dev/null` ; do
 		    if test -f "$i/tclConfig.sh" ; then
@@ -161,7 +164,10 @@
 	    fi
 	    # check in a few common install locations
 	    if test x"${ac_cv_c_tkconfig}" = x ; then
-		for i in `ls -d ${prefix}/lib 2>/dev/null` \
+		for i in `ls -d ${libdir} 2>/dev/null` \
+		        `ls -d ${exec_prefix}/lib 2>/dev/null` \
+		        `ls -d ${prefix}/lib 2>/dev/null` \
+			`ls -d /usr/lib64 2>/dev/null` \
 			`ls -d /usr/lib 2>/dev/null` \
 			`ls -d /usr/local/lib 2>/dev/null` ; do
 		    if test -f "$i/tkConfig.sh" ; then
@@ -588,7 +594,7 @@
 	    # results, and the version is kept in special file).
 	
 	    if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then
-		system=MP-RAS-`awk '{print $3}' /etc/.relid'`
+		system=MP-RAS-`awk '{print $3}' /etc/.relid`
 	    fi
 	    if test "`uname -s`" = "AIX" ; then
 		system=AIX-`uname -v`.`uname -r`
@@ -1580,7 +1586,7 @@
 	    # results, and the version is kept in special file).
 	
 	    if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then
-		system=MP-RAS-`awk '{print $3}' /etc/.relid'`
+		system=MP-RAS-`awk '{print $3}' /etc/.relid`
 	    fi
 	    if test "`uname -s`" = "AIX" ; then
 		system=AIX-`uname -v`.`uname -r`

tclpro-checker-startup.patch:

--- NEW FILE tclpro-checker-startup.patch ---
--- modules/checker/src/startup.tcl.orig	2006-11-01 21:37:22.000000000 -0800
+++ modules/checker/src/startup.tcl	2006-11-01 21:38:46.000000000 -0800
@@ -1,3 +1,7 @@
+#!/bin/sh
+# \
+exec wish "$0" ${1+"$@"}
+
 # startup.tcl --
 #
 #	This file is the primary entry point for the 

tclpro-compiler-package.patch:

--- NEW FILE tclpro-compiler-package.patch ---
Index: modules/compiler/src/procomp.tcl
===================================================================
RCS file: /cvsroot/tclpro/tclpro/modules/compiler/src/procomp.tcl,v
retrieving revision 1.4
diff -c -r1.4 procomp.tcl
*** modules/compiler/src/procomp.tcl	8 Feb 2001 21:40:55 -0000	1.4
--- modules/compiler/src/procomp.tcl	29 Nov 2005 19:41:41 -0000
***************
*** 20,25 ****
--- 20,26 ----
  
  package require Tcl 8.0
  package require compiler 1.0
+ package require cmdline
  
  package provide procomp 1.0
  

tclpro-compiler-startup.patch:

--- NEW FILE tclpro-compiler-startup.patch ---
--- 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
@@ -1,3 +1,7 @@
+#!/bin/sh
+# \
+exec wish "$0" ${1+"$@"}
+
 # startup.tcl --
 #
 #  Startup script for the TclPro bytecode compiler.

tclpro-projectInfo.patch:

--- NEW FILE tclpro-projectInfo.patch ---
Index: modules/projectInfo/Makefile.in
===================================================================
RCS file: /cvsroot/tclpro/tclpro/modules/projectInfo/Makefile.in,v
retrieving revision 1.1.1.1
diff -c -r1.1.1.1 Makefile.in
*** modules/projectInfo/Makefile.in	23 Nov 1999 22:04:18 -0000	1.1.1.1
--- modules/projectInfo/Makefile.in	29 Nov 2005 01:13:02 -0000
***************
*** 29,35 ****
  exec_prefix = @exec_prefix@
  bindir = @bindir@
  
! pkglibdir = ${prefix}/lib/@PACKAGE@@VERSION@
  
  top_builddir = .
  
--- 29,35 ----
  exec_prefix = @exec_prefix@
  bindir = @bindir@
  
! pkgdatadir = @datadir@/@PACKAGE@@VERSION@
  
  top_builddir = .
  
***************
*** 70,85 ****
  install-binaries:
  
  install-libraries: installdirs
! 	@echo "Installing script files in $(pkglibdir)"
  	@for i in $(PROJECTINFO_SOURCES) ; do \
! 	    $(INSTALL_SCRIPT) $(srcdir)/$$i $(pkglibdir) ; \
  	done;
! 	$(INSTALL_SCRIPT) $(PKGINDEX_TCL) $(pkglibdir)
  
  install-doc:
  
  installdirs:
! 	$(mkinstalldirs) $(pkglibdir)
  
  clean:  
  	-test -z "$(BINARIES)" || rm -f $(BINARIES)
--- 70,85 ----
  install-binaries:
  
  install-libraries: installdirs
! 	@echo "Installing script files in $(DESTDIR)$(pkgdatadir)"
  	@for i in $(PROJECTINFO_SOURCES) ; do \
! 	    $(INSTALL_SCRIPT) $(srcdir)/$$i $(DESTDIR)$(pkgdatadir) ; \
  	done;
! 	$(INSTALL_SCRIPT) $(PKGINDEX_TCL) $(DESTDIR)$(pkgdatadir)
  
  install-doc:
  
  installdirs:
! 	$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
  
  clean:  
  	-test -z "$(BINARIES)" || rm -f $(BINARIES)


--- NEW FILE tclpro.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=TclPro Debugger
GenericName=TclPro Debugger
Comment=Graphical debugger for Tcl applications
Exec=prodebug
Icon=prodebug.png
Terminal=false
Type=Application
Categories=Application;Programming;Development;
Version=1.5.0


--- NEW FILE tclpro.spec ---
%define cvsdate 20061030

Summary: Development and debugging tools for Tcl applications
Name: tclpro
Version: 1.5.0
Release: 6.%{cvsdate}cvs%{?dist}
License: BSD
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
Source0: tclpro-%{cvsdate}cvs.tgz
Source1: tclpro.desktop
Source2: prodebug.png
Source3: procomp_pkgIndex.tcl
Patch0: tclpro-projectInfo.patch
Patch1: tclpro-checker-startup.patch
Patch2: tclpro-compiler-startup.patch
Patch3: tclpro-compiler-package.patch
Patch4: tclpro-1.5.0-tclm4cvs.patch
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
BuildRequires: tcl-devel autoconf
BuildRequires: desktop-file-utils
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch

%description
The TclPro tool set includes a graphical debugger, a static code checker,
a compiler that writes out Tcl byte codes, and a loader that reads
byte codes.

%prep
%setup -q -n %{name}-%{cvsdate}cvs
%patch0
%patch1
%patch2
%patch3
%patch4
%patch5
%patch6

for i in debugger checker projectInfo compiler ; do 
    pushd modules/$i
    autoconf
    popd
done

%build
pushd modules/projectInfo
%configure
make %{?_smp_mflags}
popd

%install
rm -rf $RPM_BUILD_ROOT
pushd modules/projectInfo
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
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/

# Fix a few file permissions for rpmlint
chmod a-x $RPM_BUILD_ROOT%{_datadir}/projectInfo1.4/*.tcl


desktop-file-install --vendor fedora                            \
        --dir ${RPM_BUILD_ROOT}%{_datadir}/applications         \
        %{SOURCE1}
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/pixmaps/
install -m 644 %{SOURCE2} $RPM_BUILD_ROOT/%{_datadir}/pixmaps/

%clean
rm -rf $RPM_BUILD_ROOT

%files
%doc ChangeLog
%defattr(-,root,root)
%{_bindir}/procheck
%{_bindir}/prodebug
%{_bindir}/procompile
%{_datadir}/procomp1.5
%{_datadir}/projectInfo1.4
%{_datadir}/applications/fedora-tclpro.desktop
%{_datadir}/pixmaps/prodebug.png

%changelog
* Tue Oct 31 2006 Wart <wart at kobold.org> 1.5.0-6.20061030cvs
- Initial package for Fedora

* Mon Jul 10 2006 Wart <wart at kobold.org> 1.5.0-5.1
- Clean up a few rpmlint warnings

* Tue Mar 28 2006 Wart <wart at kobold.org> 1.5.0-5
- Update tcl.m4 to fix quoting bug exposed in Fedora Core 5

* Mon Dec 5 2005 Wart <wart at kobold.org> 1.5.0-3
- Replace older tk* commands with proper tk::* namespaced commands.

* Mon Nov 28 2005 Wart <wart at kobold.org> 1.5.0-2
- Added the TclPro compiler.

* Sun Nov 27 2005 Wart <wart at kobold.org> 1.5.0-1
- Initial spec file.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tclpro/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	25 Nov 2006 23:49:14 -0000	1.1
+++ .cvsignore	25 Nov 2006 23:50:24 -0000	1.2
@@ -0,0 +1 @@
+tclpro-20061030cvs.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tclpro/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	25 Nov 2006 23:49:14 -0000	1.1
+++ sources	25 Nov 2006 23:50:24 -0000	1.2
@@ -0,0 +1 @@
+16eae8daa867effb355a6daaf7f2d2c6  tclpro-20061030cvs.tgz




More information about the fedora-extras-commits mailing list