[virt-top/el5/master] - Resync EL-5 branch with Rawhide. - Disable gettext and translations. - Patch to add -lncurses when

Thu Aug 5 22:42:41 UTC 2010

commit 305c9857cb58eb822b4d71596828a0649b9f2c97
Author: Richard Jones <rjones at redhat.com>
Date:   Thu Aug 5 23:42:27 2010 +0100

    - Resync EL-5 branch with Rawhide.
    - Disable gettext and translations.
    - Patch to add -lncurses when linking native binary.

 .gitignore                                  |    1 +
 sources                                     |    2 +-
 virt-top-1.0.3-bogus-zh_CN-plurals.patch    |   10 +++++
 virt-top-1.0.4-bogus-ja-plurals.patch       |   12 ++++++
 virt-top-1.0.4-epel-link-with-ncurses.patch |   11 +++++
 virt-top.spec                               |   58 ++++++++++++++++++++-------
 6 files changed, 78 insertions(+), 16 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index e1d3cf9..c1c155e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 virt-top-1.0.1.tar.gz
+virt-top-1.0.4.tar.gz
diff --git a/sources b/sources
index dd0b866..ea22aaf 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f891f9ce49cc7b6399d1a751ce08296e  virt-top-1.0.1.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
new file mode 100644
index 0000000..e28a549
--- /dev/null
+++ b/virt-top-1.0.3-bogus-zh_CN-plurals.patch
@@ -0,0 +1,10 @@
+--- virt-top-1.0.3/po/zh_CN.po.orig	2008-10-21 10:51:15.000000000 +0100
++++ virt-top-1.0.3/po/zh_CN.po	2008-10-21 10:51:25.000000000 +0100
+@@ -14,7 +14,6 @@
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+ "Content-Transfer-Encoding: 8bit\n"
+-"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
+ "X-Generator: KBabel 1.11.4\n"
+ 
+ #: ../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-1.0.4-epel-link-with-ncurses.patch b/virt-top-1.0.4-epel-link-with-ncurses.patch
new file mode 100644
index 0000000..349b4d1
--- /dev/null
+++ b/virt-top-1.0.4-epel-link-with-ncurses.patch
@@ -0,0 +1,11 @@
+--- virt-top-1.0.4.orig/virt-top/Makefile.in	2009-10-05 15:30:49.000000000 +0100
++++ virt-top-1.0.4/virt-top/Makefile.in	2010-07-29 17:37:50.540652290 +0100
+@@ -64,7 +64,7 @@
+ 
+ OCAMLOPTPACKAGES := $(OCAMLCPACKAGES)
+ OCAMLOPTFLAGS	:= -w s
+-OCAMLOPTLIBS	:= $(OCAMLCLIBS)
++OCAMLOPTLIBS	:= $(OCAMLCLIBS) -cclib -lncurses
+ 
+ BYTE_TARGETS	:= virt-top
+ OPT_TARGETS	:= virt-top.opt
diff --git a/virt-top.spec b/virt-top.spec
index 1dfba59..b1e36e0 100644
--- a/virt-top.spec
+++ b/virt-top.spec
@@ -2,8 +2,8 @@
 %define debug_package %{nil}
 
 Name:           virt-top
-Version:        1.0.1
-Release:        7%{?dist}
+Version:        1.0.4
+Release:        3.1%{?dist}
 Summary:        Utility like top(1) for displaying virtualization stats
 
 Group:          Development/Libraries
@@ -11,8 +11,13 @@ License:        GPLv2+
 URL:            http://et.redhat.com/~rjones/virt-top/
 Source0:        http://et.redhat.com/~rjones/virt-top/files/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+ExcludeArch:    sparc64 s390 s390x ppc
 
-ExcludeArch:    ppc
+Patch0:         virt-top-1.0.3-bogus-zh_CN-plurals.patch
+Patch1:         virt-top-1.0.4-bogus-ja-plurals.patch
+
+# Specific to EL-5 branch:
+Patch2:         virt-top-1.0.4-epel-link-with-ncurses.patch
 
 BuildRequires:  ocaml >= 3.09.3
 BuildRequires:  ocaml-ocamldoc
@@ -30,6 +35,7 @@ BuildRequires:  perl
 BuildRequires:  gawk
 BuildRequires:  ncurses-devel
 
+
 %description
 virt-top is a 'top(1)'-like utility for showing stats of virtualized
 domains.  Many keys and command line options are the same as for
@@ -41,6 +47,9 @@ different virtualization systems.
 
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
 chmod -x COPYING
 
 
@@ -79,22 +88,41 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Fri Jun 27 2008 Richard W.M. Jones <rjones at redhat.com> - 1.0.1-7
-- Grrr, apparently using # to comment out an RPM define doesn't
-  really work.  Fully remove the OCaml dependency generator.
+* Thu Jul 29 2010 Richard W.M. Jones <rjones at redhat.com> - 1.0.4-3.1
+- Resync EL-5 branch with Rawhide.
+- Disable gettext and translations.
+- Patch to add -lncurses when linking native binary.
+
+* Wed Dec 30 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.4-3
+- Force rebuild against latest ocaml-gettext 0.3.3 (RHBZ#508197#c10).
+
+* Mon Oct  5 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.4-2
+- 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.
+- Additional BR on gettext (for msgfmt).
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.3-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Thu Apr 16 2009 S390x secondary arch maintainer <fedora-s390x at lists.fedoraproject.org>
+- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs
+  (added sparc64 per request from the sparc maintainer)
 
-* Fri Jun 27 2008 Richard W.M. Jones <rjones at redhat.com> - 1.0.1-6
-- Properly disable ocaml-gettext.
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.3-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
-* Fri Jun 27 2008 Richard W.M. Jones <rjones at redhat.com> - 1.0.1-5
-- BR ncurses.
+* Wed Nov 26 2008 Richard W.M. Jones <rjones at redhat.com> - 1.0.3-3
+- Rebuild for OCaml 3.11.0+rc1.
 
-* Tue May 20 2008 Richard W.M. Jones <rjones at redhat.com> - 1.0.1-4
-- ExcludeArch ppc (no libvirt on ppc).
+* Tue Oct 21 2008 Richard W.M. Jones <rjones at redhat.com> - 1.0.3-2
+- Fix incorrect sources file.
+- Remove bogus Plural-Forms line from zh_CN PO file.
 
-* Tue May 20 2008 Richard W.M. Jones <rjones at redhat.com> - 1.0.1-3
-- Disable use of ocaml-gettext.
-- Soften requirements for OCaml 3.09 in EPEL.
+* Tue Oct 21 2008 Richard W.M. Jones <rjones at redhat.com> - 1.0.3-1
+- New upstream version 1.0.3.
 
 * Mon May 19 2008 Richard W.M. Jones <rjones at redhat.com> - 1.0.1-2
 - Use RPM percent-configure.
