[meego-commits] 7604: Changes to Trunk:Testing/time

[Yan Yin]

Hi,
I have made the following changes to time in project Trunk:Testing. Please review and accept ASAP.

Thank You,
Yan Yin

[This message was auto-generated]

---

Request #7604:

  submit:   home:yyin2:branches:Trunk:Testing/time(r2)(cleanup) -> Trunk:Testing/time


Message:
    Fix info warnings in fix-info-direntry.patch (BMC #6850)

State:   new          2010-09-18T23:09:56 yyin2
Comment: None



changes files:
--------------
--- time.changes
+++ time.changes
@@ -0,0 +1,3 @@
+* Sun Sep 19 2010 Yan Yin <yan.yin at intel.com> - 1.7
+* Fix info warnings in fix-info-direntry.patch (BMC #6850)
+

new:
----
  fix-info-direntry.patch

spec files:
-----------
--- time.spec
+++ time.spec
@@ -1,6 +1,6 @@
 # 
-# Do not Edit! Generated by:
-# spectacle version 0.17
+# Do NOT Edit the Auto-generated Part!
+# Generated by: spectacle version 0.19
 # 
 # >> macros
 # << macros
@@ -16,8 +16,10 @@
 Source100:  time.yaml
 Patch0:     time-1.7-destdir.patch
 Patch1:     time-1.7-verbose.patch
+Patch2:     fix-info-direntry.patch
 Requires(post): /sbin/install-info
 Requires(postun): /sbin/install-info
+BuildRequires:  texinfo
 
 
 %description
@@ -35,6 +37,8 @@
 %patch0 -p1
 # time-1.7-verbose.patch
 %patch1 -p1
+# fix-info-direntry.patch
+%patch2 -p1
 # >> setup
 # << setup
 
@@ -63,7 +67,7 @@
 %post
 %install_info --info-dir=%_infodir %{_infodir}/time.info.gz
 
-%postun
+%preun
 if [ $1 = 0 ] ;then
 %install_info_delete --info-dir=%{_infodir} %{_infodir}/time.info.gz
 fi

other changes:
--------------

++++++ fix-info-direntry.patch (new)
--- fix-info-direntry.patch
+++ fix-info-direntry.patch
+diff -uprN time-1.7/time.texi time-1.7.patched/time.texi
+--- time-1.7/time.texi	1996-06-13 01:40:29.000000000 +0800
++++ time-1.7.patched/time.texi	2010-09-19 13:03:22.964975402 +0800
+@@ -39,6 +39,11 @@ except that this permission notice may b
+ by the Foundation.
+ @end ifinfo
+ 
++ at direntry
++* time: (time).                        GNU time utility. 
++ at end direntry
++
++
+ @titlepage
+ @title Measuring Program Resource Use
+ @subtitle The GNU @code{time} Command

++++++ time.yaml
--- time.yaml
+++ time.yaml
@@ -10,6 +10,9 @@
 Patches:
     - time-1.7-destdir.patch
     - time-1.7-verbose.patch
+    - fix-info-direntry.patch
+PkgBR:
+    - texinfo
 Description: |
     The GNU time utility runs another program, collects information about
     the resources used by that program while it is running, and displays