rpms/itk/F-10 itk-3.4-findinit.patch,NONE,1.1 itk.spec,1.11,1.12

[Michael Thomas]

Author: wart

Update of /cvs/pkgs/rpms/itk/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26751

Modified Files:
	itk.spec 
Added Files:
	itk-3.4-findinit.patch 
Log Message:
Fix bad logic for locating itk.tcl from the C bindings (bz #485252)



itk-3.4-findinit.patch:

--- NEW FILE itk-3.4-findinit.patch ---
--- itk-20071231cvs/generic/itk_cmds.c.orig	2009-07-11 16:47:28.000000000 -0700
+++ itk-20071231cvs/generic/itk_cmds.c	2009-07-11 16:47:37.000000000 -0700
@@ -74,7 +74,7 @@
             lappend dirs [file join $bindir .. .. library]\n\
             lappend dirs [file join $bindir .. .. itk library]\n\
             # On MacOSX, check the directories in the tcl_pkgPath\n\
-            if {[string equal $::tcl_platform(platform) \"unix\"] && \
+            if {[string equal $::tcl_platform(platform) \"unix\"] || \
                     [string equal $::tcl_platform(os) \"Darwin\"]} {\n\
                 foreach d $::tcl_pkgPath {\n\
                     lappend dirs [file join $d itk$version]\n\


Index: itk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/itk/F-10/itk.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- itk.spec	9 Feb 2008 18:17:57 -0000	1.11
+++ itk.spec	12 Jul 2009 00:52:50 -0000	1.12
@@ -3,7 +3,7 @@
 
 Name:           itk
 Version:        3.4
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Object oriented extensions to Tk
 
 Group:          Development/Libraries
@@ -15,6 +15,7 @@ Source0:        itk-20071231cvs.tgz
 Patch0:         itk-3.4-libdir.patch
 Patch1:         itk-3.4-tclbindir.patch
 Patch2:         itk-3.4-soname.patch
+Patch3:         itk-3.4-findinit.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:  tcl(abi) = 8.5 itcl tk
@@ -37,6 +38,7 @@ Development headers and libraries for li
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 %configure
@@ -66,6 +68,9 @@ rm -rf $RPM_BUILD_ROOT
 # What happened to itk's stub library and itkConfig.sh?
 
 %changelog
+* Sat Jul 11 2009 Wart <wart at kobold.org> - 3.4-3
+- Fix bad logic for locating itk.tcl from the C bindings (bz #485252)
+
 * Sat Feb 9 2008 Wart <wart at kobold.org> - 3.4-2
 - Rebuild for gcc 4.3
 - Add patch to add soname to library