rpms/itcl/devel itcl-3.3-autotools.patch, NONE, 1.1 itcl.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

Michael Thomas (wart) fedora-extras-commits at redhat.com
Sat Feb 4 16:47:01 UTC 2006


Author: wart

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

Modified Files:
	.cvsignore sources 
Added Files:
	itcl-3.3-autotools.patch itcl.spec 
Log Message:
auto-import itcl-3.3-0.3.RC1 on branch devel from itcl-3.3-0.3.RC1.src.rpm

itcl-3.3-autotools.patch:

--- NEW FILE itcl-3.3-autotools.patch ---
diff -Naur itcl3.3/configure itcl3.3.new/configure
--- itcl3.3/configure	2006-01-11 20:43:07.000000000 -0800
+++ itcl3.3.new/configure	2006-01-11 20:45:34.000000000 -0800
@@ -1538,10 +1538,12 @@
 
 	    # check in a few common install locations
 	    if test x"${ac_cv_c_tclconfig}" = x ; then
-		for i in `ls -d ${exec_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/local/lib 2>/dev/null` \
 			`ls -d /usr/contrib/lib 2>/dev/null` \
+			`ls -d /usr/lib64 2>/dev/null` \
 			`ls -d /usr/lib 2>/dev/null` \
 			; do
 		    if test -f "$i/tclConfig.sh" ; then
@@ -6492,7 +6494,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 }' /etc/.relid'`
+		system=MP-RAS-`awk '{print }' /etc/.relid`
 	    fi
 	    if test "`uname -s`" = "AIX" ; then
 		system=AIX-`uname -v`.`uname -r`
diff -Naur itcl3.3/generic/itcl_cmds.c itcl3.3.new/generic/itcl_cmds.c
--- itcl3.3/generic/itcl_cmds.c	2005-03-25 14:58:08.000000000 -0800
+++ itcl3.3.new/generic/itcl_cmds.c	2006-01-09 14:06:36.000000000 -0800
@@ -65,6 +65,7 @@
             lappend dirs [file join [file dirname $tcl_library] itcl$version]\n\
             set bindir [file dirname [info nameofexecutable]]\n\
             lappend dirs [file join $bindir .. lib itcl$version]\n\
+            lappend dirs [file join $bindir .. lib64 itcl$version]\n\
             lappend dirs [file join $bindir .. library]\n\
             lappend dirs [file join $bindir .. .. library]\n\
             lappend dirs [file join $bindir .. .. itcl library]\n\
diff -Naur itcl3.3/tclconfig/tcl.m4 itcl3.3.new/tclconfig/tcl.m4
--- itcl3.3/tclconfig/tcl.m4	2006-01-11 20:43:14.000000000 -0800
+++ itcl3.3.new/tclconfig/tcl.m4	2006-01-11 20:45:45.000000000 -0800
@@ -88,10 +88,12 @@
 
 	    # check in a few common install locations
 	    if test x"${ac_cv_c_tclconfig}" = x ; then
-		for i in `ls -d ${exec_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/local/lib 2>/dev/null` \
 			`ls -d /usr/contrib/lib 2>/dev/null` \
+			`ls -d /usr/lib64 2>/dev/null` \
 			`ls -d /usr/lib 2>/dev/null` \
 			; do
 		    if test -f "$i/tclConfig.sh" ; then
@@ -199,12 +201,13 @@
 	    fi
 	    # check in a few common install locations
 	    if test x"${ac_cv_c_tkconfig}" = x ; then
-		for i in `ls -d ${exec_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/local/lib 2>/dev/null` \
 			`ls -d /usr/contrib/lib 2>/dev/null` \
+			`ls -d /usr/lib64 2>/dev/null` \
 			`ls -d /usr/lib 2>/dev/null` \
-			; do
 		    if test -f "$i/tkConfig.sh" ; then
 			ac_cv_c_tkconfig=`(cd $i; pwd)`
 			break
@@ -794,7 +797,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`
@@ -3639,10 +3642,12 @@
 
 	    # check in a few common install locations
 	    if test x"${ac_cv_c_$1config}" = x ; then
-		for i in `ls -d ${exec_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/local/lib 2>/dev/null` \
 			`ls -d /usr/contrib/lib 2>/dev/null` \
+			`ls -d /usr/lib64 2>/dev/null` \
 			`ls -d /usr/lib 2>/dev/null` \
 			; do
 		    if test -f "$i/$1Config.sh" ; then


--- NEW FILE itcl.spec ---
Name:           itcl
Version:        3.3
Release:        0.3.RC1%{?dist}
Summary:        Object oriented extensions to Tcl and Tk

Group:		Development/Libraries
License:        BSD
URL:            http://incrtcl.sourceforge.net/itcl/
Source0:	http://easynews.dl.sourceforge.net/sourceforge/incrtcl/itcl3.3.tar.gz
Patch0:		itcl-3.3-autotools.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:  tcl
BuildRequires:       tcl-devel

%description
[incr Tcl] is Tcl extension that provides object-oriented features that are
missing from the Tcl language.

%package devel
Summary:  Development headers and libraries for linking against itcl
Group: Development/Libraries
Requires: itcl = %{version}
%description devel
Development headers and libraries for linking against itcl.

%prep
%setup -q -n itcl3.3
%patch -p1

%build
%configure
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%dir %{_libdir}/itcl3.3
%{_libdir}/itcl3.3/*.so
%{_libdir}/itcl3.3/*.tcl
%{_mandir}/mann/*.gz
%doc README license.terms

%files devel
%defattr(-,root,root,-)
%{_includedir}/*.h
%{_libdir}/itcl3.3/*.a
%{_libdir}/itclConfig.sh
%doc

%changelog
* Fri Jan 27 2006 Wart <wart at kobold.org> - 3.3-0.3.RC1
- Remove duplicate in file list.

* Wed Jan 11 2006 Wart <wart at kobold.org> - 3.3-0.2.RC1
- Fix quoting bug that is exposed by bash >= 3.1

* Mon Jan 9 2006 Wart <wart at kobold.org> - 3.3-0.1.RC1
- Update to 3.3 upstream sources.  itk now uses a different source
  archive than itcl and has been moved to a separate spec file.

* Wed Dec 28 2005 Wart <wart at kobold.org> - 3.2.1-4
- Create itk as a subpackage.
- Rename patch to include version number.
- New source url.

* Fri Nov 25 2005 Wart <wart at kobold.org> - 3.2.1-3
- Minor fixes to remove rpmlint warnings.
- Move DSOs to itcl library directory instead of polluting /usr/lib.

* Sat Oct 22 2005 Wart <wart at kobold.org> - 3.2.1-2
- Look for itk.tcl in the lib64 directory for x86_64 platforms.

* Fri Oct 21 2005 Wart <wart at kobold.org> - 3.2.1-1
- Intial spec file for Fedora Extras


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/itcl/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	4 Feb 2006 16:46:29 -0000	1.1
+++ .cvsignore	4 Feb 2006 16:47:01 -0000	1.2
@@ -0,0 +1 @@
+itcl3.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/itcl/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	4 Feb 2006 16:46:29 -0000	1.1
+++ sources	4 Feb 2006 16:47:01 -0000	1.2
@@ -0,0 +1 @@
+d958b3d1c52fa5336b5aacc1251b5ce3  itcl3.3.tar.gz




More information about the scm-commits mailing list