From 7dd857f58c6eeb57960bc2a883abc2c82e1a55bd Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@gmail.com>
Date: Mon, 11 Jul 2016 07:44:02 +0100
Subject: [PATCH] 1.3.1, Use %%license, Drop requires on optional
 powerpc-utils-python so as not to pull in X stack, minor cleanups

---
 .gitignore         |   1 +
 powerpc-utils.spec | 117 +++++++++++++++++++++++----------------------
 sources            |   2 +-
 3 files changed, 63 insertions(+), 57 deletions(-)

diff --git a/.gitignore b/.gitignore
index 6811fe3..f8572ee 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,4 @@ powerpc-utils-1.2.2.tar.gz
 /powerpc-utils-1.2.24.tar.gz
 /powerpc-utils-1.2.27.tar.gz
 /v1.3.0.tar.gz
+/v1.3.1.tar.gz
diff --git a/powerpc-utils.spec b/powerpc-utils.spec
index 511e7e5..8344e99 100644
--- a/powerpc-utils.spec
+++ b/powerpc-utils.spec
@@ -1,6 +1,6 @@
 Name:           powerpc-utils
-Version:        1.3.0
-Release:        2%{?dist}
+Version:        1.3.1
+Release:        1%{?dist}
 Summary:        Utilities for PowerPC platforms
 
 Group:          System Environment/Base
@@ -8,8 +8,10 @@ License:        GPLv2
 URL:            https://github.com/nfont/%{name}/
 Source0:        https://github.com/nfont/%{name}/archive/v%{version}.tar.gz
 Source1:        nvsetenv
-BuildRequires:  zlib-devel doxygen automake librtas-devel libservicelog-devel >= 1.0.1-2
+
+BuildRequires:  zlib-devel doxygen automake
 BuildRequires:  librtas-devel >= 1.4.0
+BuildRequires:  libservicelog-devel >= 1.0.1-2
 
 # should be fixed - libservicelog is not right name
 Requires:       libservicelog bc which
@@ -22,12 +24,6 @@ Patch0:		powerpc-utils-autoconf.patch
 Patch1:		powerpc-utils-1.2.15-man.patch
 Patch2:		powerpc-utils-1.2.27-makefile.patch
 
-# This is done before release of F12
-Obsoletes:      powerpc-utils-papr < 1.1.6-3
-Provides:       powerpc-utils-papr = 1.1.6-3
-
-Requires:       powerpc-utils-python
-
 %description
 Utilities for PowerPC platforms.
 
@@ -68,69 +64,78 @@ rm -rf $RPM_BUILD_ROOT/etc/init.d/ibmvscsis.sh $RPM_BUILD_ROOT/usr/sbin/vscsisad
 ln -s nvram.8.gz $RPM_BUILD_ROOT/%{_mandir}/man8/nvsetenv.8.gz
 
 %files
-%{_sbindir}/nvsetenv
-%{_sbindir}/nvram
-# use sosreport from sos instead
-%exclude %{_sbindir}/snap
-%{_sbindir}/bootlist
-%{_sbindir}/ofpathname
-%{_sbindir}/ppc64_cpu
-%{_sbindir}/lsdevinfo
-%{_sbindir}/lsprop
-%{_mandir}/man8/nvram.8*
-%{_mandir}/man8/nvsetenv.8*
-%exclude %{_mandir}/man8/snap.8*
-%{_mandir}/man8/bootlist.8*
-%{_mandir}/man8/ofpathname.8*
+%{!?_licensedir:%global license %%doc}
+%license COPYING
+%doc README Changelog
 
-%{_sbindir}/update_flash
-%{_sbindir}/update_flash_nv
+%{_bindir}/amsstat
 %{_sbindir}/activate_firmware
-%{_sbindir}/set_poweron_time
-%{_sbindir}/rtas_ibm_get_vpd
-%{_sbindir}/serv_config
-%{_sbindir}/uesensor
-%{_sbindir}/hvcsadmin
-%{_sbindir}/rtas_dump
-%{_sbindir}/rtas_event_decode
-%{_sbindir}/sys_ident
+%{_sbindir}/bootlist
 %{_sbindir}/drmgr
 %{_sbindir}/errinjct
