From 412c97338da83c2838f395866a210b9caa61f1da Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Fri, 20 Feb 2009 20:43:55 +0000 Subject: [PATCH] Rev openSUSE:Factory/42 Md5 796db283d4b54221c0666571beabc4f7 2009-02-20 20:43:55 unknown None --- e2fsprogs.changes | 6 ++++++ e2fsprogs.spec | 33 +++++++++++++++------------------ 2 files changed, 21 insertions(+), 18 deletions(-) diff --git a/e2fsprogs.changes b/e2fsprogs.changes index bde3ca6..e7c7822 100644 --- a/e2fsprogs.changes +++ b/e2fsprogs.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Feb 20 16:32:04 CET 2009 - coolo@suse.de + +- ext4dev is now ext4 (2.6.29) +- don't call autoconf as long as it works without + ------------------------------------------------------------------- Tue Feb 3 15:14:47 CET 2009 - mkoenig@suse.de diff --git a/e2fsprogs.spec b/e2fsprogs.spec index b48797f..4c76499 100644 --- a/e2fsprogs.spec +++ b/e2fsprogs.spec @@ -32,7 +32,7 @@ Obsoletes: e2fsprogs-64bit %endif # Version: 1.41.4 -Release: 1 +Release: 2 Summary: Utilities for the Second Extended File System Url: http://e2fsprogs.sourceforge.net Source: %{name}-%{version}.tar.bz2 @@ -270,14 +270,13 @@ Authors: cp %{SOURCE2} %{SOURCE5} . %build -%{?suse_update_config:%{suse_update_config -f}} #autoreconf --force --install -autoconf +#autoconf ./configure --prefix=%{_prefix} \ - --with-root-prefix='' \ - --mandir=%{_mandir} \ - --infodir=%{_infodir} \ - --libdir=%{_libdir} \ + --with-root-prefix='' \ + --mandir=%{_mandir} \ + --infodir=%{_infodir} \ + --libdir=%{_libdir} \ --enable-elf-shlibs \ --disable-evms \ CFLAGS="$RPM_OPT_FLAGS" @@ -296,13 +295,10 @@ ln -sf ../../etc/init.d/uuidd $RPM_BUILD_ROOT/usr/sbin/rcuuidd # fillup template mkdir -p ${RPM_BUILD_ROOT}/var/adm/fillup-templates install -m 644 %{SOURCE4} ${RPM_BUILD_ROOT}/var/adm/fillup-templates/ -# currently don't install links for ext4 tools and only the ext4dev ones -# as long as ext4 is not marked stable and the kernel module renamed -# from ext4dev to ext4 -rm -f $RPM_BUILD_ROOT/sbin/mkfs.ext4 -rm -f $RPM_BUILD_ROOT/sbin/fsck.ext4 -rm -f $RPM_BUILD_ROOT/usr/share/man/man8/mkfs.ext4.8 -rm -f $RPM_BUILD_ROOT/usr/share/man/man8/fsck.ext4.8 +rm -f $RPM_BUILD_ROOT/sbin/mkfs.ext4dev +rm -f $RPM_BUILD_ROOT/sbin/fsck.ext4dev +rm -f $RPM_BUILD_ROOT/usr/share/man/man8/mkfs.ext4dev.8 +rm -f $RPM_BUILD_ROOT/usr/share/man/man8/fsck.ext4dev.8 %check make check @@ -373,13 +369,11 @@ rm -rf $RPM_BUILD_ROOT /sbin/fsck /sbin/fsck.ext2 /sbin/fsck.ext3 -#/sbin/fsck.ext4 -/sbin/fsck.ext4dev +/sbin/fsck.ext4 /sbin/mke2fs /sbin/mkfs.ext2 /sbin/mkfs.ext3 -#/sbin/mkfs.ext4 -/sbin/mkfs.ext4dev +/sbin/mkfs.ext4 /sbin/resize2fs /sbin/tune2fs /sbin/e2image @@ -479,6 +473,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/com_err.3.gz %changelog +* Fri Feb 20 2009 coolo@suse.de +- ext4dev is now ext4 (2.6.29) +- don't call autoconf as long as it works without * Tue Feb 03 2009 mkoenig@suse.de - update to version 1.41.4: debugfs: