rpms/kio_sword/devel kio_sword-build_fixes.patch, 1.2, 1.3 kio_sword.spec, 1.6, 1.7

[Deji Akingunola]

Author: deji

Update of /cvs/pkgs/rpms/kio_sword/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1292

Modified Files:
	kio_sword-build_fixes.patch kio_sword.spec 
Log Message:
* Wed Mar 11 2009 Deji Akingunola <dakingun at gmail.com> 0.3-9
- Fix build failure after Fedora_11_Mass_Rebuild (Fix by Caolan McNamara)


kio_sword-build_fixes.patch:

Index: kio_sword-build_fixes.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kio_sword/devel/kio_sword-build_fixes.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- kio_sword-build_fixes.patch	14 Feb 2008 00:11:13 -0000	1.2
+++ kio_sword-build_fixes.patch	11 Mar 2009 14:27:46 -0000	1.3
@@ -1,23 +1,3 @@
---- configure	2006-12-16 11:11:58.000000000 -0500
-+++ configure.new	2007-01-12 09:49:21.000000000 -0500
-@@ -32379,7 +32379,7 @@
- echo "$as_me:$LINENO: checking for Sword library files" >&5
- echo $ECHO_N "checking for Sword library files... $ECHO_C" >&6
- 
--ac_sword_library_dirs="$ac_sword_dir/lib /usr/lib /usr/lib/sword /usr/local/lib /usr/local/lib/sword /usr/local/sword/lib"
-+ac_sword_library_dirs="$ac_sword_dir/lib /usr/lib /usr/lib64 /usr/lib/sword /usr/local/lib /usr/local/lib/sword /usr/local/sword/lib"
- 
- if test "x$ac_static_sword" = "xYES"; then
- 	SEARCH_LIBS="libsword.a";
-@@ -32518,7 +32518,7 @@
- using namespace sword;
- #endif
- 
--int main(int argc, char* argv) {
-+int main(int argc, char* argv[]) {
- 	std::cout << SWVersion::currentVersion << std::endl;
- 	return 0;
- }
 --- configure.in.in	2007-01-12 09:52:04.000000000 -0500
 +++ configure.in.in.new	2007-01-12 09:52:27.000000000 -0500
 @@ -4,6 +4,6 @@
@@ -66,3 +46,56 @@
  		list<SWBuf>::const_iterator it;
  		list<SWBuf>::const_iterator it_end = locales.end();
  		QStringList output;
+--- admin/cvs.sh	2009-03-11 08:26:43.000000000 +0000
++++ admin/cvs.sh	2009-03-11 08:48:21.000000000 +0000
+@@ -32,7 +32,7 @@
+ required_autoconf_version="2.53 or newer"
+ AUTOCONF_VERSION=`$AUTOCONF --version | head -n 1`
+ case $AUTOCONF_VERSION in
+-  Autoconf*2.5* | autoconf*2.5* ) : ;;
++  Autoconf*2.5* | autoconf*2.5* | autoconf*2.6*) : ;;
+   "" )
+     echo "*** AUTOCONF NOT FOUND!."
+     echo "*** KDE requires autoconf $required_autoconf_version"
+@@ -47,7 +47,7 @@
+ 
+ AUTOHEADER_VERSION=`$AUTOHEADER --version | head -n 1`
+ case $AUTOHEADER_VERSION in
+-  Autoconf*2.5* | autoheader*2.5* ) : ;;
++  Autoconf*2.5* | autoheader*2.5* | autoheader*2.6*) : ;;
+   "" )
+     echo "*** AUTOHEADER NOT FOUND!."
+     echo "*** KDE requires autoheader $required_autoconf_version"
+@@ -68,7 +68,7 @@
+     echo "*** KDE requires automake $required_automake_version"
+     exit 1
+     ;;
+-  automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9*)
++  automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.10* )
+     echo "*** $AUTOMAKE_STRING found."
+     UNSERMAKE=no
+     ;;
+--- admin/localm4/sword.m4	2009-03-11 08:26:43.000000000 +0000
++++ admin/localm4/sword.m4	2009-03-11 08:57:13.000000000 +0000
+@@ -28,7 +28,7 @@
+ dnl try to find Sword library files
+ AC_MSG_CHECKING([for Sword library files])
+ AC_REQUIRE([AC_FIND_ZLIB])
+-ac_sword_library_dirs="$ac_sword_dir/lib /usr/lib /usr/lib/sword /usr/local/lib /usr/local/lib/sword /usr/local/sword/lib"
++ac_sword_library_dirs="$ac_sword_dir/lib $libdir $libdir/sword /usr/local/lib /usr/local/lib/sword /usr/local/sword/lib"
+ 
+ if test "x$ac_static_sword" = "xYES"; then
+ 	SEARCH_LIBS="libsword.a";
+--- admin/acinclude.m4.in	2009-03-11 08:26:43.000000000 +0000
++++ admin/acinclude.m4.in	2009-03-11 08:29:22.000000000 +0000
+@@ -3194,10 +3194,8 @@
+   AC_SUBST([HAVE_GCC_VISIBILITY])
+ 
+   if test "$GXX" = "yes"; then
+-    KDE_CHECK_COMPILER_FLAG(fno-exceptions,[CXXFLAGS="$CXXFLAGS -fno-exceptions"])
+     KDE_CHECK_COMPILER_FLAG(fno-check-new, [CXXFLAGS="$CXXFLAGS -fno-check-new"])
+     KDE_CHECK_COMPILER_FLAG(fno-common, [CXXFLAGS="$CXXFLAGS -fno-common"])
+-    KDE_CHECK_COMPILER_FLAG(fexceptions, [USE_EXCEPTIONS="-fexceptions"], USE_EXCEPTIONS=	)
+     ENABLE_PERMISSIVE_FLAG="-fpermissive"
+ 
+     if test "$kde_use_pch" = "yes"; then


Index: kio_sword.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kio_sword/devel/kio_sword.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- kio_sword.spec	25 Feb 2009 11:23:35 -0000	1.6
+++ kio_sword.spec	11 Mar 2009 14:27:46 -0000	1.7
@@ -1,6 +1,6 @@
 Name: kio_sword
 Version: 0.3
-Release: 8%{?dist}
+Release: 9%{?dist}
 Summary: A lightweight frontend for the Sword Bible project for KDE
 URL: http://lukeplant.me.uk/kio-sword/
 License: GPLv2+
@@ -29,6 +29,7 @@
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
 export KDEDIR=`kde-config --prefix`
+./autogen.sh --disable-rpath
 %configure --disable-rpath
 make %{?_smp_mflags}
 
@@ -79,6 +80,9 @@
 %doc AUTHORS COPYING README TODO
 
 %changelog
+* Wed Mar 11 2009 Deji Akingunola <dakingun at gmail.com> 0.3-9
+- Fix build failure after Fedora_11_Mass_Rebuild (Fix by Caolan McNamara)
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild