rpms/gnomesword/FC-3 gnomesword.spec,1.5,1.6 sources,1.2,1.3

[Michael A. Peters (mpeters)]

Author: mpeters

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

Modified Files:
	gnomesword.spec sources 
Log Message:
upstream update, including ability to build against rawhide gtkhtml3



Index: gnomesword.spec
===================================================================
RCS file: /cvs/extras/rpms/gnomesword/FC-3/gnomesword.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gnomesword.spec	15 Sep 2005 23:33:47 -0000	1.5
+++ gnomesword.spec	14 Dec 2005 23:30:15 -0000	1.6
@@ -1,13 +1,13 @@
 Name:           gnomesword           
-Version:        2.1.2
-Release:        2.3%{?dist}
+Version:        2.1.5
+Release:        1%{?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
+#Patch0:         gnomesword-2.1.2-gettext64.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  sed >= 3.95
@@ -15,16 +15,13 @@
 BuildRequires:  gettext
 BuildRequires:  desktop-file-utils
 BuildRequires:  gnome-spell
-BuildRequires:  gtkhtml3-devel
+BuildRequires:  gtkhtml3-devel >= 3.6
 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
-%endif
+#%%ifarch x86_64
+#BuildRequires:  libtool automake autoconf
+#%%endif
 Requires(post):   scrollkeeper
 Requires(postun): scrollkeeper
 Obsoletes:      gnomesword2
@@ -39,16 +36,17 @@
 
 %prep
 %setup -q
-%ifarch x86_64
-%patch0 -p1 -b .gettext64 
-%endif
+#%%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
 
 %build
-%ifarch x86_64
-libtoolize -c --force && aclocal-1.9 && autoheader && automake-1.9 && autoconf
-%endif
+#%%ifarch x86_64
+#libtoolize -c --force && aclocal-1.9 && autoheader && automake-1.9 && autoconf
+#%%endif
 %configure
 make %{?_smp_mflags}
 
@@ -85,11 +83,16 @@
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING COPYING-DOCS ChangeLog NEWS README TODO
 %_bindir/gnomesword2
+%_datadir/gnomesword
 %_datadir/pixmaps/gnomesword
 %_datadir/applications/fedora-gnomesword.desktop
 
 
 %changelog
+* Wed Dec 14 2005 Michael A. Peters <mpeters at mac.com> - 2.1.5-1
+- New upstream version, works with gtkhtml3-3.8
+- disable x86_64 patch
+
 * 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


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnomesword/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 Jun 2005 12:04:31 -0000	1.2
+++ sources	14 Dec 2005 23:30:15 -0000	1.3
@@ -1 +1,2 @@
 ce1171f19a40256cfdd31f42c979d91c  gnomesword-2.1.2.tar.gz
+61191b987a1cfb502841f331bad8d8cd  gnomesword-2.1.5.tar.gz