From 209d65323f0cdca37b8555b468010888bb0af126 Mon Sep 17 00:00:00 2001
From: Petr Machata <pmachata@fedoraproject.org>
Date: Mon, 12 Nov 2007 15:26:42 +0000
Subject: [PATCH] - Install info file. - Resolves: #230652

---
 .cvsignore                  |  1 +
 dejagnu-1.4.4-no-info.patch | 24 ------------------------
 dejagnu.spec                | 25 ++++++++++++++++++++-----
 sources                     |  1 +
 4 files changed, 22 insertions(+), 29 deletions(-)
 delete mode 100644 dejagnu-1.4.4-no-info.patch

diff --git a/.cvsignore b/.cvsignore
index ecd3717..ee32db3 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1,2 @@
 dejagnu-1.4.4.tar.gz
+dejagnu.texi
diff --git a/dejagnu-1.4.4-no-info.patch b/dejagnu-1.4.4-no-info.patch
deleted file mode 100644
index 89e959d..0000000
--- a/dejagnu-1.4.4-no-info.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -urp dejagnu-1.4.4/doc/runtest.1 dejagnu-1.4.4-pm/doc/runtest.1
---- dejagnu-1.4.4/doc/runtest.1	2003-08-17 03:24:41.000000000 +0200
-+++ dejagnu-1.4.4-pm/doc/runtest.1	2007-03-07 13:38:07.000000000 +0100
-@@ -14,9 +14,7 @@ and variations on how to run them.
- 
- You can find a comprehensive description of DejaGnu and \fBruntest\fR in
- .I
--The DejaGnu Testing Framework
--or its Info version,
--.BR dejagnu.info .
-+The DejaGnu Testing Framework.
- .SH OPTIONS
- .TP
- .B --all
-@@ -110,8 +108,7 @@ file \fBsite.exp\fR, created during conf
- sets the exit code to 1 if any of the tests failed, or
- sets it to 0 if all the tests passed.
- .SH SEE ALSO
--.I The DejaGnu Testing Framework
--.RB ( dejagnu.info ).
-+.I The DejaGnu Testing Framework.
- This is the DejaGnu manual; its source is the SGML files
- .B
- doc/*.sgml.
diff --git a/dejagnu.spec b/dejagnu.spec
index 3467027..1a71181 100644
--- a/dejagnu.spec
+++ b/dejagnu.spec
@@ -1,10 +1,11 @@
 Summary: A front end for testing other programs
 Name: dejagnu
 Version: 1.4.4
-Release: 10
+Release: 11
 Epoch: 1
 License: GPLv2+
 Source: ftp://ftp.gnu.org/gnu/dejagnu/dejagnu-%{version}.tar.gz
+Source2: dejagnu.texi
 Group: Development/Tools
 URL: http://www.gnu.org/software/dejagnu/
 Requires: expect
@@ -12,7 +13,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 BuildRequires: expect screen
 Patch1: dejagnu-1.4.4-smp-1.patch
-Patch2: dejagnu-1.4.4-no-info.patch
 Patch3: dejagnu-1.4.4-testsuite.patch
 
 %description
@@ -26,22 +26,23 @@ into software development).
 %prep
 %setup -q
 %patch1 -p1
-%patch2 -p1
 %patch3 -p1
 
 %build
 %configure -v
+makeinfo %{SOURCE2} -o doc/%{name}.info
 
 %check
 echo ============TESTING===============
 # Dejagnu test suite also has to test reporting to user.  It needs a
 # terminal for that.  That doesn't compute in mock.  Work around it by
 # running the test under screen and communicating back to test runner
-# via temporary file.  If you come with better method, please do tell.
-TMP=`mktemp` || exit 1
+# via temporary file.  If you have better idea, we accept patches.
+TMP=`mktemp`
 screen -D -m sh -c '(make check RUNTESTFLAGS="RUNTEST=`pwd`/runtest"; echo $?) >> '$TMP
 RESULT=`tail -n 1 $TMP`
 cat $TMP
+rm -f $TMP
 echo ============END TESTING===========
 exit $RESULT
 
@@ -50,6 +51,15 @@ rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
 chmod a-x $RPM_BUILD_ROOT/%{_datadir}/dejagnu/runtest.exp
 make -C doc DESTDIR=$RPM_BUILD_ROOT install-man
+install -D -m 644 doc/dejagnu.info $RPM_BUILD_ROOT/%{_infodir}/%{name}.info
+
+%post
+/sbin/install-info %{_infodir}/%{name}.info.gz --dir-file=%{_infodir}/dir ||:
+
+%preun
+if [ $1 = 0 ]; then
+    /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir ||:
+fi
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -61,8 +71,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/dejagnu
 %{_includedir}/dejagnu.h
 %{_mandir}/*/*
+%{_infodir}/*
 
 %changelog
+* Mon Nov 12 2007 Petr Machata <pmachata@redhat.com> - 1:1.4.4-11
+- Install info file.
+- Resolves: #230652
+
 * Thu Oct  4 2007 Petr Machata <pmachata@redhat.com> - 1:1.4.4-10
 - A few more cleanups after discussion with reviewer.
 - Resolves: #225679
diff --git a/sources b/sources
index bca5670..96898f2 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
 053f18fd5d00873de365413cab17a666  dejagnu-1.4.4.tar.gz
+d70aca4d793a8fbdd6906b8ac5333195  dejagnu.texi