- rebased to 2.14.0

This reverts commit e477a92045.

.gitignore

@@ -20,3 +20,4 @@ src_vipa-2.0.4.tar.gz
 /s390-tools-2.11.0.tar.gz
 /s390-tools-2.12.0.tar.gz
 /s390-tools-2.13.0.tar.gz
+/s390-tools-2.14.0.tar.gz

s390-tools-zipl-blscfg-rpm-nvr-sort.patch

@@ -6,7 +6,7 @@ diff -up s390-tools-2.9.0/zipl/src/Makefile.blscfg-rpm-nvr-sort s390-tools-2.9.0
  ALL_LDFLAGS += -Wl,-z,noexecstack $(NO_PIE_LDFLAGS)
  
 -libs = $(rootdir)/libutil/libutil.a
-+libs = $(rootdir)/libutil/libutil.a -lrpmio
++libs = $(rootdir)/libutil/libutil.a -lrpm
  
  objects = misc.o error.o scan.o job.o boot.o bootmap.o disk.o \
  	  install.o zipl.o $(rootdir)/zipl/boot/data.o

s390utils.spec

@@ -5,8 +5,8 @@
 
 Name:           s390utils
 Summary:        Utilities and daemons for IBM z Systems
-Version:        2.13.0
-Release:        4%{?dist}
+Version:        2.14.0
+Release:        1%{?dist}
 Epoch:          2
 License:        MIT
 ExclusiveArch:  s390 s390x
@@ -235,7 +235,6 @@ Requires:       s390utils-core = %{epoch}:%{version}-%{release}
 %{?systemd_requires}
 BuildRequires:  perl-generators
 BuildRequires:  ncurses-devel
-BuildRequires:  libpfm-devel
 BuildRequires:  glibc-static
 BuildRequires:  cryptsetup-devel >= 2.0.3
 BuildRequires:  json-c-devel
@@ -406,6 +405,7 @@ getent group zkeyadm > /dev/null || groupadd -r zkeyadm
 %{_sbindir}/hyptop
 %{_sbindir}/ip_watcher.pl
 %{_sbindir}/lschp
+%{_sbindir}/lscpumf
 %{_sbindir}/lscss
 %{_sbindir}/lsdasd
 %{_sbindir}/lsqeth
@@ -436,7 +436,6 @@ getent group zkeyadm > /dev/null || groupadd -r zkeyadm
 %{_sbindir}/zipl-switch-to-blscfg
 %{_sbindir}/znetconf
 %{_sbindir}/zpcictl
-%{_bindir}/lscpumf
 %{_bindir}/dump2tar
 %{_bindir}/genprotimg
 %{_bindir}/vmconvert
@@ -445,7 +444,6 @@ getent group zkeyadm > /dev/null || groupadd -r zkeyadm
 %{_unitdir}/dumpconf.service
 %ghost %config(noreplace) %{_sysconfdir}/zipl.conf
 %config(noreplace) %{_sysconfdir}/sysconfig/dumpconf
-/lib/s390-tools/cpumf_helper
 /lib/s390-tools/dumpconf
 /lib/s390-tools/lsznet.raw
 /lib/s390-tools/zfcpdump
@@ -499,7 +497,6 @@ getent group zkeyadm > /dev/null || groupadd -r zkeyadm
 %{_mandir}/man8/znetconf.8*
 %{_mandir}/man8/zpcictl.8*
 %dir %{_datadir}/s390-tools/
-%{_datadir}/s390-tools/cpumf/
 %{_datadir}/s390-tools/genprotimg/
 %{_datadir}/s390-tools/netboot/
 %dir %attr(0770,root,zkeyadm) %{_sysconfdir}/zkey
@@ -719,6 +716,7 @@ This package contains the CMS file system based on FUSE.
 %package zdsfs
 Summary:        z/OS data set access based on FUSE
 BuildRequires:  fuse-devel
+BuildRequires:  libcurl-devel
 Requires:       fuse
 
 %description zdsfs
@@ -794,6 +792,9 @@ User-space development files for the s390/s390x architecture.
 
 
 %changelog
+* Tue Aug 25 2020 Dan Horák <dan[at]danny.cz> - 2:2.14.0-1
+- rebased to 2.14.0
+
 * Fri Jul 03 2020 Javier Martinez Canillas <javierm@redhat.com> - 2:2.13.0-4
 - add a default entry in zipl.conf if there isn't one present (#1698363)
 

sources

@@ -1 +1 @@
-SHA512 (s390-tools-2.13.0.tar.gz) = 5c031f46fef91b120cda68a00fd3b867ea1b5bdfda537838e123e721a740597a64c28536879002f7dfd5b2291652066fbbb75f7848f3bb40765e9ef62c642aaa
+SHA512 (s390-tools-2.14.0.tar.gz) = 0593db28762689cdd432cfeab0676e96882299c551d09a6b516cb1a6d34fcc0e6cff2d98d34f71cb32feb2cd44328ded7d722db8da43c8e4b0606650c20d9fe0