-%{_sbindir}/rtas_dbg
+%{_sbindir}/hvcsadmin
+%{_sbindir}/lparstat
+%{_sbindir}/lsdevinfo
+%{_sbindir}/lsprop
 %{_sbindir}/lsslot
 %{_sbindir}/ls-vdev
 %{_sbindir}/ls-veth
 %{_sbindir}/ls-vscsi
-%{_sbindir}/lparstat
+%{_sbindir}/nvram
+%{_sbindir}/nvsetenv
+%{_sbindir}/ofpathname
+%{_sbindir}/ppc64_cpu
 %{_sbindir}/pseries_platform
+%{_sbindir}/rtas_dbg
+%{_sbindir}/rtas_dump
+%{_sbindir}/rtas_event_decode
+%{_sbindir}/rtas_ibm_get_vpd
+%{_sbindir}/serv_config
+%{_sbindir}/set_poweron_time
+%{_sbindir}/sys_ident
+%{_sbindir}/uesensor
+%{_sbindir}/update_flash
+%{_sbindir}/update_flash_nv
 
-%{_bindir}/amsstat
-%{_mandir}/man8/update_flash.8*
+# use sosreport from sos instead
+%exclude %{_sbindir}/snap
+%exclude %{_mandir}/man8/snap.8*
+
+%{_mandir}/man1/amsstat.1*
+%{_mandir}/man5/lparcfg.5*
 %{_mandir}/man8/activate_firmware.8*
-%{_mandir}/man8/set_poweron_time.8*
+%{_mandir}/man8/bootlist.8*
+%{_mandir}/man8/drmgr.8*
+%{_mandir}/man8/errinjct.8*
+%{_mandir}/man8/hvcsadmin.8*
+%{_mandir}/man8/lparstat.8*
+%{_mandir}/man8/lsdevinfo.8*
+%{_mandir}/man8/lsprop.8*
+%{_mandir}/man8/lsslot.8*
+%{_mandir}/man8/ls-vdev.8*
+%{_mandir}/man8/ls-veth.8*
+%{_mandir}/man8/ls-vscsi.8*
+%{_mandir}/man8/nvram.8*
+%{_mandir}/man8/nvsetenv.8*
+%{_mandir}/man8/ofpathname.8*
+%{_mandir}/man8/ppc64_cpu.8*
+%{_mandir}/man8/rtas_dbg.8*
+%{_mandir}/man8/rtas_dump.8*
+%{_mandir}/man8/rtas_event_decode.8*
 %{_mandir}/man8/rtas_ibm_get_vpd.8*
 %{_mandir}/man8/serv_config.8*
-%{_mandir}/man8/uesensor.8*
-%{_mandir}/man8/hvcsadmin.8*
-%{_mandir}/man8/rtas_dump.8*
+%{_mandir}/man8/set_poweron_time.8*
 %{_mandir}/man8/sys_ident.8*
-%{_mandir}/man8/lparstat.8*
-%{_mandir}/man5/lparcfg.5*
-%{_mandir}/man1/amsstat.1*
-%{_mandir}/man8/lsdevinfo.8*
-%{_mandir}/man8/rtas_event_decode.8*
-%{_mandir}/man8/ls-vdev.8*
-%{_mandir}/man8/lsslot.8*
-%{_mandir}/man8/lsprop.8*
-%{_mandir}/man8/drmgr.8*
-%{_mandir}/man8/ls-veth.8*
-%{_mandir}/man8/ppc64_cpu.8*
-%{_mandir}/man8/ls-vscsi.8*
-%{_mandir}/man8/errinjct.8*
-%{_mandir}/man8/rtas_dbg.8*
-%doc README COPYING Changelog
+%{_mandir}/man8/uesensor.8*
+%{_mandir}/man8/update_flash.8*
 
 %changelog
+* Mon Jul 11 2016 Peter Robinson <pbrobinson@fedoraproject.org>
+- Update to latest upstream 1.3.1
+- Use %%license
+- Drop requires on optional powerpc-utils-python so as not to pull in X stack
+- Package cleanups
+
 * Sat Apr  9 2016 Peter Robinson <pbrobinson@fedoraproject.org> 1.3.0-2
 - Rebuild for librtas soname bump
 
diff --git a/sources b/sources
index ec4bae2..c565f18 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ceed76fa882ea02d78e574691e167834  v1.3.0.tar.gz
+a41f1233691520e8ca3a391f958cbd93  v1.3.1.tar.gz