rpms/insight/devel insight-6.8-doubleinstall.patch, NONE, 1.1 insight-6.8-readline6.patch, NONE, 1.1 insight.spec, 1.4, 1.5

[Patrick Monnerat]

Author: monnerat

Update of /cvs/pkgs/rpms/insight/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31617

Modified Files:
	insight.spec 
Added Files:
	insight-6.8-doubleinstall.patch insight-6.8-readline6.patch 
Log Message:

* Wed Jul 15 2009 Patrick Monnerat <pm at datasphere.ch> 6.8-8
- Fix bug #511501: combobox.tcl installed twice causes build failure.
- Patch "readline6" to use system readline version 6.


insight-6.8-doubleinstall.patch:

--- NEW FILE insight-6.8-doubleinstall.patch ---
diff -Naur insight-6.8.orig/libgui/library/Makefile.am insight-6.8.new/libgui/library/Makefile.am
--- insight-6.8.orig/libgui/library/Makefile.am	2009-07-15 11:23:41.000000000 +0200
+++ insight-6.8.new/libgui/library/Makefile.am	2009-07-15 11:40:34.000000000 +0200
@@ -11,11 +11,9 @@
 ulset.tcl wframe.tcl wingrab.tcl ventry.tcl combobox.tcl \
 pane.tcl panedwindow.tcl
 
-PACKAGES = combobox.tcl
-
 ## This directory is also referenced in paths.c, which see.
 guidir = $(datadir)/insight/gui
-gui_DATA = tclIndex pkgIndex.tcl $(TCL) $(PACKAGES)
+gui_DATA = tclIndex pkgIndex.tcl $(TCL)
 
 
 if CROSS_COMPILING

insight-6.8-readline6.patch:

--- NEW FILE insight-6.8-readline6.patch ---
diff -Naur insight-6.8.orig/gdb/tui/tui-io.c insight-6.8.new/gdb/tui/tui-io.c
--- insight-6.8.orig/gdb/tui/tui-io.c	2008-01-01 23:53:22.000000000 +0100
+++ insight-6.8.new/gdb/tui/tui-io.c	2009-07-16 14:50:28.000000000 +0200
@@ -512,7 +512,7 @@
 void
 tui_setup_io (int mode)
 {
-  extern int readline_echoing_p;
+  extern int _rl_echoing_p;
  
   if (mode)
     {
@@ -522,12 +522,12 @@
       tui_old_rl_prep_terminal = rl_prep_term_function;
       tui_old_rl_getc_function = rl_getc_function;
       tui_old_rl_outstream = rl_outstream;
-      tui_old_readline_echoing_p = readline_echoing_p;
+      tui_old_readline_echoing_p = _rl_echoing_p;
       rl_redisplay_function = tui_redisplay_readline;
       rl_deprep_term_function = tui_deprep_terminal;
       rl_prep_term_function = tui_prep_terminal;
       rl_getc_function = tui_getc;
-      readline_echoing_p = 0;
+      _rl_echoing_p = 0;
       rl_outstream = tui_rl_outstream;
       rl_prompt = 0;
       rl_completion_display_matches_hook = tui_rl_display_match_list;
@@ -564,7 +564,7 @@
       rl_getc_function = tui_old_rl_getc_function;
       rl_outstream = tui_old_rl_outstream;
       rl_completion_display_matches_hook = 0;
-      readline_echoing_p = tui_old_readline_echoing_p;
+      _rl_echoing_p = tui_old_readline_echoing_p;
       rl_already_prompted = 0;
 
       /* Save tty for SIGCONT.  */


Index: insight.spec
===================================================================
RCS file: /cvs/pkgs/rpms/insight/devel/insight.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- insight.spec	2 Mar 2009 11:32:37 -0000	1.4
+++ insight.spec	16 Jul 2009 13:30:48 -0000	1.5
@@ -1,6 +1,6 @@
 Name:		insight
 Version:	6.8
-Release:	7%{?dist}
+Release:	8%{?dist}
 Summary:	Graphical debugger based on GDB
 License:	GPLv3+
 Group:		Development/Debuggers
@@ -20,6 +20,8 @@ Patch9:		insight-6.8-readline-system.pat
 Patch10:	insight-6.8-tclm4.patch
 Patch11:	insight-6.8-lib64.patch
 Patch12:	insight-6.8-gcc44.patch
+Patch13:	insight-6.8-doubleinstall.patch
+Patch14:	insight-6.8-readline6.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root
 Requires:	iwidgets
 BuildRequires:	tcl-devel
@@ -28,7 +30,7 @@ BuildRequires:	itcl-devel >= 3.3
 BuildRequires:	itk-devel >= 3.3
 BuildRequires:	iwidgets
 BuildRequires:	ncurses-devel
-BuildRequires:	readline-devel
+BuildRequires:	readline-devel >= 6.0
 BuildRequires:	expat-devel
 BuildRequires:	ImageMagick
 BuildRequires:	desktop-file-utils
@@ -59,6 +61,8 @@ GDB version 6.x.
 %patch10 -p1 -b .tclm4
 %patch11 -p1 -b .lib64
 %patch12 -p1 -b .gcc44
+%patch13 -p1 -b .doubleinstall
+%patch14 -p1 -b .readline6
 
 
 #-------------------------------------------------------------------------------
@@ -214,6 +218,10 @@ rm -rf "${RPM_BUILD_ROOT}"
 %changelog
 #-------------------------------------------------------------------------------
 
+* Wed Jul 15 2009 Patrick Monnerat <pm at datasphere.ch> 6.8-8
+- Fix bug #511501: combobox.tcl installed twice causes build failure.
+- Patch "readline6" to use system readline version 6.
+
 * Mon Mar  2 2009 Patrick Monnerat <pm at datasphere.ch> 6.8-7
 - Removed libXft-devel build requirement.
 - .desktop file categories fixed.