[packages/hfsplusutils] - fsck.hfsplus man should be (8) not (1) - actually apply memset patch - added am patch (fixes build

[qboosh]

commit 1ef85dfbd48c4a11a36756dc1c98de732ec5e616
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sat Mar 16 19:47:26 2013 +0100

    - fsck.hfsplus man should be (8) not (1)
    - actually apply memset patch
    - added am patch (fixes build with automake 1.13)

 hfsplusutils-am.patch | 11 +++++++++++
 hfsplusutils.spec     | 24 +++++++++++++++++++-----
 2 files changed, 30 insertions(+), 5 deletions(-)
---
diff --git a/hfsplusutils.spec b/hfsplusutils.spec
index a366e82..1a76e17 100644
--- a/hfsplusutils.spec
+++ b/hfsplusutils.spec
@@ -5,7 +5,7 @@ Summary(pl.UTF-8):	Narzędzia do woluminów HFS+
 Name:		hfsplusutils
 Version:	1.0.4
 Release:	0.2
-License:	GPL
+License:	GPL v2+
 Group:		Applications/System
 Source0:	ftp://ftp.penguinppc.org/users/hasi/hfsplus_%{version}.src.tar.bz2
 # Source0-md5:	18fa1efb5432469357ffa6bfa7c08fcd
@@ -14,6 +14,7 @@ Patch1:		%{name}-errno.patch
 Patch2:		%{name}-includes.patch
 Patch3:		%{name}-gcc4.patch
 Patch4:		memset.patch
+Patch5:		%{name}-am.patch
 URL:		http://www.penguinppc.org/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -32,6 +33,8 @@ Narzędzia do woluminów HFS+.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
+%patch5 -p1
 
 %build
 %{__libtoolize}
@@ -46,7 +49,7 @@ Narzędzia do woluminów HFS+.
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{/sbin,%{_mandir}/man1}
+install -d $RPM_BUILD_ROOT{/sbin,%{_mandir}/man{1,8}}
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
@@ -59,16 +62,17 @@ mv $RPM_BUILD_ROOT%{_bindir}/hpfsck $RPM_BUILD_ROOT/sbin/fsck.hfsplus
 ln -s /sbin/fsck.hfsplus $RPM_BUILD_ROOT%{_bindir}/hpfsck
 
 cp -p doc/man/hfsp.man $RPM_BUILD_ROOT%{_mandir}/man1/hfsp.1
-for a in hpcd hpcopy hpfsck hpls hpmkdir hpmount hppwd hprm hpumount fsck.hfsplus; do
+for a in hpcd hpcopy hpfsck hpls hpmkdir hpmount hppwd hprm hpumount; do
 	echo '.so hfsp.1' > $RPM_BUILD_ROOT%{_mandir}/man1/$a.1
 done
+echo '.so man1/hfsp.1' > $RPM_BUILD_ROOT%{_mandir}/man8/fsck.hfsplus.8
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS NEWS README
+%doc AUTHORS ChangeLog NEWS README
 %attr(755,root,root) /sbin/fsck.hfsplus
 %attr(755,root,root) %{_bindir}/hpcd
 %attr(755,root,root) %{_bindir}/hpcopy
@@ -79,4 +83,14 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/hppwd
 %attr(755,root,root) %{_bindir}/hprm
 %attr(755,root,root) %{_bindir}/hpumount
-%{_mandir}/man1/*
+%{_mandir}/man1/hfsp.1*
+%{_mandir}/man1/hpcd.1*
+%{_mandir}/man1/hpcopy.1*
+%{_mandir}/man1/hpfsck.1*
+%{_mandir}/man1/hpls.1*
+%{_mandir}/man1/hpmkdir.1*
+%{_mandir}/man1/hpmount.1*
+%{_mandir}/man1/hppwd.1*
+%{_mandir}/man1/hprm.1*
+%{_mandir}/man1/hpumount.1*
+%{_mandir}/man8/fsck.hfsplus.8*
diff --git a/hfsplusutils-am.patch b/hfsplusutils-am.patch
new file mode 100644
index 0000000..e8e7618
--- /dev/null
+++ b/hfsplusutils-am.patch
@@ -0,0 +1,11 @@
+--- hfsplus-1.0.4/configure.in.orig	2002-03-05 20:57:19.000000000 +0100
++++ hfsplus-1.0.4/configure.in	2013-03-15 19:39:27.572839916 +0100
+@@ -23,7 +23,7 @@
+ dnl
+ 
+ AC_INIT(src/hfsputil.c)
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS(config.h)
+ AC_CANONICAL_SYSTEM
+ AC_ARG_PROGRAM
+ 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/hfsplusutils.git/commitdiff/1ef85dfbd48c4a11a36756dc1c98de732ec5e616