From 443e4b4fca8f269410e8f6caf1388bc270a4507b Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@fedoraproject.org>
Date: Mon, 5 Oct 2009 15:26:50 +0000
Subject: [PATCH] - New upstream release 1.0.4. - Includes new translations
 (RHBZ#493799). - Overall hardware memory is now displayed in CSV file
 (RHBZ#521785). - Several fixes to Japanese support (RHBZ#508197). - Japanese
 PO file also has bogus plural forms.

---
 .cvsignore                               |  3 +--
 sources                                  |  2 +-
 virt-top-1.0.3-bogus-zh_CN-plurals.patch |  2 +-
 virt-top-1.0.4-bogus-ja-plurals.patch    | 12 ++++++++++++
 virt-top.spec                            | 19 +++++++++++++------
 5 files changed, 28 insertions(+), 10 deletions(-)
 create mode 100644 virt-top-1.0.4-bogus-ja-plurals.patch

diff --git a/.cvsignore b/.cvsignore
index 61ffa1d..99e269d 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1 @@
-virt-top-1.0.1.tar.gz
-virt-top-1.0.3.tar.gz
+virt-top-1.0.4.tar.gz
diff --git a/sources b/sources
index 37cc38c..ea22aaf 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-18662bfbaa13c314ed07734cb1f5913e  virt-top-1.0.3.tar.gz
+491929219b5b49b4e502a1643599be95  virt-top-1.0.4.tar.gz
diff --git a/virt-top-1.0.3-bogus-zh_CN-plurals.patch b/virt-top-1.0.3-bogus-zh_CN-plurals.patch
index f81ee2c..e28a549 100644
--- a/virt-top-1.0.3-bogus-zh_CN-plurals.patch
+++ b/virt-top-1.0.3-bogus-zh_CN-plurals.patch
@@ -7,4 +7,4 @@
 -"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
  "X-Generator: KBabel 1.11.4\n"
  
- #: ../virt-top/virt_top.ml:1490
+ #: ../virt-top/virt_top.ml:1492
diff --git a/virt-top-1.0.4-bogus-ja-plurals.patch b/virt-top-1.0.4-bogus-ja-plurals.patch
new file mode 100644
index 0000000..fb28b64
--- /dev/null
+++ b/virt-top-1.0.4-bogus-ja-plurals.patch
@@ -0,0 +1,12 @@
+diff -ur virt-top-1.0.4.orig/po/ja.po virt-top-1.0.4/po/ja.po
+--- virt-top-1.0.4.orig/po/ja.po	2009-10-05 16:24:06.295900599 +0100
++++ virt-top-1.0.4/po/ja.po	2009-10-05 16:24:49.296650985 +0100
+@@ -10,7 +10,7 @@
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+ "Content-Transfer-Encoding: 8bit\n"
+-"Plural-Forms: Plural-Forms: nplurals=1; plural=0;\n\n"
++"Plural-Forms: nplurals=1; plural=0;\n\n"
+ "X-Generator: KBabel 1.11.4\n"
+ 
+ #: ../virt-top/virt_top.ml:1492
diff --git a/virt-top.spec b/virt-top.spec
index 1bdefe8..2f2334f 100644
--- a/virt-top.spec
+++ b/virt-top.spec
@@ -2,8 +2,8 @@
 %define debug_package %{nil}
 
 Name:           virt-top
-Version:        1.0.3
-Release:        5%{?dist}
+Version:        1.0.4
+Release:        1%{?dist}
 Summary:        Utility like top(1) for displaying virtualization stats
 
 Group:          Development/Libraries
@@ -14,11 +14,13 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 ExcludeArch:    sparc64 s390 s390x
 
 Patch0:         virt-top-1.0.3-bogus-zh_CN-plurals.patch
+Patch1:         virt-top-1.0.4-bogus-ja-plurals.patch
 
 BuildRequires:  ocaml >= 3.10.2
 BuildRequires:  ocaml-ocamldoc
 BuildRequires:  ocaml-findlib-devel
-BuildRequires:  ocaml-curses-devel
+# Need the ncurses / ncursesw (--enable-widec) fix.
+BuildRequires:  ocaml-curses-devel >= 1.0.3-7
 BuildRequires:  ocaml-extlib-devel
 BuildRequires:  ocaml-xml-light-devel
 BuildRequires:  ocaml-csv-devel
@@ -37,9 +39,6 @@ BuildRequires:  libvirt-devel
 BuildRequires:  perl
 BuildRequires:  gawk
 
-#%define _use_internal_dependency_generator 0
-#%define __find_requires /usr/lib/rpm/ocaml-find-requires.sh
-#%define __find_provides /usr/lib/rpm/ocaml-find-provides.sh
 
 %description
 virt-top is a 'top(1)'-like utility for showing stats of virtualized
@@ -53,6 +52,7 @@ different virtualization systems.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 chmod -x COPYING
 
 
@@ -99,6 +99,13 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Oct  5 2009 Richard W.M. Jones <rjones@redhat.com> - 1.0.4-1
+- New upstream release 1.0.4.
+- Includes new translations (RHBZ#493799).
+- Overall hardware memory is now displayed in CSV file (RHBZ#521785).
+- Several fixes to Japanese support (RHBZ#508197).
+- Japanese PO file also has bogus plural forms.
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.3-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild