- release 9,

- use new rpm automation,
- merge linux24 patch from RH.

Changed files:
    dosfstools.spec -> 1.11

diff --git a/dosfstools.spec b/dosfstools.spec
index 5b39da02dd0fc32b6d0ef05488e4dcba55a3d7a3..6fa6fd1a0eb05e952e8460d16f60fb8abf9fb324 100644 (file)
--- a/dosfstools.spec
+++ b/dosfstools.spec
@@ -1,15 +1,19 @@
 Summary:       Utilities to create and check MS-DOS FAT filesystems.
 Name:          dosfstools
 Version:       2.2
-Release:       2
+Release:       9
 License:       GPL
-Group:         Utilities/System
-Group(pl):     Narzêdzia/System
+Group:         Applications/System
+Group(de):     Applikationen/System
+Group(pl):     Aplikacje/System
 Source0:       ftp://ftp.uni-erlangen.de/pub/Linux/LOCAL/dosfstools/%{name}-%{version}.src.tar.gz
-Patch0:                dosfstools-llseek.patch
-Patch1:                dosfstools-288.patch
-Obsoletes:     mkdosfs-ygg
+Patch0:                %{name}-llseek.patch
+Patch1:                %{name}-288.patch
+Patch2:                %{name}-linux24.patch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+Obsoletes:     mkdosfs-ygg
+
+%define                _sbindir        /sbin
 
 %description
 Inside of this package there are two utilities to create and to check
@@ -25,12 +29,15 @@ uruchomieniowego/superbloku u
 obs³uguje pusty kod sektora uruchomieniowego.
 
 %prep
-%setup  -q
+%setup  -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
-%{__make} OPTFLAGS="$RPM_OPT_FLAGS" PREFIX=%{_prefix}
+%{__make} \
+       OPTFLAGS="%{!?debug:$RPM_OPT_FLAGS}%{?debug:-O -g}" \
+       PREFIX=%{_prefix}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -47,16 +54,13 @@ echo ".so dosfsck.8" > $RPM_BUILD_ROOT%{_mandir}/man8/fsck.vfat.8
 echo ".so mkdosf.8" > $RPM_BUILD_ROOT%{_mandir}/man8/mkfs.msdos.8
 echo ".so mkdosf.8" > $RPM_BUILD_ROOT%{_mandir}/man8/mkfs.vfat.8
 
-strip $RPM_BUILD_ROOT/sbin/*
-
-gzip -9nf $RPM_BUILD_ROOT%{_mandir}/man8/* \
-       CHANGES TODO README.fsck README.mkdosfs
+gzip -9nf CHANGES TODO README.fsck README.mkdosfs
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc {CHANGES,TODO,README.fsck,README.mkdosfs}.gz
-%attr(755,root,root) /sbin/*
+%doc *.gz
+%attr(755,root,root) %{_sbindir}/*
 %{_mandir}/man8/*