[check] New upstream version. Drop upstream patch for 0.9.8; fix now merged.

[Jerry James]

commit 178336d4436328609bd351358e7deefba665728a
Author: Jerry James <jamesjer at betterlinux.com>
Date:   Mon Oct 22 13:00:15 2012 -0600

    New upstream version.
    Drop upstream patch for 0.9.8; fix now merged.

 .gitignore                                      |    2 +-
 0001-fix-failed-test-exit-in-no-fork-mode.patch |  248 -----------------------
 check-format.patch                              |   39 ++++
 check.spec                                      |   32 +++-
 sources                                         |    2 +-
 5 files changed, 66 insertions(+), 257 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 1d515d5..9c07034 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-check-0.9.8.tar.gz
+/check-0.9.9.tar.gz
diff --git a/check-format.patch b/check-format.patch
new file mode 100644
index 0000000..5482360
--- /dev/null
+++ b/check-format.patch
@@ -0,0 +1,39 @@
+--- ./src/check_print.c.orig	2012-10-22 08:03:34.000000000 -0600
++++ ./src/check_print.c	2012-10-22 12:51:11.343652481 -0600
+@@ -179,10 +179,10 @@ void tr_xmlprint (FILE *file, TestResult
+           tr->duration < 0 ? 0 : tr->duration % 1000000);
+   fprintf(file, "      <description>");
+   fprint_xml_esc(file, tr->tcname);
+-  fprintf(file,"</description>\n", tr->tcname);
+-  fprintf(file, "      <message>", tr->msg);
++  fprintf(file,"</description>\n");
++  fprintf(file, "      <message>");
+   fprint_xml_esc(file, tr->msg);
+-  fprintf(file,"</message>\n", tr->msg);
++  fprintf(file,"</message>\n");
+   fprintf(file, "    </test>\n");
+   
+   if (slash != NULL) {
+--- ./src/check_log.c.orig	2012-10-22 08:03:34.000000000 -0600
++++ ./src/check_log.c	2012-10-22 12:49:29.626726729 -0600
+@@ -257,7 +257,7 @@ void xml_lfun (SRunner *sr CK_ATTRIBUTE_
+       gettimeofday(&now, NULL);
+       timersub(&now, &inittv, &now);
+ 
+-      fprintf(file, "  <duration>%d.%06d</duration>\n",
++      fprintf(file, "  <duration>%ld.%06ld</duration>\n",
+               now.tv_sec, now.tv_usec);
+       fprintf(file, "</testsuites>\n");
+     }
+@@ -267,9 +267,9 @@ void xml_lfun (SRunner *sr CK_ATTRIBUTE_
+   case CLSTART_S:
+     s = obj;
+     fprintf(file, "  <suite>\n");
+-    fprintf(file, "    <title>", s->name);
++    fprintf(file, "    <title>");
+     fprint_xml_esc(file, s->name);
+-    fprintf(file,"</title>\n", s->name);
++    fprintf(file,"</title>\n");
+     break;
+   case CLEND_SR:
+     break;
diff --git a/check.spec b/check.spec
index 39ad607..ca2b1f7 100644
--- a/check.spec
+++ b/check.spec
@@ -1,13 +1,16 @@
 Name:           check
-Version:        0.9.8
-Release:        6%{?dist}
+Version:        0.9.9
+Release:        1%{?dist}
 Summary:        A unit test framework for C
 Source0:        http://downloads.sourceforge.net/check/%{name}-%{version}.tar.gz
-# Patch from upstream to fix bz 821933
-Patch0:         0001-fix-failed-test-exit-in-no-fork-mode.patch
+# Fix some formatted printing bugs.  Sent upstream 22 Oct. 2012.
+Patch0:         %{name}-format.patch
 Group:          Development/Tools
 License:        LGPLv2+
 URL:            http://check.sourceforge.net/
+
+BuildRequires:  pkgconfig
+
 Requires(post): info
 Requires(preun): info
 
@@ -36,17 +39,26 @@ Static libraries of check.
 
 %prep
 %setup -q
-%patch0 -p1
+%patch0
+
+# Fix detection of localtime_r declaration
+sed -i "/localtime_r/s/ac_includes_default/&\n#include <time.h>/" configure
 
 %build
-%configure CFLAGS="${RPM_OPT_FLAGS} -fPIC"
+%configure
+
+# Get rid of undesirable hardcoded rpaths
+sed -e 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' \
+    -e 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' \
+    -i libtool
+
 make
 
 %install
 make DESTDIR=$RPM_BUILD_ROOT install
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 rm -rf $RPM_BUILD_ROOT%{_infodir}/dir
-rm -rf $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}
+rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}
 
 %post
 /sbin/ldconfig
@@ -71,6 +83,8 @@ fi
 
 %files devel
 %doc doc/example
+%{_bindir}/checkmk
+%{_mandir}/man1/checkmk.1*
 %{_includedir}/check.h
 %{_libdir}/libcheck.so
 %{_libdir}/pkgconfig/check.pc
@@ -82,6 +96,10 @@ fi
 %{_libdir}/libcheck.a
 
 %changelog
+* Mon Oct 22 2012 Jerry James <loganjerry at gmail.com> - 0.9.9-1
+- New upstream version
+- Drop upstream patch for 0.9.8; fix now merged
+
 * Wed Jul 18 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.8-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
diff --git a/sources b/sources
index b233f50..8c1a3ac 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5d75e9a6027cde79d2c339ef261e7470  check-0.9.8.tar.gz
+f3702f2fcfc19ce3f62dca66c241a168  check-0.9.9.tar.gz