rpms/ghex/F-9 ghex.spec,1.26,1.27

[Dodji Seketeli]

Author: dodji

Update of /cvs/pkgs/rpms/ghex/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5850

Modified Files:
	ghex.spec 
Log Message:
* Thu Feb 19 2009 Dodji Seketeli <dodji at redhat.org> - 2.22.0-2
- Backport patch for crash: http://bugzilla.gnome.org/show_bug.cgi?id=571892
- Use system libtool to avoid setting standard rpath to generated libraries
- Explicitely exclude *.a files




Index: ghex.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ghex/F-9/ghex.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- ghex.spec	11 Apr 2008 05:15:04 -0000	1.26
+++ ghex.spec	20 Feb 2009 11:02:10 -0000	1.27
@@ -1,6 +1,6 @@
 Name:           ghex
 Version:        2.22.0
-Release:        1
+Release:        2
 
 Summary:        Binary editor for GNOME
 
@@ -8,6 +8,12 @@
 License:        GPLv2+
 URL:            http://ftp.gnome.org/pub/GNOME/sources/ghex/
 Source0:        http://ftp.gnome.org/pub/GNOME/sources/ghex/2.22/ghex-%{version}.tar.bz2
+#This is a backport of a patch that fix random startup
+#crashes on x86_64 machines, at least.
+#I proposed it to upstream at
+#http://bugzilla.gnome.org/show_bug.cgi?id=571892.
+#It got accepted upstream and in included in the 2.24 release.
+Patch0:         %{name}-%{version}-startup-crash.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libgnomeui-devel
@@ -18,6 +24,7 @@
 BuildRequires:  scrollkeeper
 BuildRequires:  perl-XML-Parser
 BuildRequires:  gnome-doc-utils
+BuildRequires:  libtool
 Requires(post): GConf2
 Requires(post): scrollkeeper
 Requires(post): /sbin/ldconfig
@@ -43,10 +50,12 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .startup-crash
 
 %build
 %configure --disable-schemas-install --disable-static
-make %{?_smp_mflags} 
+#Use system libtool to avoid setting system rpath to generated libraries
+make %{?_smp_mflags} LIBTOOL=%{_bindir}/libtool
 
 
 %install
@@ -92,6 +101,7 @@
 %{_datadir}/gnome-2.0/ui/*
 %{_datadir}/icons/hicolor/*/apps/*
 %{_libdir}/*.so.*
+%exclude %{_libdir}/*.a
 
 %files devel
 %defattr(-,root,root,-)
@@ -101,6 +111,11 @@
 
 
 %changelog
+* Thu Feb 19 2009 Dodji Seketeli <dodji at redhat.org> - 2.22.0-2
+- Backport patch for crash: http://bugzilla.gnome.org/show_bug.cgi?id=571892
+- Use system libtool to avoid setting standard rpath to generated libraries
+- Explicitely exclude *.a files
+
 * Fri Apr 11 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.22.0-1
 - Update to 2.22.0 (no code changes, just a late release for Gnome 2.22 with
   updated translations)