rpms/dejagnu/devel .cvsignore, 1.4, 1.5 dejagnu.spec, 1.6, 1.7 sources, 1.4, 1.5 dejagnu-1.4.4-no-info.patch, 1.1, NONE

[Petr Machata (pmachata)]

Author: pmachata

Update of /cvs/pkgs/rpms/dejagnu/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19556

Modified Files:
	.cvsignore dejagnu.spec sources 
Removed Files:
	dejagnu-1.4.4-no-info.patch 
Log Message:
- Install info file.
- Resolves: #230652



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dejagnu/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	9 Sep 2004 04:08:54 -0000	1.4
+++ .cvsignore	12 Nov 2007 15:26:42 -0000	1.5
@@ -1 +1,2 @@
 dejagnu-1.4.4.tar.gz
+dejagnu.texi


Index: dejagnu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dejagnu/devel/dejagnu.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- dejagnu.spec	4 Oct 2007 15:05:21 -0000	1.6
+++ dejagnu.spec	12 Nov 2007 15:26:42 -0000	1.7
@@ -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 @@
 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 @@
 %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 @@
 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 @@
 %{_datadir}/dejagnu
 %{_includedir}/dejagnu.h
 %{_mandir}/*/*
+%{_infodir}/*
 
 %changelog
+* Mon Nov 12 2007 Petr Machata <pmachata at redhat.com> - 1:1.4.4-11
+- Install info file.
+- Resolves: #230652
+
 * Thu Oct  4 2007 Petr Machata <pmachata at redhat.com> - 1:1.4.4-10
 - A few more cleanups after discussion with reviewer.
 - Resolves: #225679


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dejagnu/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	9 Sep 2004 04:08:54 -0000	1.4
+++ sources	12 Nov 2007 15:26:42 -0000	1.5
@@ -1 +1,2 @@
 053f18fd5d00873de365413cab17a666  dejagnu-1.4.4.tar.gz
+d70aca4d793a8fbdd6906b8ac5333195  dejagnu.texi


--- dejagnu-1.4.4-no-info.patch DELETED ---