From 10a55fdb09aa08bfe47ac3624fee62dbfcac8b4bfee8a1d80c72e2e1ed081643 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Fri, 23 Oct 2020 18:50:48 +0000 Subject: [PATCH] - update to 5.2.0: * rpm: extend the Multiple_matches exception * Use external command mv to rename old output directory (RHBZ#1670191). * rpm: do not unpack parameters * rpm: fix version comparison * rpm: provide a dummy supermin_rpm_get_arch implementation * ext2: Build symbolic links correctly (RHBZ#1770304). * Update gnulib to latest. - switch to release tarball, use keyring for gpg validation - run tests OBS-URL: https://build.opensuse.org/package/show/Virtualization/supermin?expand=0&rev=47 --- _service | 14 ------- supermin-5.1.20.tar.xz | 3 -- supermin-5.2.0.tar.gz | 3 ++ supermin-5.2.0.tar.gz.sig | 17 +++++++++ supermin.changes | 14 +++++++ supermin.keyring | Bin 0 -> 2823 bytes supermin.spec | 78 ++++++++++++++++++++++---------------- 7 files changed, 80 insertions(+), 49 deletions(-) delete mode 100644 _service delete mode 100644 supermin-5.1.20.tar.xz create mode 100644 supermin-5.2.0.tar.gz create mode 100644 supermin-5.2.0.tar.gz.sig create mode 100644 supermin.keyring diff --git a/_service b/_service deleted file mode 100644 index a7def03..0000000 --- a/_service +++ /dev/null @@ -1,14 +0,0 @@ - - - https://github.com/libguestfs/supermin.git - git - 5.1.20 - v5.1.20 - supermin - - - *.tar - xz - - - diff --git a/supermin-5.1.20.tar.xz b/supermin-5.1.20.tar.xz deleted file mode 100644 index 9f4e948..0000000 --- a/supermin-5.1.20.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d71d38544923c0f88ab45385c4b6ad9a9ae5aa3bc3d9ca623877521d7a598b7a -size 362080 diff --git a/supermin-5.2.0.tar.gz b/supermin-5.2.0.tar.gz new file mode 100644 index 0000000..6dc484d --- /dev/null +++ b/supermin-5.2.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fac7e128198b9b05afca99041fa9d5256cc80c1e3cd97eb3130a794b185cf107 +size 552540 diff --git a/supermin-5.2.0.tar.gz.sig b/supermin-5.2.0.tar.gz.sig new file mode 100644 index 0000000..ba54428 --- /dev/null +++ b/supermin-5.2.0.tar.gz.sig @@ -0,0 +1,17 @@ +-----BEGIN PGP SIGNATURE----- + +iQJFBAABCAAvFiEE93dPsa0HSn6Mh2fqkXOPc+G3aKAFAl5nbmMRHHJpY2hAYW5u +ZXhpYS5vcmcACgkQkXOPc+G3aKAXIw/8D+GUgBRpbiV/+mqYIhkNdtyEfqKEiqKl +scZVCiRxlwElyjYs6azmNrLMArqjwjJuwalzXp7NbYe06ddFaEgvy/0i124cPUdk +Q8Z1aQ6ktLNSJgoQCpCOaTRiEDF/Zsy3itqXXk8n+XPfaGs1GEieEaxUcXQP6X9h +huLqIDC6zwhyUK11u4cagmxGuSyuUIEkFVNCbSuDGxmuIf/qUtj5o/LQG4aE1SRw +iQAk3mGs0ipa1nfpBAdTnted/KscPLbOgzBU3Dg02QeeUZKG67pm/Fl/MMaRB4HM +rhbko0M/jSkn8zB6ggF0U3kcy16EVc6ANMvXvuD5MC4op5iIretj2Y2tcbYpfT4f +aOpfquq/scXvVugoK77CzxCBLKWkTglPTPGXT1T4i0dh4t8jl4wvqi1IykriKNAc +FIukM3ZHU460M78oWr0pWtr1qyuXeKE4IjV6PiUh2wr2YEmiy1d4Rf7M9hKV4ACs +Dm1ONnrMcAN0W6brkfr8Vo/3ud3gXlJjEY7HRk9GzPs3lZk6d+MtDxe25qLQmM3Y ++KbVsi937gUi4lB27GfZTBxEhqw6OQZegQW/DD6kB6UARVrG/n4TPQe25KgIkZ0w +iTj2qs3MQfx+zAGwFO7ihFLd8kGmEMryn+wldPKbK2Li5m5oMEByQVi+jhIt+cSr +jj8ls0NuDHU= +=LLM6 +-----END PGP SIGNATURE----- diff --git a/supermin.changes b/supermin.changes index 3e5efc6..5d26075 100644 --- a/supermin.changes +++ b/supermin.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Fri Oct 23 18:45:45 UTC 2020 - Dirk Mueller + +- update to 5.2.0: + * rpm: extend the Multiple_matches exception + * Use external command mv to rename old output directory (RHBZ#1670191). + * rpm: do not unpack parameters + * rpm: fix version comparison + * rpm: provide a dummy supermin_rpm_get_arch implementation + * ext2: Build symbolic links correctly (RHBZ#1770304). + * Update gnulib to latest. +- switch to release tarball, use keyring for gpg validation +- run tests + ------------------------------------------------------------------- Fri Nov 1 12:34:56 UTC 2019 - ohering@suse.de diff --git a/supermin.keyring b/supermin.keyring new file mode 100644 index 0000000000000000000000000000000000000000000000000000000000000000..fc15a241c7f4d90d6eb0075e0628fec19a29608a07e1498a163819af0d0e729c 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/supermin.spec b/supermin.spec index d63aba7..3d40cd2 100644 --- a/supermin.spec +++ b/supermin.spec @@ -1,7 +1,7 @@ # # spec file for package supermin # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,43 +17,50 @@ Name: supermin -Version: 5.1.20 +Version: 5.2.0 Release: 0 -%{?ocaml_preserve_bytecode} -Url: http://libguestfs.org/ Summary: Bootstrapping tool for creating supermin appliances License: GPL-3.0-or-later Group: System/Filesystems -Provides: febootstrap +URL: https://libguestfs.org/ +Source0: https://download.libguestfs.org/supermin/5.2-stable/supermin-5.2.0.tar.gz +Source1: https://download.libguestfs.org/supermin/5.2-stable/supermin-5.2.0.tar.gz.sig +Source9: supermin.keyring +# Pending upstream review +Patch0: suse_release.patch +BuildRequires: augeas +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: distribution-release +BuildRequires: e2fsprogs +BuildRequires: glibc-devel-static +BuildRequires: gzip +BuildRequires: hivex +BuildRequires: kernel-default +BuildRequires: ncurses-devel +BuildRequires: ocaml +BuildRequires: ocaml-findlib +BuildRequires: ocaml-rpm-macros >= 4.02.1 +BuildRequires: pkgconfig +BuildRequires: xz +BuildRequires: xz-devel +BuildRequires: zlib-devel +BuildRequires: zypper +BuildRequires: pkgconfig(com_err) +BuildRequires: pkgconfig(ext2fs) +BuildRequires: pkgconfig(rpm) +Requires: augeas Requires: distribution-release Requires: sysconfig-netconfig Requires: tar Requires: xmlstarlet Requires: zypper -Source0: supermin-%{version}.tar.xz -# Pending upstream review -Patch0: suse_release.patch +Provides: febootstrap +%{?ocaml_preserve_bytecode} %if "%{?_ignore_exclusive_arch}" == "" ExclusiveArch: x86_64 ppc64 ppc64le s390x aarch64 %endif -BuildRequires: autoconf -BuildRequires: automake -BuildRequires: e2fsprogs -BuildRequires: glibc-devel-static -BuildRequires: gzip -BuildRequires: ncurses-devel -BuildRequires: ocaml -BuildRequires: ocaml-findlib -BuildRequires: ocaml-rpm-macros >= 4.02.1 -BuildRequires: pkg-config -BuildRequires: xz -BuildRequires: xz-devel -BuildRequires: zlib-devel -BuildRequires: pkgconfig(com_err) -BuildRequires: pkgconfig(ext2fs) -BuildRequires: pkgconfig(rpm) - %description supermin is a tool for building supermin appliances. These are tiny appliances (similar to virtual machines), usually around 100KB in size, @@ -66,22 +73,29 @@ you need to boot one of them. %build export ZYPPER=zypper -export ZYPPER=/usr/bin/zypper +export ZYPPER=%{_bindir}/zypper touch INSTALL NEWS AUTHORS ChangeLog -autoreconf -fi +#.gnulib/gnulib-tool --update +#autoreconf -fi %configure --help -%configure -make \ +%configure --disable-network-tests +%make_build \ %{?_smp_mflags} %install -make install DESTDIR=$RPM_BUILD_ROOT -find $RPM_BUILD_ROOT -ls +%make_install +find %{buildroot} -ls + +%check +make check || { + cat tests/test-suite.log + exit 1 +} %files %doc README %doc TODO -/usr/bin/* +%{_bindir}/* %{_mandir}/*/* %changelog