rpms/gnomesword/devel gnomesword-gtkhtml3.patch, NONE, 1.1 gnomesword.spec, 1.27, 1.28

Deji Akingunola (deji) fedora-extras-commits at redhat.com
Tue Mar 13 19:00:57 UTC 2007 

Author: deji

Update of /cvs/extras/rpms/gnomesword/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22690

Modified Files:
	gnomesword.spec 
Added Files:
	gnomesword-gtkhtml3.patch 
Log Message:
* Tue Mar 13 2007 Deji Akingunola <dakingun at gmail.com> - 2.2.2.1-5
- Tweak configure script to allow building with newer gtkhml3


gnomesword-gtkhtml3.patch:

--- NEW FILE gnomesword-gtkhtml3.patch ---
--- configure	2007-02-24 10:18:09.000000000 -0500
+++ configure.new	2007-03-13 14:46:03.000000000 -0400
@@ -23605,12 +23605,12 @@
         pkg_cv_GTKHTML_CFLAGS="$GTKHTML_CFLAGS"
     else
         if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgtkhtml-3.8 >= 3.13\"") >&5
-  ($PKG_CONFIG --exists --print-errors "libgtkhtml-3.8 >= 3.13") 2>&5
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgtkhtml-3.14 >= 3.13\"") >&5
+  ($PKG_CONFIG --exists --print-errors "libgtkhtml-3.14 >= 3.13") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-  pkg_cv_GTKHTML_CFLAGS=`$PKG_CONFIG --cflags "libgtkhtml-3.8 >= 3.13" 2>/dev/null`
+  pkg_cv_GTKHTML_CFLAGS=`$PKG_CONFIG --cflags "libgtkhtml-3.14 >= 3.13" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -23623,12 +23623,12 @@
         pkg_cv_GTKHTML_LIBS="$GTKHTML_LIBS"
     else
         if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgtkhtml-3.8 >= 3.13\"") >&5
-  ($PKG_CONFIG --exists --print-errors "libgtkhtml-3.8 >= 3.13") 2>&5
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgtkhtml-3.14 >= 3.13\"") >&5
+  ($PKG_CONFIG --exists --print-errors "libgtkhtml-3.14 >= 3.13") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-  pkg_cv_GTKHTML_LIBS=`$PKG_CONFIG --libs "libgtkhtml-3.8 >= 3.13" 2>/dev/null`
+  pkg_cv_GTKHTML_LIBS=`$PKG_CONFIG --libs "libgtkhtml-3.14 >= 3.13" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -23647,9 +23647,9 @@
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        GTKHTML_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libgtkhtml-3.8 >= 3.13"`
+	        GTKHTML_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libgtkhtml-3.14 >= 3.13"`
         else
-	        GTKHTML_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgtkhtml-3.8 >= 3.13"`
+	        GTKHTML_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgtkhtml-3.14 >= 3.13"`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$GTKHTML_PKG_ERRORS" >&5
@@ -23689,12 +23689,12 @@
         pkg_cv_GTKHTML_CFLAGS="$GTKHTML_CFLAGS"
     else
         if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgtkhtml-3.8\"") >&5
-  ($PKG_CONFIG --exists --print-errors "libgtkhtml-3.8") 2>&5
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgtkhtml-3.14\"") >&5
+  ($PKG_CONFIG --exists --print-errors "libgtkhtml-3.14") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-  pkg_cv_GTKHTML_CFLAGS=`$PKG_CONFIG --cflags "libgtkhtml-3.8" 2>/dev/null`
+  pkg_cv_GTKHTML_CFLAGS=`$PKG_CONFIG --cflags "libgtkhtml-3.14" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -23707,12 +23707,12 @@
         pkg_cv_GTKHTML_LIBS="$GTKHTML_LIBS"
     else
         if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgtkhtml-3.8\"") >&5
-  ($PKG_CONFIG --exists --print-errors "libgtkhtml-3.8") 2>&5
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgtkhtml-3.14\"") >&5
+  ($PKG_CONFIG --exists --print-errors "libgtkhtml-3.14") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-  pkg_cv_GTKHTML_LIBS=`$PKG_CONFIG --libs "libgtkhtml-3.8" 2>/dev/null`
+  pkg_cv_GTKHTML_LIBS=`$PKG_CONFIG --libs "libgtkhtml-3.14" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -23731,9 +23731,9 @@
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        GTKHTML_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libgtkhtml-3.8"`
+	        GTKHTML_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libgtkhtml-3.14"`
         else
-	        GTKHTML_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgtkhtml-3.8"`
+	        GTKHTML_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgtkhtml-3.14"`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$GTKHTML_PKG_ERRORS" >&5
@@ -23757,8 +23757,8 @@
 
 
 fi
-GTKHTML_DATA_DIR="`$PKG_CONFIG --variable=gtkhtml_datadir libgtkhtml-3.8`"
-GTKHTML_API_VERSION=`$PKG_CONFIG --variable gtkhtml_apiversion libgtkhtml-3.8`
+GTKHTML_DATA_DIR="`$PKG_CONFIG --variable=gtkhtml_datadir libgtkhtml-3.14`"
+GTKHTML_API_VERSION=`$PKG_CONFIG --variable gtkhtml_apiversion libgtkhtml-3.14`
 
 cat >>confdefs.h <<_ACEOF
 #define GTKHTML_DATA_DIR "${GTKHTML_DATA_DIR}"


Index: gnomesword.spec
===================================================================
RCS file: /cvs/extras/rpms/gnomesword/devel/gnomesword.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- gnomesword.spec	13 Mar 2007 17:20:25 -0000	1.27
+++ gnomesword.spec	13 Mar 2007 19:00:24 -0000	1.28
@@ -1,19 +1,20 @@
 Name:		gnomesword           
 Version:	2.2.2.1
-Release:	4%{?dist}
+Release:	5%{?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-gtkhtml3.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	sword-devel >= 1.5.9
 BuildRequires:	gettext
 BuildRequires:	desktop-file-utils
 BuildRequires:	gnome-doc-utils
-BuildRequires:	gtkhtml3-devel >= 3.6
+BuildRequires:	gtkhtml3-devel >= 3.14
 BuildRequires:	libgnomeui-devel libgnomeprintui22-devel
 BuildRequires:	scrollkeeper
 BuildRequires:	perl(XML::Parser)
@@ -31,6 +32,7 @@
 
 %prep
 %setup -q
+%patch0 -p0 -b .gtkhml
 
 %build
 %configure
@@ -74,6 +76,9 @@
 %_datadir/gnome/help/gnomesword/
 
 %changelog
+* Tue Mar 13 2007 Deji Akingunola <dakingun at gmail.com> - 2.2.2.1-5
+- Tweak configure script to allow building with newer gtkhml3
+
 * Tue Mar 13 2007 Deji Akingunola <dakingun at gmail.com> - 2.2.2.1-4
 - Another rebuild for gtkhtml

More information about the fedora-extras-commits mailing list