rpms/hfsplusutils/devel hfsplusutils-1.0.4-errno.patch, NONE, 1.1 hfsplusutils-1.0.4-includes.patch, NONE, 1.1 hfsplusutils-1.0.4-nullisnotachar.patch, NONE, 1.1 hfsplusutils.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

[David Woodhouse (dwmw2)]

Author: dwmw2

Update of /cvs/extras/rpms/hfsplusutils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22143/devel

Modified Files:
	.cvsignore sources 
Added Files:
	hfsplusutils-1.0.4-errno.patch 
	hfsplusutils-1.0.4-includes.patch 
	hfsplusutils-1.0.4-nullisnotachar.patch hfsplusutils.spec 
Log Message:
auto-import hfsplusutils-1.0.4-2 on branch devel from hfsplusutils-1.0.4-2.src.rpm

hfsplusutils-1.0.4-errno.patch:

--- NEW FILE hfsplusutils-1.0.4-errno.patch ---
--- hfsplus-1.0.4/src/hpmkdir.c.orig	2004-04-11 11:44:32.058225648 +0100
+++ hfsplus-1.0.4/src/hpmkdir.c	2004-04-11 11:45:03.001648298 +0100
@@ -46,8 +46,8 @@
 # include <string.h>
 # include <time.h>
 # include <ctype.h>
-# include <errno.h>
 */
+# include <errno.h>
 # include <stdio.h>
 # include <stdlib.h>
 

hfsplusutils-1.0.4-includes.patch:

--- NEW FILE hfsplusutils-1.0.4-includes.patch ---
--- hfsplus-1.0.4/libhfsp/src/unicode.c.orig	2005-02-21 16:19:01.000000000 +0000
+++ hfsplus-1.0.4/libhfsp/src/unicode.c	2005-02-21 16:19:13.000000000 +0000
@@ -16,7 +16,7 @@
 #include <stdlib.h>
 #include <endian.h>
 #include <byteswap.h>
-#include <linux/string.h>
+#include <string.h>
 
 #define __USE_GNU
     /* need wcsrtomb */

hfsplusutils-1.0.4-nullisnotachar.patch:

--- NEW FILE hfsplusutils-1.0.4-nullisnotachar.patch ---
--- hfsplus-1.0.4/src/glob.c.orig	2004-04-11 11:41:08.548869364 +0100
+++ hfsplus-1.0.4/src/glob.c	2004-04-11 11:41:16.819249584 +0100
@@ -48,7 +48,7 @@
 
 	switch (*pat)
 	{
-	    case NULL:	// pattern at end
+	    case 0:	// pattern at end
 		return (!*str); // String at end ?
 
 	    case '*':  // match all


--- NEW FILE hfsplusutils.spec ---
Summary: Tools for reading Macintosh HFS+ volumes.
Name: hfsplusutils
Version: 1.0.4
Release: 2
License: GPL
Group: Applications/File
URL: ftp://ftp.penguinppc.org/users/hasi/hfsplus_1.0.4.src.tar.bz2
Source0: ftp://ftp.penguinppc.org/users/hasi/hfsplus_%{version}.src.tar.bz2
Patch0: hfsplusutils-1.0.4-nullisnotachar.patch
Patch1: hfsplusutils-1.0.4-errno.patch
Patch2: hfsplusutils-1.0.4-includes.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root

%description
This package is a set of tools that allow access to HFS+ formatted
volumes. HFS+ is a modernized version of Apple Computers HFS
Filesystem.

%prep
%setup -q -n hfsplus-1.0.4

%patch0 -p1
%patch1 -p1
%patch2 -p1

%build
aclocal-1.4
autoconf
autoheader
automake-1.4 -a
%{configure} --disable-shared
make

%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT SUBDIRS=src install
ln -sf hpfsck $RPM_BUILD_ROOT/%{_bindir}/fsck.hfsplus

%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%{_bindir}/hpcd
%{_bindir}/hpcopy
%{_bindir}/hpfsck
%{_bindir}/fsck.hfsplus
%{_bindir}/hpls
%{_bindir}/hpmkdir
%{_bindir}/hpmount
%{_bindir}/hppwd
%{_bindir}/hprm
%{_bindir}/hpumount
%doc doc/*.html
%doc mail
%doc doc/man/hfsp.sgml
%doc AUTHORS NEWS README


%changelog
* Mon Feb 21 2005 David Woodhouse <dwmw2 at infradead.org> 1.0.4-2
- Include fsck.hfsplus symlink
- Fix kernel header inclusion
x 
* Sun Apr 11 2004 David Woodhouse <dwmw2 at redhat.com> 1.0.4-1
- Initial build.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/hfsplusutils/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Feb 2005 23:18:26 -0000	1.1
+++ .cvsignore	21 Feb 2005 23:20:43 -0000	1.2
@@ -0,0 +1 @@
+hfsplus_1.0.4.src.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/hfsplusutils/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Feb 2005 23:18:26 -0000	1.1
+++ sources	21 Feb 2005 23:20:43 -0000	1.2
@@ -0,0 +1 @@
+18fa1efb5432469357ffa6bfa7c08fcd  hfsplus_1.0.4.src.tar.bz2