From 9fd1897b61e20213b0e7f2b3f8e032d5d4bf9540 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 18 Oct 2022 14:11:47 +0100 Subject: [PATCH] Rebase to virt-top 1.1.1 resolves: rhbz#2135768 --- .gitignore | 1 + libguestfs.keyring | Bin 0 -> 2823 bytes sources | 3 ++- virt-top.spec | 56 +++++++++++++++++++-------------------------- 4 files changed, 27 insertions(+), 33 deletions(-) create mode 100644 libguestfs.keyring diff --git a/.gitignore b/.gitignore index 1362986..bebb6a0 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /.build*.log /clog /virt-top-*.tar.gz +/virt-top-*.tar.gz.sig diff --git a/libguestfs.keyring b/libguestfs.keyring new file mode 100644 index 0000000000000000000000000000000000000000..bb3eb5537b7c398a10b7e2b26ca00af011d1a73e GIT binary patch literal 2823 zcma*oXEYm(0><$qB7$nPViakqqNG)u+FR_sQdc{DRukabMCqKo^wCkug~Y-bN=ZdDzIiUZ#$40(0^!V6(C-KH79?s=m3cGghyAo z1|dJMm+eiM>Vb)QYy4I#;Xu&Z^B~&YVZ!Whl6YA`T0fY9jOhHw z+Y;*35;Jx(8F=n(3o5j*bNOr3S) zCOp0NiMsuh^>)x<=&*u##pa25u9;{ZZc=y@%)4CE$a$A}A*UQGOC-D04;}dULUfuV z)^qc0R62lhwbK5pAcC9hk{LK2KJQ&jd|seog-6NxEVm_4X)8y7DYjWwHK2eI$lRku zmeq4z0zkjTs4a++z4bu{k^$N0>0MkG^k~>}tQQd>eap=1)cK}mGM_yYhtaPw3u{n! zU9d7X%GZbXT!~-iaePA-_ZF&Sz{>(|!tON<`4C)es{n-Uesd{GoD$><>+YS*e%6$X zv}81ZQEu&BDa*m|%?xc}K? ztXy1dUpQFtxVqa*MT11aG(ZsGE-C15Js>6$2qig`j06Osg@VW_D8Y0f5+LX{5JVpY zpdhDC^oaLZsK??x8DJOWJSw`FnKV|{5~fVJ%k`yWLJxgLVDcRdn^Wa_F@huK2}*V{VwcRgyv*)4g2Qgt1JGlabiOx*7Fj?B<+5~s41Ba znTns*;eGgN*mTv0;L>wfxeCI*{K-s;9kSV!?`oEYYHR#>`F5iO`ZuDJL%yslOO9&w zhbbHM^ngdugCnWhKqq{uTHT9qS(fk}s?L44SS*-LzWFNMdJ_cZV+Pj}Fc0 z$z?*yD| z^ee!4Z%nhXNm_MKw>GfR!|#AT7wI=d8;#FBd0Dn`;z*2sFEnNL=50xc+d7>-sr4hc z1H^ZFsD|Tz3VZsuG#PhW4A#n%$Hvw9zllAj{C|nDDp3Q9IoOo59u_f15UB-d(i^Ft zm}W~GSou3Y2Zae}aUVFWKJ)XZ-FcZ)f7}5VNSmEBezlPwny+1V!c|G1q2)yJu^>SU zBG(uFdMTFhV(LalnV(s$P>l{I_IXET&d9&(TxDa{R*NCzcuMf&q78elSLN9YIaoM7X!j3`9@_C^pJ@OJh;qD77 z`}&Nz_D*Iq6f;t7?Bqxowet8!npZ$`6NXiVD@~AY_g*>B){{F>D1? zN$g|68|pA_wcr~kt)JAUlnukx>iU8KA)f_4{X1&=@-!^E^P8QCNsCiKiUK_F>Xsli+q$Z*{a2b32CMwb3D{%D_`*E!rm9<3xmVE)l89dYVw5nlryxm zap55S(@vrBI7zH^ydCt_O(Ugr9>qJgQm;i{)`fD?)7n|Jj)=c?=qu9x3%|TVwl?!x z?-#a4>J7h7(TrYP9;;VFFnL~q)11l=W{2zM0PM_#^G-;w9~Y(6gf0(xy$5NJB{8G) z2_PZQC}tF@|I|RCJ_Ct6H6l-=E50j$d5Ku9&`{QVe8Z;T+VX2372^TDbVX-o_tL$y zfM36H?e10e)+AoUd;Ar?$c*rS7DBr*maRLN9n|78-|^BE1bP6RW%uVWO+Eh#-^#2q zU1o2OGeEnJe`vc1&bKa=PK5K>MrUoy*4Di*xQ~Hr8YK=ae$S@5;A6m-C*^N>H6QiE z+Z~%eGDDNK_vktjC^nxMUEXZReG3G^_uml$%lONCD~B)o&u@Ar}fQG5;T#E%^U88SI<&z@~yy|THGE%E1PbI z?F^r&ZTiw{?xi@{*DAy6C4z2C)^HACOJ!QTq)OKNiy$F_ao^+$ziBa!`o*phmK_>s za)NY_nGb%M+@h1zb zdfh2x>9W=SlC19X_yB5T8jPIITr(IuajP65y|~iU>niq=mN|NI*0)B&ixQw`dlhcIFP)G9WnV`}K3C{4m}cRO<&1vJ^K5DAVUo*Z<@ zunwMvxU0NO;ORRnw0-LRLg3}q^7?BlO`eOGFQ3pD@ literal 0 HcmV?d00001 diff --git a/sources b/sources index e636d25..982081e 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -SHA512 (virt-top-1.0.9.tar.gz) = 3e0e52bece411f8b73c57beea554937d779bbfb18d16cf5b7f13f8c843e747c2d89ce8253b9cf4db2bd6495c4e4826cb68467cc48bb53bfd65c4aceed043d086 +SHA512 (virt-top-1.1.1.tar.gz) = 4f4c7338f1ce1f82b1a9287c256da4b60d7b2e5163ea4b19eb0257c104303dcecf28177f8034e34d255fec462adc19ab61e6a4b9db857da02f2cdf2b1c818093 +SHA512 (virt-top-1.1.1.tar.gz.sig) = 6236b7a68492663d743f1ee2e50ea91adafab97654c333d2b92f66a0c7a9cd5d6748fe2467f29db80c65428d804624a42d64f3ee7d0d09f612e95effec0e395e diff --git a/virt-top.spec b/virt-top.spec index 2008370..780b151 100644 --- a/virt-top.spec +++ b/virt-top.spec @@ -1,9 +1,7 @@ -%global opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0) -%global debug_package %{nil} - +%undefine _package_note_flags Name: virt-top -Version: 1.0.9 -Release: 21%{?dist} +Version: 1.1.1 +Release: 6%{?dist} Summary: Utility like top(1) for displaying virtualization stats License: GPLv2+ @@ -14,31 +12,28 @@ ExcludeArch: %{power64} URL: http://people.redhat.com/~rjones/virt-top/ Source0: http://people.redhat.com/~rjones/virt-top/files/%{name}-%{version}.tar.gz +Source1: http://people.redhat.com/~rjones/virt-top/files/%{name}-%{version}.tar.gz.sig # Post-process output of CSV file (RHBZ#665817, RHBZ#912020). -Source1: processcsv.py -Source2: processcsv.py.pod +Source2: processcsv.py +Source3: processcsv.py.pod + +# Keyring used to verify tarball signature. +Source4: libguestfs.keyring # Adds a link to processcsv to the man page. This patch is only # included in RHEL builds. Patch0: virt-top-1.0.9-processcsv-documentation.patch -# Upstream patch to fix FTBFS with ocaml libvirt 0.6.1.5. -Patch1: 0001-libvirt-Handle-VIR_DOMAIN_PMSUSPENDED-state.patch - -BuildRequires: make +BuildRequires: gcc +BuildRequires: make BuildRequires: ocaml >= 3.10.2 BuildRequires: ocaml-ocamldoc BuildRequires: ocaml-findlib-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 BuildRequires: ocaml-calendar-devel BuildRequires: ocaml-libvirt-devel >= 0.6.1.5 - -# Tortuous list of BRs for gettext. BuildRequires: ocaml-gettext-devel >= 0.3.3 BuildRequires: ocaml-fileutils-devel # For msgfmt: @@ -46,9 +41,11 @@ BuildRequires: gettext # Non-OCaml BRs. BuildRequires: libvirt-devel +BuildRequires: libxml2-devel BuildRequires: perl-interpreter BuildRequires: perl(Pod::Perldoc) BuildRequires: gawk +BuildRequires: gnupg2 %description @@ -61,34 +58,27 @@ different virtualization systems. %prep +%{gpgverify} --keyring='%{SOURCE4}' --signature='%{SOURCE1}' --data='%{SOURCE0}' %setup -q %if 0%{?rhel} >= 6 %patch0 -p1 %endif -%patch1 -p1 - %build %configure -make all -%if %opt -make opt -strip src/virt-top.opt -%endif - -# Build translations. -make -C po +make # Force rebuild of man page. +# There is a missing man_MANS rule, will fix upstream in next version. rm -f src/virt-top.1 make -C src virt-top.1 %if 0%{?rhel} >= 6 # Build processcsv.py.1. pod2man -c "Virtualization Support" --release "%{name}-%{version}" \ - %{SOURCE2} > processcsv.py.1 + %{SOURCE3} > processcsv.py.1 %endif @@ -96,17 +86,15 @@ pod2man -c "Virtualization Support" --release "%{name}-%{version}" \ make DESTDIR=$RPM_BUILD_ROOT install # Install translations. -mkdir -p $RPM_BUILD_ROOT%{_datadir}/locale -make -C po install PODIR="$RPM_BUILD_ROOT%{_datadir}/locale" %find_lang %{name} -# Install virt-top manpage by hand for now. +# Install virt-top manpage by hand for now - see above. mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1 install -m 0644 src/virt-top.1 $RPM_BUILD_ROOT%{_mandir}/man1 %if 0%{?rhel} >= 6 # Install processcsv.py. -install -m 0755 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir} +install -m 0755 %{SOURCE2} $RPM_BUILD_ROOT%{_bindir} # Install processcsv.py(1). install -m 0644 processcsv.py.1 $RPM_BUILD_ROOT%{_mandir}/man1/ @@ -114,7 +102,7 @@ install -m 0644 processcsv.py.1 $RPM_BUILD_ROOT%{_mandir}/man1/ %files -f %{name}.lang -%doc COPYING README TODO ChangeLog +%doc COPYING README TODO %{_bindir}/virt-top %{_mandir}/man1/virt-top.1* %if 0%{?rhel} >= 6 @@ -124,6 +112,10 @@ install -m 0644 processcsv.py.1 $RPM_BUILD_ROOT%{_mandir}/man1/ %changelog +* Tue Oct 18 2022 Richard W.M. Jones - 1.1.1-6 +- Rebase to virt-top 1.1.1 + resolves: rhbz#2135768 + * Tue Aug 10 2021 Mohan Boddu - 1.0.9-21 - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags Related: rhbz#1991688