Accepting request 496360 from Virtualization

Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/496360
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/virt-top?expand=0&rev=2

virt-top.bytecode.patch

@@ -0,0 +1,19 @@
+--- a/virt-top/Makefile.in
++++ b/virt-top/Makefile.in
+@@ -102,9 +102,13 @@ virt-top.txt: virt-top.pod
+ endif
+ 
+ install:
++	set -x ; \
++	exe=virt-top ; \
+ 	if [ -x virt-top.opt ]; then \
+-	  mkdir -p $(DESTDIR)$(bindir); \
+-	  $(INSTALL) -m 0755 virt-top.opt $(DESTDIR)$(bindir)/virt-top; \
+-	fi
++	exe=virt-top.opt ; \
++	fi ; \
++	mkdir -p $(DESTDIR)$(bindir); \
++	$(INSTALL) -m 0755 $${exe} $(DESTDIR)$(bindir)/virt-top; \
++	: done
+ 
+ include ../Make.rules

virt-top.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Tue May  9 15:50:45 UTC 2017 - olaf@aepfle.de
+
+- Install also bytecode with virt-top.bytecode.patch (bsc#1031359)
+
+-------------------------------------------------------------------
+Wed May  3 13:32:48 UTC 2017 - olaf@aepfle.de
+
+- Remove usage of ExcludeArch (bsc#1031359)
+
 -------------------------------------------------------------------
 Tue Aug 16 19:14:49 UTC 2016 - mlatimer@suse.com
 

virt-top.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package virt-top
 #
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -18,14 +18,14 @@
 
 Name:           virt-top
 Version:        1.0.8
-%{ocaml_preserve_bytecode}
 Release:        0
+%{ocaml_preserve_bytecode}
 Summary:        Utility like top(1) for displaying virtualization stats
 License:        GPL-2.0+
 Group:          System/Management
 Url:            http://people.redhat.com/~rjones/virt-top/
 Source0:        https://people.redhat.com/~rjones/virt-top/files/%{name}-%{version}.tar.gz
-ExcludeArch:    ia64 s390 s390x
+Patch0:         virt-top.bytecode.patch
 ## Update configure for aarch64 (bz #926701)
 Patch1:         virt-top-aarch64.patch
 ## Don't warn about immutable strings (OCaml 4.02).
@@ -36,10 +36,10 @@ BuildRequires:  gettext
 # Non-OCaml BRs.
 BuildRequires:  libvirt-devel
 BuildRequires:  ocaml >= 3.10.2
-BuildRequires:  ocaml-rpm-macros >= 4.02.1
 BuildRequires:  ocaml-calendar-devel
 BuildRequires:  ocaml-camlp4
 BuildRequires:  ocaml-csv-devel
+BuildRequires:  ocaml-rpm-macros >= 4.02.1
 # Need the ncurses / ncursesw (--enable-widec) fix.
 BuildRequires:  ocaml-curses-devel >= 1.0.3
 BuildRequires:  ocaml-extlib-devel
@@ -49,13 +49,13 @@ BuildRequires:  ocaml-findlib-devel
 BuildRequires:  ocaml-gettext-devel >= 0.3.5
 BuildRequires:  ocaml-gettext-stub-devel >= 0.3.5
 # Need support for virDomainGetCPUStats (fixed in 0.6.1.2).
+BuildRequires:  ncurses-devel
 BuildRequires:  ocaml-libvirt-devel >= 0.6.1.2-5
 BuildRequires:  ocaml-ocamldoc
 BuildRequires:  ocaml-xml-light-devel
 BuildRequires:  perl
-BuildRequires:  perl(Pod::Perldoc)
 BuildRequires:  strace
-BuildRequires:  ncurses-devel
+BuildRequires:  perl(Pod::Perldoc)
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -68,6 +68,7 @@ different virtualization systems.
 
 %prep
 %setup -q
+%patch0 -p1
 
 ## Update configure for aarch64 (bz #926701)
 %patch1 -p1
@@ -76,7 +77,6 @@ different virtualization systems.
 
 chmod -x COPYING
 
-
 %build
 %configure
 make %{?_smp_mflags} all
@@ -91,7 +91,6 @@ make %{?_smp_mflags} -C po
 rm -f virt-top/virt-top.1
 make %{?_smp_mflags} -C virt-top virt-top.1
 
-
 %install
 make DESTDIR=%{buildroot} install %{?_smp_mflags}
 
@@ -104,8 +103,6 @@ make -C po install PODIR="%{buildroot}%{_datadir}/locale"
 mkdir -p %{buildroot}%{_mandir}/man1
 install -m 0644 virt-top/virt-top.1 %{buildroot}%{_mandir}/man1
 
-
-
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc COPYING README TODO ChangeLog