[packages/powerpc-utils-ibm] - up to 1.3.2 - added install patch (DESTDIR vs prefix fix)

qboosh qboosh at pld-linux.org
Tue Sep 6 20:35:15 CEST 2016


commit f4f4a516a99d34f823cd9850e96f00833694dd5e
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Tue Sep 6 20:36:43 2016 +0200

    - up to 1.3.2
    - added install patch (DESTDIR vs prefix fix)

 powerpc-utils-ibm.spec      | 28 ++++++++++++++++++++++------
 powerpc-utils-install.patch | 13 +++++++++++++
 2 files changed, 35 insertions(+), 6 deletions(-)
---
diff --git a/powerpc-utils-ibm.spec b/powerpc-utils-ibm.spec
index 829a6e2..763ff92 100644
--- a/powerpc-utils-ibm.spec
+++ b/powerpc-utils-ibm.spec
@@ -3,15 +3,20 @@ Summary(pl.UTF-8):	Narzędzia dla platform PowerPC wyprodukowanych przez IBM
 # NOTE: original name is powerpc-utils, but this name in PLD was already
 # occupied by (renamed) pmac-utils package (which is for PowerPCs from Apple)
 Name:		powerpc-utils-ibm
-Version:	1.2.26
+Version:	1.3.2
 Release:	1
-License:	CPL v1.0
+License:	GPL v2+
 Group:		Applications/System
-Source0:	http://downloads.sourceforge.net/powerpc-utils/powerpc-utils-%{version}.tar.gz
-# Source0-md5:	2b1b84cf300a4b4bc2873e949cafc06f
+#Source0Download: https://github.com/nfont/powerpc-utils/releases
+Source0:	https://github.com/nfont/powerpc-utils/archive/v%{version}/powerpc-utils-%{version}.tar.gz
+# Source0-md5:	b579a910c88adf03e7130374727748be
 Patch0:		powerpc-utils-includes.patch
+Patch1:		powerpc-utils-install.patch
 URL:		http://powerpc-utils.sourceforge.net/
+BuildRequires:	autoconf >= 2.63
+BuildRequires:	automake >= 1:1.10
 BuildRequires:	librtas-devel
+BuildRequires:	rpmbuild(macros) >= 1.644
 Obsoletes:	powerpc-utils-papr
 ExclusiveArch:	ppc ppc64
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -27,10 +32,16 @@ sprzęcie firmy IBM.
 %prep
 %setup -q -n powerpc-utils-%{version}
 %patch0 -p1
+%patch1 -p1
 
 %build
+install -d config
+%{__aclocal} -I m4
+%{__autoconf}
+%{__automake}
 %configure \
-	--disable-silent-rules
+	--disable-silent-rules \
+	--with-systemd=%{systemdunitdir}
 %{__make}
 
 %install
@@ -46,11 +57,12 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc COPYRIGHT Changelog README
+%doc Changelog README
 %attr(755,root,root) %{_bindir}/amsstat
 %attr(755,root,root) %{_sbindir}/activate_firmware
 %attr(755,root,root) %{_sbindir}/bootlist
 %attr(755,root,root) %{_sbindir}/drmgr
+%attr(755,root,root) %{_sbindir}/errinjct
 %attr(755,root,root) %{_sbindir}/hvcsadmin
 %attr(755,root,root) %{_sbindir}/lparstat
 %attr(755,root,root) %{_sbindir}/ls-vdev
@@ -63,6 +75,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_sbindir}/ofpathname
 %attr(755,root,root) %{_sbindir}/ppc64_cpu
 %attr(755,root,root) %{_sbindir}/pseries_platform
+%attr(755,root,root) %{_sbindir}/rtas_dbg
 %attr(755,root,root) %{_sbindir}/rtas_dump
 %attr(755,root,root) %{_sbindir}/rtas_event_decode
 %attr(755,root,root) %{_sbindir}/rtas_ibm_get_vpd
@@ -73,16 +86,19 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_sbindir}/uesensor
 %attr(755,root,root) %{_sbindir}/update_flash
 %attr(755,root,root) %{_sbindir}/update_flash_nv
+%{systemdunitdir}/smt_off.service
 %{_mandir}/man1/amsstat.1*
 %{_mandir}/man5/lparcfg.5*
 %{_mandir}/man8/activate_firmware.8*
 %{_mandir}/man8/bootlist.8*
+%{_mandir}/man8/errinjct.8*
 %{_mandir}/man8/hvcsadmin.8*
 %{_mandir}/man8/lparstat.8*
 %{_mandir}/man8/lsslot.8*
 %{_mandir}/man8/nvram.8*
 %{_mandir}/man8/ofpathname.8*
 %{_mandir}/man8/ppc64_cpu.8*
+%{_mandir}/man8/rtas_dbg.8*
 %{_mandir}/man8/rtas_dump.8*
 %{_mandir}/man8/rtas_ibm_get_vpd.8*
 %{_mandir}/man8/serv_config.8*
diff --git a/powerpc-utils-install.patch b/powerpc-utils-install.patch
new file mode 100644
index 0000000..7f654b1
--- /dev/null
+++ b/powerpc-utils-install.patch
@@ -0,0 +1,13 @@
+--- powerpc-utils-1.3.2/Makefile.am.orig	2016-07-11 23:41:12.000000000 +0200
++++ powerpc-utils-1.3.2/Makefile.am	2016-09-06 20:19:58.144706008 +0200
+@@ -177,7 +177,7 @@
+ 
+ if WITH_SYSTEMD
+ install-data-hook: systemd/smt_off.service
+-	$(MKDIR_P) @prefix@${systemd_unit_dir}
+-	$(INSTALL_SCRIPT) $< @prefix@${systemd_unit_dir}/
+-	sed -i -e 's,$${exec_prefix}, at sbindir@,g' @prefix@${systemd_unit_dir}/smt_off.service
++	$(MKDIR_P) $(DESTDIR)${systemd_unit_dir}
++	$(INSTALL_SCRIPT) $< $(DESTDIR)${systemd_unit_dir}/
++	sed -i -e 's,$${exec_prefix}, at sbindir@,g' $(DESTDIR)${systemd_unit_dir}/smt_off.service
+ endif
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/powerpc-utils-ibm.git/commitdiff/f4f4a516a99d34f823cd9850e96f00833694dd5e



More information about the pld-cvs-commit mailing list