rpms/ghex/EL-4 ghex-no-scrollkeeper.patch, NONE, 1.1 ghex-search-crash.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 ghex.spec, 1.7, 1.8 sources, 1.5, 1.6 ghex-2.8.0-no-scrollkeeper.patch, 1.1, NONE

[Thorsten Leemhuis (thl)]

Author: thl

Update of /cvs/extras/rpms/ghex/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26316

Modified Files:
	.cvsignore ghex.spec sources 
Added Files:
	ghex-no-scrollkeeper.patch ghex-search-crash.patch 
Removed Files:
	ghex-2.8.0-no-scrollkeeper.patch 
Log Message:
2.8.2-4 -- integrate fixes from devel

ghex-no-scrollkeeper.patch:

--- NEW FILE ghex-no-scrollkeeper.patch ---
diff -Naur ghex-2.8.2.org/omf-install/Makefile.in ghex-2.8.2/omf-install/Makefile.in
--- ghex-2.8.2.org/omf-install/Makefile.in	2006-07-15 16:05:45.000000000 +0200
+++ ghex-2.8.2/omf-install/Makefile.in	2006-07-15 16:06:14.000000000 +0200
@@ -374,14 +374,12 @@
 	-for file in $(srcdir)/*.omf; do \
 		$(INSTALL_DATA) $(srcdir)/$$file $(DESTDIR)$(omf_dest_dir); \
 	done
-	-scrollkeeper-update -p $(localstatedir)/scrollkeeper
 
 uninstall-local:
 	-for file in $(srcdir)/*.omf; do \
 		basefile=`basename $$file`; \
 		rm -f $(omf_dest_dir)/$$basefile; \
         done
-	-scrollkeeper-update -p $(localstatedir)/scrollkeeper
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:

ghex-search-crash.patch:

--- NEW FILE ghex-search-crash.patch ---
--- src/gtkhex.c
+++ src/gtkhex.c
@@ -2290,7 +2290,7 @@
 												   gint len,
 												   const gchar *colour)
 {
-	GtkHex_AutoHighlight *new = g_malloc0(sizeof(GtkHex_Highlight));
+	GtkHex_AutoHighlight *new = g_malloc0(sizeof(GtkHex_AutoHighlight));
 
 	new->search_string = g_memdup(search, len);
 	new->search_len = len;


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ghex/EL-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	8 Nov 2004 04:23:31 -0000	1.4
+++ .cvsignore	1 Dec 2006 17:17:02 -0000	1.5
@@ -1 +1 @@
-ghex-2.8.0.tar.bz2
+ghex-2.8.2.tar.bz2


Index: ghex.spec
===================================================================
RCS file: /cvs/extras/rpms/ghex/EL-4/ghex.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ghex.spec	9 Jan 2005 16:28:55 -0000	1.7
+++ ghex.spec	1 Dec 2006 17:17:02 -0000	1.8
@@ -1,13 +1,15 @@
 Name:           ghex
-Version:        2.8.1
-Release:        2
-Summary:        A binary editor for GNOME
+Version:        2.8.2
+Release:        4%{?dist}
+
+Summary:        Binary editor for GNOME
 
 Group:          Applications/Editors
 License:        GPL
 URL:            http://www.gnome.org/softwaremap/projects/ghex
-Source0:        http://ftp.gnome.org/pub/GNOME/sources/ghex/2.8/ghex-2.8.1.tar.bz2
-Patch:          ghex-2.8.0-no-scrollkeeper.patch
+Source0:        http://ftp.gnome.org/pub/GNOME/sources/ghex/2.8/ghex-2.8.2.tar.bz2
+Patch0:         ghex-no-scrollkeeper.patch
+Patch1:		ghex-search-crash.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libgnomeui-devel
@@ -16,7 +18,7 @@
 BuildRequires:  gettext
 BuildRequires:  desktop-file-utils
 BuildRequires:  scrollkeeper
-BuildRequires:  libtool 
+BuildRequires:  perl-XML-Parser
 Requires(post): GConf2
 Requires(post): scrollkeeper
 Requires(post): /sbin/ldconfig
@@ -42,12 +44,12 @@
 
 %prep
 %setup -q
-%patch -p1 -b .noscrollkeeper
-
+%patch0 -p1 -b .noscrollkeeper
+%patch1 -b .searchcrash
 
 %build
 %configure
-make %{?_smp_mflags} LIBTOOL=/usr/bin/libtool
+make %{?_smp_mflags} 
 
 
 %install
@@ -109,8 +111,29 @@
 
 
 %changelog
+* Tue Aug 29 2006 Thorsten Leemhuis <fedora[AT]leemhuis.info> - 2.8.2-4
+- Add BR perl-XML-Parser
+
+* Tue Aug 29 2006 Thorsten Leemhuis <fedora[AT]leemhuis.info> - 2.8.2-3
+- Rebuild for devel
+
+* Wed Aug 09 2006 Thorsten Leemhuis <fedora[AT]leemhuis.info> 2.8.2-2
+- apply ghex-search-crash.patch from b.g.o #339055 -- fixes #175957 
+
+* Sat Jul 15 2006 Thorsten Leemhuis <fedora[AT]leemhuis.info> 2.8.2-1
+- Update to 2.8.2
+- Don't use the libtool worksaroung anymore
+- Rename ghex-2.8.0-no-scrollkeeper.patch to
+  ghex-no-scrollkeeper.patch and and update it
+
+* Mon Feb 13 2006 Thorsten Leemhuis <fedora[AT]leemhuis.info>
+- Rebuild for Fedora Extras 5
+
+* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
+- rebuilt
+
 * Sun Jan 09 2005 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 2.8.1-2
-- Use make param LIBTOOL=/usr/bin/libtool instead autoreconf -- fixes x86_64 
+- Use make param LIBTOOL=/usr/bin/libtool instead autoreconf -- fixes x86_64
   build
 
 * Mon Dec 27 2004 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 2.8.1-1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ghex/EL-4/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	9 Jan 2005 16:24:30 -0000	1.5
+++ sources	1 Dec 2006 17:17:02 -0000	1.6
@@ -1 +1 @@
-ef17f945b9dc701193451f9b083e5116  ghex-2.8.1.tar.bz2
+1940a9f63b0d37604c6b489cda37fc19  ghex-2.8.2.tar.bz2


--- ghex-2.8.0-no-scrollkeeper.patch DELETED ---