rpms/gnomesword/FC-3 gnomesword-2.1.2-gettext64.patch, NONE, 1.1 gnomesword.spec, 1.4, 1.5

[Michael A. Peters (mpeters)]

Author: mpeters

Update of /cvs/extras/rpms/gnomesword/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10125/FC-3

Modified Files:
	gnomesword.spec 
Added Files:
	gnomesword-2.1.2-gettext64.patch 
Log Message:
auto-import gnomesword-2.1.2-2.3.fc4 on branch FC-3 from gnomesword-2.1.2-2.3.fc4.src.rpm
patch for x86_64

gnomesword-2.1.2-gettext64.patch:

--- NEW FILE gnomesword-2.1.2-gettext64.patch ---
--- gnomesword-2.1.2/aclocal.m4.BAD	2005-09-04 15:56:31.000000000 -0500
+++ gnomesword-2.1.2/aclocal.m4	2005-09-04 15:56:47.000000000 -0500
@@ -144,7 +144,7 @@
         	[AC_TRY_LINK([
 #include <libintl.h>
 ],
-	          [return (int) dgettext ("","")],
+	          [return dgettext ("","") != 0],
 		  gt_cv_func_dgettext_libc=yes,
 	          gt_cv_func_dgettext_libc=no)
         	])
--- gnomesword-2.1.2/configure.BAD	2005-09-04 15:57:32.000000000 -0500
+++ gnomesword-2.1.2/configure	2005-09-04 16:00:29.000000000 -0500
@@ -22807,7 +22807,7 @@
 int
 main ()
 {
-return (int) dgettext ("","")
+return dgettext ("","") != 0
   ;
   return 0;
 }


Index: gnomesword.spec
===================================================================
RCS file: /cvs/extras/rpms/gnomesword/FC-3/gnomesword.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gnomesword.spec	13 Jun 2005 09:55:12 -0000	1.4
+++ gnomesword.spec	15 Sep 2005 23:33:47 -0000	1.5
@@ -1,12 +1,13 @@
 Name:           gnomesword           
 Version:        2.1.2
-Release:        2.2%{?dist}
+Release:        2.3%{?dist}
 Summary:        GNOME-based Bible research tool
 
 Group:          Applications/Text
 License:        GPL
 URL:            http://gnomesword.sourceforge.net/
 Source0:        http://easynews.dl.sourceforge.net/sourceforge/gnomesword/gnomesword-%{version}.tar.gz
+Patch0:         gnomesword-2.1.2-gettext64.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  sed >= 3.95
@@ -18,6 +19,8 @@
 BuildRequires:  curl-devel
 BuildRequires:  libgnomeui-devel
 BuildRequires:  scrollkeeper
+# currently broken on x86_64
+# ExcludeArch:    x86_64
 # for x86_64
 %ifarch x86_64
 BuildRequires:  libtool automake autoconf
@@ -35,7 +38,10 @@
 and other texts using your computer.
 
 %prep
-%setup -q 
+%setup -q
+%ifarch x86_64
+%patch0 -p1 -b .gettext64 
+%endif
 %{__sed} -i 's?\r??' doc/help/C/legal.xml
 %{__sed} -i 's?\r??' doc/help/fr/legal.xml
 
@@ -84,8 +90,10 @@
 
 
 %changelog
-* Mon Jun 13 2005 Michael A. Peters <mpeters at mac.com> - 2.1.2-2.2
-- Attempting fix for x86_64 base on lock-keys-applet fix
+* Thu Sep 15 2005 Michael A. Peters <mpeters at mac.com> - 2.1.2-2.3
+- trying patch suggested by Tom 'spot' Callaway to fix x86_64 bug
+- 160186
+- libtool, aclocal, autoheader, automake, autoconf on x86_64
 
 * Sun Jun 12 2005 Michael A. Peters <mpeters at mac.com> - 2.1.2-2.1
 - Exclude x86_64 for now