[coda] Extend coda-6.9.5-vcodacon-configure.patch to reflect fltk headers having changed (Fix FTBS). Add "t

[corsepiu]

commit 8d1a32670f9bfaf95c29d6dd36c3ca56cdc34d05
Author: Ralf Corsépius <corsepiu at fedoraproject.org>
Date:   Sun Jun 12 09:32:51 2011 +0200

    Extend coda-6.9.5-vcodacon-configure.patch to reflect fltk headers having
    changed (Fix FTBS).
    Add "touch-magic" to avoid rerunning the autotools.
    Revert the Fri Jun 03 2011's spec changes.

 coda-6.9.5-vcodacon-configure.patch |   39 ++++++++++++++++++++++++++++++++--
 coda.spec                           |   13 +++++++++-
 2 files changed, 47 insertions(+), 5 deletions(-)
---
diff --git a/coda-6.9.5-vcodacon-configure.patch b/coda-6.9.5-vcodacon-configure.patch
index c32c8f3..c173ef0 100644
--- a/coda-6.9.5-vcodacon-configure.patch
+++ b/coda-6.9.5-vcodacon-configure.patch
@@ -1,6 +1,18 @@
-diff -ur coda-6.9.5~/configure coda-6.9.5/configure
---- coda-6.9.5~/configure	2010-03-29 15:13:56.000000000 -0400
-+++ coda-6.9.5/configure	2010-05-18 14:30:13.421803730 -0400
+diff -Naur coda-6.9.5.orig/configs/coda_macros.m4 coda-6.9.5/configs/coda_macros.m4
+--- coda-6.9.5.orig/configs/coda_macros.m4	2008-10-06 18:52:05.000000000 +0200
++++ coda-6.9.5/configs/coda_macros.m4	2011-06-12 09:10:03.843072231 +0200
+@@ -292,7 +292,7 @@
+    esac
+    AC_LANG_SAVE
+    AC_LANG_CPLUSPLUS
+-   CODA_FIND_LIB(fltk, [#include <Fl/Fl.H>], Fl::run(), "$FLTKLIBS")
++   CODA_FIND_LIB(fltk, [#include <FL/Fl.H>], Fl::run(), "$FLTKLIBS")
+    AC_LANG_RESTORE
+    AC_MSG_CHECKING([if we can build vcodacon])
+    if test "${coda_cv_path_fltk}" != none ; then
+diff -Naur coda-6.9.5.orig/configure coda-6.9.5/configure
+--- coda-6.9.5.orig/configure	2010-03-29 21:13:56.000000000 +0200
++++ coda-6.9.5/configure	2011-06-12 09:10:03.848072316 +0200
 @@ -15415,7 +15415,7 @@
  
  # Check whether --with-vcodacon was given.
@@ -10,3 +22,24 @@ diff -ur coda-6.9.5~/configure coda-6.9.5/configure
  else
    buildvcodacon="no"
  fi
+@@ -16748,7 +16748,7 @@
+      fi
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+-#include <Fl/Fl.H>
++#include <FL/Fl.H>
+ int
+ main ()
+ {
+diff -Naur coda-6.9.5.orig/configure.ac coda-6.9.5/configure.ac
+--- coda-6.9.5.orig/configure.ac	2010-03-26 21:38:55.000000000 +0100
++++ coda-6.9.5/configure.ac	2011-06-12 09:10:03.849072333 +0200
+@@ -43,7 +43,7 @@
+ AC_ARG_ENABLE(server, [  --enable-server	  build Coda server components],
+     buildserver="$enableval", buildserver="no")
+ AC_ARG_WITH(vcodacon, [  --with-vcodacon	  build graphical Coda console],
+-    buildvcodacon="$enableval", buildvcodacon="no")
++    buildvcodacon="$withval", buildvcodacon="no")
+ 
+ dnl Make sure we configure any sub-projects before checking with pkg-config
+ test -f "${srcdir}/lib-src/lwp/configure.in" && AC_CONFIG_SUBDIRS([lib-src/lwp])
diff --git a/coda.spec b/coda.spec
index 5c76ef9..17cbcf3 100644
--- a/coda.spec
+++ b/coda.spec
@@ -18,7 +18,7 @@ BuildRequires:  lwp-devel
 BuildRequires:  rpc2-devel
 BuildRequires:  rvm-devel
 BuildRequires:  rvm-tools compat-readline5-devel
-BuildRequires:  fltk fltk-devel fltk-fluid flex bison python perl krb5-devel
+BuildRequires:  fltk-devel fltk-fluid flex bison python perl krb5-devel
 BuildRequires:  e2fsprogs-devel
 Requires:       krb5-libs compat-readline5
 
@@ -85,7 +85,7 @@ distributed file system client.
 %package vcodacon
 Summary:        Graphical console for the Coda distributed file system
 Group:          System Environment/Daemons
-Requires:       coda-client = %{version}-%{release} fltk
+Requires:       coda-client = %{version}-%{release}
 
 %description vcodacon
 This package contains vcodacon, a graphical console for the Coda file
@@ -104,6 +104,9 @@ system client.
 # fix building vcodacon (already fixed differently upstream in git)
 %patch2 -p1
 
+# Avoid rerunning autotools
+touch -r aclocal.m4 configure configure.ac configs/*.m4
+
 %build
 # note: remove the -I and -l here when upstream releases fix for krb5 building
 export CFLAGS="$RPM_OPT_FLAGS -I%{_includedir}/et -I%{_includedir}/readline5"
@@ -323,6 +326,12 @@ fi
 
 
 %changelog
+* Sun Jun 12 2011 Ralf Corsépius <corsepiu at fedoraproject.org> - 6.9.5-6
+- Extend coda-6.9.5-vcodacon-configure.patch to reflect fltk headers having
+  changed (Fix FTBS).
+- Add "touch-magic" to avoid rerunning the autotools.
+- Revert the Fri Jun 03 2011's spec changes.
+
 * Fri Jun 03 2011 Neil Horman <nhorman at redhat.com> - 6.9.5-5
 - Found an additional missing depends