Hello community, here is the log from the commit of package dosfstools for openSUSE:Factory checked in at Wed Nov 10 18:39:33 CET 2010. -------- --- dosfstools/dosfstools.changes 2010-09-13 11:31:24.000000000 +0200 +++ dosfstools/dosfstools.changes 2010-11-01 13:27:31.000000000 +0100 @@ -1,0 +2,8 @@ +Mon Nov 1 12:15:33 CET 2010 - pgajdos@suse.cz + +- fixed: + * [bnc#639553] -- mkdosfs now detects md raid partition correctly + * [bnc#649046] -- install dosfslabel + * spec file cleanup + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- dosfstools-mdraid-partition.patch dosfstools-suse-dirs.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dosfstools.spec ++++++ --- /var/tmp/diff_new_pack.b04MkH/_old 2010-11-10 18:39:16.000000000 +0100 +++ /var/tmp/diff_new_pack.b04MkH/_new 2010-11-10 18:39:16.000000000 +0100 @@ -25,9 +25,11 @@ AutoReqProv: on Summary: Utilities for Making and Checking MS-DOS FAT File Systems on Linux Version: 3.0.10 -Release: 1 +Release: 2 Url: http://freshmeat.net/projects/dosfstools Source: %{name}_%{version}.orig.tar.bz2 +Patch0: %{name}-suse-dirs.patch +Patch1: %{name}-mdraid-partition.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Supplements: filesystem(vfat) @@ -46,33 +48,14 @@ %prep %setup +%patch0 -p1 +%patch1 %build make OPTFLAGS="-D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE $RPM_OPT_FLAGS" %install -# directories -install -d $RPM_BUILD_ROOT{/sbin,%{_mandir}/man8} -# binaries -install -m755 mkdosfs $RPM_BUILD_ROOT/sbin/ -install -m755 dosfsck $RPM_BUILD_ROOT/sbin/ -# alternative names -ln -sf mkdosfs $RPM_BUILD_ROOT/sbin/mkfs.msdos -ln -sf dosfsck $RPM_BUILD_ROOT/sbin/fsck.msdos -ln -sf mkdosfs $RPM_BUILD_ROOT/sbin/mkfs.vfat -ln -sf dosfsck $RPM_BUILD_ROOT/sbin/fsck.vfat -# man pages -install -m 644 man/mkdosfs.8 $RPM_BUILD_ROOT%{_mandir}/man8/ -install -m 644 man/dosfsck.8 $RPM_BUILD_ROOT%{_mandir}/man8/ -install -m 644 man/dosfslabel.8 $RPM_BUILD_ROOT%{_mandir}/man8/ -# man pages for alternative names -ln -sf mkdosfs.8.gz $RPM_BUILD_ROOT%{_mandir}/man8/mkfs.msdos.8.gz -ln -sf dosfsck.8.gz $RPM_BUILD_ROOT%{_mandir}/man8/fsck.msdos.8.gz -ln -sf mkdosfs.8.gz $RPM_BUILD_ROOT%{_mandir}/man8/mkfs.vfat.8.gz -ln -sf dosfsck.8.gz $RPM_BUILD_ROOT%{_mandir}/man8/fsck.vfat.8.gz -# documentation -install -d $RPM_BUILD_ROOT/%{_docdir}/%{name}/ -install -m644 ChangeLog COPYING doc/* $RPM_BUILD_ROOT/%{_docdir}/%{name}/ +%makeinstall %clean rm -rf $RPM_BUILD_ROOT ++++++ dosfstools-mdraid-partition.patch ++++++ Index: src/mkdosfs.c =================================================================== --- src/mkdosfs.c.orig +++ src/mkdosfs.c @@ -1763,10 +1763,11 @@ main (int argc, char **argv) * this is a MO disk I introduce a -I (ignore) switch. -Joey */ if (!ignore_full_disk && ( - (statbuf.st_rdev & 0xff3f) == 0x0300 || /* hda, hdb */ - (statbuf.st_rdev & 0xff0f) == 0x0800 || /* sd */ - (statbuf.st_rdev & 0xff3f) == 0x0d00 || /* xd */ - (statbuf.st_rdev & 0xff3f) == 0x1600 ) /* hdc, hdd */ + (statbuf.st_rdev & 0xfff3f) == 0x00300 || + (major(statbuf.st_rdev) == 3 && (minor(statbuf.st_rdev) % 64) == 0) || /* hda, hdb */ + (major(statbuf.st_rdev) == 8 && (minor(statbuf.st_rdev) % 16) == 0) || /* sd */ + (major(statbuf.st_rdev) == 13 && (minor(statbuf.st_rdev) % 64) == 0) || /* xd */ + (major(statbuf.st_rdev) == 22 && (minor(statbuf.st_rdev) % 64) == 0)) /* hdc, hdd */ ) die ("Device partition expected, not making filesystem on entire device '%s' (use -I to override)"); ++++++ dosfstools-suse-dirs.patch ++++++ Index: dosfstools-3.0.10/Makefile =================================================================== --- dosfstools-3.0.10.orig/Makefile +++ dosfstools-3.0.10/Makefile @@ -19,9 +19,9 @@ # can be found in /usr/share/common-licenses/GPL-3 file. DESTDIR = -PREFIX = /usr/local -SBINDIR = $(PREFIX)/sbin -DOCDIR = $(PREFIX)/share/doc +PREFIX = /usr +SBINDIR = /sbin +DOCDIR = $(PREFIX)/share/doc/packages MANDIR = $(PREFIX)/share/man #OPTFLAGS = -O2 -fomit-frame-pointer -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org