rpms/insight/EL-5 insight-6.8-itclbuild.patch, NONE, 1.1 insight.spec, 1.1, 1.2

[Lubomir Rintel]

Author: lkundrak

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

Modified Files:
	insight.spec 
Added Files:
	insight-6.8-itclbuild.patch 
Log Message:
#-------------------------------------------------------------------------------


insight-6.8-itclbuild.patch:

--- NEW FILE insight-6.8-itclbuild.patch ---
--- insight-6.8/config/acinclude.m4.itclbuild	2004-01-14 14:41:37.000000000 +0100
+++ insight-6.8/config/acinclude.m4	2008-10-15 18:47:01.000000000 +0200
@@ -1823,9 +1823,10 @@
 AC_DEFUN([CYG_AC_LOAD_ITCLCONFIG], [
     if test -f "$ITCLCONFIG" ; then
       . $ITCLCONFIG
+      eval "$(set |grep -i itcl |sed 's/\(-L\([[^ ]]*\)\)/\1 -Wl,-rpath=\2/')"
     fi
 
-    AC_SUBST(ITCL_BUILD_LIB_SPEC)
+    AC_SUBST(ITCL_LIB_SPEC)
     AC_SUBST(ITCL_SH)
     AC_SUBST(ITCL_LIB_FILE)
     AC_SUBST(ITCL_LIB_FULL_PATH)
--- insight-6.8/gdb/acinclude.m4.itclbuild	2008-10-15 18:13:00.000000000 +0200
+++ insight-6.8/gdb/acinclude.m4	2008-10-15 18:47:13.000000000 +0200
@@ -543,6 +543,7 @@
 AC_DEFUN([CY_AC_LOAD_ITCLCONFIG], [
     if test -f "$ITCLCONFIG" ; then
       . $ITCLCONFIG
+      eval "$(set |grep -i itcl |sed 's/\(-L\([[^ ]]*\)\)/\1 -Wl,-rpath=\2/')"
     fi
 
     AC_SUBST(ITCL_VERSION)
@@ -562,8 +563,8 @@
 dnl not used, don't export to save symbols
 dnl    AC_SUBST(ITCL_EXEC_PREFIX)
 
-    AC_SUBST(ITCL_BUILD_INCLUDES)
-    AC_SUBST(ITCL_BUILD_LIB_SPEC)
+    AC_SUBST(ITCL_INCLUDES)
+    AC_SUBST(ITCL_LIB_SPEC)
     AC_SUBST(ITCL_LIB_SPEC)
 ])
 
--- insight-6.8/gdb/configure.ac.itclbuild	2008-10-15 18:13:00.000000000 +0200
+++ insight-6.8/gdb/configure.ac	2008-10-15 18:13:00.000000000 +0200
@@ -1499,7 +1499,7 @@
            if test -z "${no_itcl}"; then
              CY_AC_LOAD_ITCLCONFIG 
 
-	     ITCLLIB="${ITCL_BUILD_LIB_SPEC}"
+	     ITCLLIB="${ITCL_LIB_SPEC}"
 	     ITCL_DEPS="${ITCL_LIB_FULL_PATH}"
            fi
 


Index: insight.spec
===================================================================
RCS file: /cvs/pkgs/rpms/insight/EL-5/insight.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- insight.spec	15 Oct 2008 09:26:53 -0000	1.1
+++ insight.spec	20 Oct 2008 11:18:05 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		insight
 Version:	6.8
-Release:	4%{?dist}
+Release:	4%{?dist}.1
 Summary:	Graphical debugger based on GDB
 License:	GPLv3+
 Group:		Development/Debuggers
@@ -19,6 +19,7 @@
 Patch9:		insight-6.8-readline-system.patch
 Patch10:	insight-6.8-tclm4.patch
 Patch11:	insight-6.8-lib64.patch
+Patch12:	insight-6.8-itclbuild.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root
 Requires:	iwidgets
 BuildRequires:	tcl-devel
@@ -29,7 +30,7 @@
 BuildRequires:	ncurses-devel
 BuildRequires:	readline-devel
 BuildRequires:	expat-devel
-BuildRequires:	gif2png
+BuildRequires:	ImageMagick
 BuildRequires:	desktop-file-utils
 BuildRequires:	automake
 BuildRequires:	autoconf
@@ -57,6 +58,7 @@
 %patch9 -p1 -b .readline-system
 %patch10 -p1 -b .tclm4
 %patch11 -p1 -b .lib64
+%patch12 -p1 -b .itclbuild
 
 
 #-------------------------------------------------------------------------------
@@ -184,8 +186,8 @@
 #	Install icon.
 
 ${INSTALL} -m 755 -d "${RPM_BUILD_ROOT}%{_datadir}/pixmaps"
-gif2png -f -O	< "gdb/gdbtk/library/images/gdbtk_icon.gif"		\
-		> "${RPM_BUILD_ROOT}%{_datadir}/pixmaps/%{name}.png"
+convert	"gdb/gdbtk/library/images/gdbtk_icon.gif"		\
+	"${RPM_BUILD_ROOT}%{_datadir}/pixmaps/%{name}.png"
 
 
 #-------------------------------------------------------------------------------
@@ -212,6 +214,10 @@
 %changelog
 #-------------------------------------------------------------------------------
 
+* Mon Oct 20 2008 Lubomir Rintel <lkundrak at v3.sk> 6.8-4.1
+- There's no gif2png in EL-5, use ImageMagick
+- Build with incorrectly installed itcl
+
 * Mon Oct 13 2008 Patrick Monnerat <pm at datasphere.ch> 6.8-4
 - X-Fedora application category removed.
 - Force option -p of install.