Accepting request 747656 from devel:languages:ocaml

Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/747656
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/virt-top?expand=0&rev=3
This commit is contained in:
Dominique Leuenberger 2019-11-13 12:24:44 +00:00 committed by Git OBS Bridge
parent da7e9ed4dc
commit 97f9995b6a
8 changed files with 48 additions and 1797 deletions

14
_service Normal file
View File

@ -0,0 +1,14 @@
<services>
<service name="tar_scm" mode="disabled">
<param name="url">https://github.com/olafhering/virt-top.git</param>
<param name="scm">git</param>
<param name="versionformat">1.0.9</param>
<param name="revision">dune-wip</param>
<param name="filename">virt-top</param>
</service>
<service name="recompress" mode="disabled">
<param name="file">*.tar</param>
<param name="compression">xz</param>
</service>
<service name="set_version" mode="disabled"/>
</services>

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7c849fe949772edb6792d50be65d8c0900cf3039708bbc7fa511bed184d32112
size 162573

3
virt-top-1.0.9.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:cef82424194e770b927415fb8e56669dddd05cf264b35f2e6afde1781c04d4f8
size 72120

File diff suppressed because it is too large Load Diff

View File

@ -1,20 +0,0 @@
---
virt-top/Makefile.in | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- a/virt-top/Makefile.in
+++ b/virt-top/Makefile.in
@@ -64,11 +64,11 @@ OBJS += virt_top_main.cmo
XOBJS := $(OBJS:.cmo=.cmx)
-OCAMLCFLAGS := -g -warn-error A
+OCAMLCFLAGS := -g -warn-error A-3-52
OCAMLCLIBS := -linkpkg
OCAMLOPTPACKAGES := $(OCAMLCPACKAGES)
-OCAMLOPTFLAGS := -warn-error A
+OCAMLOPTFLAGS := -warn-error A-3-52
OCAMLOPTLIBS := $(OCAMLCLIBS)
BYTE_TARGETS := virt-top

View File

@ -1,19 +0,0 @@
--- 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

View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Fri Nov 1 12:34:56 UTC 2019 - olaf@aepfle.de
- Require current dune macros
- Update to version 1.0.9, via _service file
- Remove virt-top-aarch64.patch
- Remove virt-top-no-immutable-warning.patch
- Remove virt-top.bytecode.patch
-------------------------------------------------------------------
Tue May 9 15:50:45 UTC 2017 - olaf@aepfle.de

View File

@ -12,51 +12,28 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
Name: virt-top
Version: 1.0.8
Version: 1.0.9
Release: 0
%{ocaml_preserve_bytecode}
%{?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
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).
Patch2: virt-top-no-immutable-warning.patch
BuildRequires: gawk
# For msgfmt:
BuildRequires: gettext
# Non-OCaml BRs.
BuildRequires: libvirt-devel
BuildRequires: ocaml >= 3.10.2
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
BuildRequires: ocaml-fileutils-devel
BuildRequires: ocaml-findlib-devel
# Tortuous list of BRs for gettext.
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: strace
BuildRequires: perl(Pod::Perldoc)
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: %{name}-%{version}.tar.xz
BuildRequires: ocaml
BuildRequires: ocaml-dune
BuildRequires: ocaml-rpm-macros >= 20191101
BuildRequires: ocamlfind(curses)
BuildRequires: ocamlfind(extlib)
BuildRequires: ocamlfind(gettext)
BuildRequires: ocamlfind(gettext-stub)
BuildRequires: ocamlfind(libvirt)
BuildRequires: ocamlfind(str)
%description
virt-top is a 'top(1)'-like utility for showing stats of virtualized
@ -67,50 +44,19 @@ It uses libvirt so it is capable of showing stats across a variety of
different virtualization systems.
%prep
%setup -q
%patch0 -p1
## Update configure for aarch64 (bz #926701)
%patch1 -p1
%patch2 -p1
chmod -x COPYING
%autosetup -p1
%build
%configure
make %{?_smp_mflags} all
%if %{ocaml_native_compiler}
make %{?_smp_mflags} opt
%endif
# Build translations.
make %{?_smp_mflags} -C po
# Force rebuild of man page.
rm -f virt-top/virt-top.1
make %{?_smp_mflags} -C virt-top virt-top.1
dune_release_pkgs='virt-top'
%ocaml_dune_setup
%ocaml_dune_build
%install
make DESTDIR=%{buildroot} install %{?_smp_mflags}
%ocaml_dune_install
%ocaml_create_file_list
tee -a %{name}.files < %{name}.files.devel
# Install translations.
mkdir -p %{buildroot}%{_datadir}/locale
make -C po install PODIR="%{buildroot}%{_datadir}/locale"
%find_lang %{name}
# Install virt-top manpage by hand for now.
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
%{_bindir}/virt-top
%{_mandir}/man1/virt-top.1*
%if 0%{?rhel} >= 6
%{_bindir}/processcsv.py
%{_mandir}/man1/processcsv.py.1*
%endif
%files -f %{name}.files
%{_bindir}/*
%changelog