diff --git a/.gitignore b/.gitignore index 2370297..12ca165 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ src_vipa-2.0.4.tar.gz /lib-zfcp-hbaapi-2.1.tar.gz /src_vipa-2.1.0.tar.gz /s390-tools-*.tar.bz2 +/s390-tools-2.0.0.tar.gz diff --git a/s390utils.spec b/s390utils.spec index 44ae3d6..0d9a016 100644 --- a/s390utils.spec +++ b/s390utils.spec @@ -4,14 +4,14 @@ Name: s390utils Summary: Utilities and daemons for IBM z Systems Group: System Environment/Base -Version: 1.39.0 +Version: 2.0.0 Release: 1%{?dist} Epoch: 2 -License: GPLv2 and GPLv2+ and CPL +License: MIT ExclusiveArch: s390 s390x -URL: http://www.ibm.com/developerworks/linux/linux390/s390-tools.html -# http://www.ibm.com/developerworks/linux/linux390/s390-tools-%%{version}.html -Source0: http://download.boulder.ibm.com/ibmdl/pub/software/dw/linux390/ht_src/s390-tools-%{version}.tar.bz2 +#URL: http://www.ibm.com/developerworks/linux/linux390/s390-tools.html +URL: https://github.com/ibm-s390-tools/s390-tools +Source0: https://github.com/ibm-s390-tools/s390-tools/archive/v%{version}.tar.gz#/s390-tools-%{version}.tar.gz Source2: s390.sh Source3: s390.csh Source4: http://www.linuxvm.org/Patches/S390/cmsfs-%{cmsfsver}.tar.gz @@ -174,14 +174,14 @@ touch $RPM_BUILD_ROOT%{_sysconfdir}/zipl.conf %files -%doc README +%doc README.md # # ************************* s390-tools base package ************************* # %package base -# src_vipa is CPL, the rest is GPLv2 or GPLv2+ -License: GPLv2 and GPLv2+ and CPL +# src_vipa is CPL +License: MIT and CPL Summary: S390 base tools Group: System Environment/Base Requires: perl gawk sed coreutils @@ -334,7 +334,7 @@ For more information refer to the following publications: %systemd_postun_with_restart dumpconf.service %files base -%doc README zdev/src/*.txt +%doc README.md zdev/src/*.txt %doc LICENSE %{_sbindir}/chccwdev %{_sbindir}/chchp @@ -478,7 +478,6 @@ For more information refer to the following publications: # *********************** s390-tools osasnmpd package *********************** # %package osasnmpd -License: GPLv2+ Summary: SNMP sub-agent for OSA-Express cards Group: System Environment/Daemons Requires: net-snmp @@ -499,7 +498,6 @@ ATM Ethernet LAN Emulation in QDIO mode. # *********************** s390-tools mon_statd package ********************** # %package mon_statd -License: GPLv2 Summary: Monitoring daemons for Linux in z/VM Group: System Environment/Daemons Requires: coreutils @@ -540,7 +538,6 @@ Monitoring daemons for Linux in z/VM: # *********************** s390-tools cpuplugd package *********************** # %package cpuplugd -License: GPLv2+ Summary: Daemon that manages CPU and memory resources Group: System Environment/Daemons %{?systemd_requires} @@ -571,7 +568,6 @@ memory can be increased or decreased exploiting the CMM1 feature. # *********************** s390-tools ziomon package ************************* # %package ziomon -License: GPLv2 Summary: S390 ziomon tools Group: Applications/System Requires: blktrace @@ -611,7 +607,6 @@ Tool set to collect data for zfcp performance analysis and report. # *********************** s390-tools iucvterm package ************************* # %package iucvterm -License: GPLv2 Summary: z/VM IUCV terminal applications Group: Applications/System Requires(pre): shadow-utils @@ -699,7 +694,6 @@ This package contains the CMS file system tools. # *********************** cmsfs-fuse package *********************** # %package cmsfs-fuse -License: GPLv2 Summary: CMS file system based on FUSE Group: System Environment/Base BuildRequires: fuse-devel @@ -718,7 +712,6 @@ This package contains the CMS file system based on FUSE. # *********************** zdsfs package *********************** # %package zdsfs -License: GPLv2 Summary: z/OS data set access based on FUSE Group: System Environment/Base BuildRequires: fuse-devel @@ -735,7 +728,6 @@ This package contains the z/OS data set access based on FUSE. # *********************** hmcdrvfs package *********************** # %package hmcdrvfs -License: GPLv2 Summary: HMC drive file system based on FUSE Group: System Environment/Base BuildRequires: fuse-devel @@ -755,7 +747,6 @@ to list files and directories. # *********************** cpacfstatsd package *********************** # %package cpacfstatsd -License: GPLv2 Summary: Monitor and maintain CPACF activity counters Group: System Environment/Base Requires(post): systemd @@ -787,7 +778,6 @@ and maintain CPACF activity counters. # *********************** devel package *********************** # %package devel -License: GPLv2 Summary: Development files Group: Development/Libraries @@ -799,6 +789,10 @@ User-space development files for the s390/s390x architecture. %changelog +* Wed Aug 23 2017 Dan Horák - 2:2.0.0-1 +- rebased to first public release on github, functionally same as 1.39.0 +- relicensed to MIT + * Wed Aug 23 2017 Dan Horák - 2:1.39.0-1 - rebased to 1.39.0 - completed switch to systemd diff --git a/sources b/sources index 9049575..08d9c3f 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ SHA512 (cmsfs-1.1.8c.tar.gz) = 2ba5687d378fdd9871283728e81f1399047e74f9bba3936726eda11a978fe6ced1a300f15acb871d5daa26e61069d89767c753cf584f2731f5e99985db96aef0 SHA512 (src_vipa-2.1.0.tar.gz) = 8f6048e82b4bcc479dfb09d62da64b9519f66efc31889ff795ee6ca107e262167df57628c305f1b899c41bb3f035e6309552d8548c890855d319e8e60d6a6cf7 -SHA512 (s390-tools-1.39.0.tar.bz2) = 7f8471668452391136cbe7e64e5e3e992881752f28f994159cc47539f225231f9d8523881a7d38e75eaf669e0b9ba765c03d0fbf6f09a3a88f113d12978f6ef4 +SHA512 (s390-tools-2.0.0.tar.gz) = dc73b614b2aa7509e0a4968919e0cd608cbbea2523f4b324eb583b2d6b6a1bd0f27b8561e483a1899f8c0e33d983c4950df0518dc32809ce7bf4a2d6c7a35ffc