* hfsutils: rebuild & spec fix

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@5928 ec354946-7b23-47d6-9f5a-488ba84defc7

h/hfsutils/hfsutils-vl.spec

@@ -1,27 +1,29 @@
-Summary: Tools for reading and writing Macintosh HFS volumes.
-Summary(ja): Macintosh HFS ボリュームの読み書きを行うツール
-Name: hfsutils
-Version: 3.2.6  
-Release: 8%{?_dist_release}
-Group: Applications/System
-License: GPL
-Source: ftp://ftp.mars.org/pub/hfs/%{name}-%{version}.tar.gz 
-Patch0: hfsutils-3.2.6-errno.patch
-Patch1: hfsutils-3.2.6-largefile.patch
+Summary:	Tools for reading and writing Macintosh HFS volumes.
+Summary(ja):	Macintosh HFS ボリュームの読み書きを行うツール
+Name:		hfsutils
+Version:	3.2.6  
+Release:	9%{?_dist_release}
+Group:		Applications/System
+License:	GPLv2+
+Source:		ftp://ftp.mars.org/pub/hfs/%{name}-%{version}.tar.gz 
+Patch0:		hfsutils-3.2.6-errno.patch
+Patch1:		hfsutils-3.2.6-largefile.patch
+BuildRequires:	libXft-devel
 
 ## Vine Source(s)/Patch(es)
-Source100: hfsutils-man-ja.tar.gz
-Patch100: hfsutils-3.2.6-Makefile.patch
+Source100:	hfsutils-man-ja.tar.gz
+Patch100:	hfsutils-3.2.6-Makefile.patch
 
-URL: http://www.mars.org/home/rob/proj/hfs/ 
-BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root
-Requires: tcl
-BuildRequires: tcl tk
+URL:		http://www.mars.org/home/rob/proj/hfs/ 
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root
+Requires:	tcl
+BuildRequires:	tcl tk
 
 %package devel
 Summary: A C library for reading and writing Macintosh HFS volumes.
 Summary(ja): Macintosh HFS ボリュームの読み書きを行う為の C ライブラリ
 Group: Development/Libraries
+Provides: %{name}-static = %{version}-%{release}
 
 %package x11
 Summary: A Tk-based front end for browsing and copying files on Macintosh HFS volumes.
@@ -76,7 +78,7 @@ Tk ベースのフロントエンドが収録されています。
 %prep
 %setup -q -a 100
 %patch0 -p1
-%patch1 -p0
+%patch1 -p1
 
 
 %build
@@ -86,35 +88,36 @@ make hfsck/hfsck
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT%{_bindir}
-mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
-mkdir -p $RPM_BUILD_ROOT%{_includedir}
-mkdir -p $RPM_BUILD_ROOT%{_libdir}
-make	BINDEST=$RPM_BUILD_ROOT%{_bindir} \
-	LIBDEST=$RPM_BUILD_ROOT%{_libdir} \
-	INCDEST=$RPM_BUILD_ROOT%{_includedir} \
-	MANDEST=$RPM_BUILD_ROOT%{_mandir} \
+rm -rf %{buildroot}
+mkdir -p %{buildroot}%{_bindir}
+mkdir -p %{buildroot}%{_mandir}/man1
+mkdir -p %{buildroot}%{_includedir}
+mkdir -p %{buildroot}%{_libdir}
+make	BINDEST=%{buildroot}%{_bindir} \
+	LIBDEST=%{buildroot}%{_libdir} \
+	INCDEST=%{buildroot}%{_includedir} \
+	MANDEST=%{buildroot}%{_mandir} \
+	INSTALL="install -p" \
 	install install_lib
-install -m0755 hfsck/hfsck $RPM_BUILD_ROOT/%{_bindir}
-ln -sf hfsck $RPM_BUILD_ROOT/%{_bindir}/fsck.hfs
+install -m0755 hfsck/hfsck %{buildroot}/%{_bindir}
+ln -sf hfsck %{buildroot}/%{_bindir}/fsck.hfs
 
 # install Japanese man pages
-mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/ja/man1
-install -m 644 hfsutils-man-ja/* ${RPM_BUILD_ROOT}%{_mandir}/ja/man1/.
+mkdir -p %{buildroot}%{_mandir}/ja/man1
+install -m 644 hfsutils-man-ja/* %{buildroot}%{_mandir}/ja/man1/.
 
-gzip -9nvf ${RPM_BUILD_ROOT}%{_mandir}/man1/*
-gzip -9nvf ${RPM_BUILD_ROOT}%{_mandir}/ja/man1/*
+gzip -9nvf %{buildroot}%{_mandir}/man1/*
+gzip -9nvf %{buildroot}%{_mandir}/ja/man1/*
 
-find $RPM_BUILD_ROOT -type f -or -type l | \
-        sed -e "s|$RPM_BUILD_ROOT||" |
+find %{buildroot} -type f -or -type l | \
+        sed -e "s|%{buildroot}||" |
         grep -v 'xhfs' | \
         grep -v '%{_includedir}' | \
         grep -v '%{_libdir}' > hfsutils.filelist
 
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 
 %files -f hfsutils.filelist
@@ -135,6 +138,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/rsrc.h
 
 %changelog
+* Wed Mar 21 2012 MATSUBAYASHI Kohji <shaolin@vinelinux.org> - 3.2.6-9
+- rebuild; spec fix
+
 * Sun Jul 27 2008 Shu KONNO <owa@bg.wakwak.com> 3.2.6-8vl5
 - applied new versioning policy and spec in utf-8