Accepting request 99422 from filesystems

Fix building on Factory

OBS-URL: https://build.opensuse.org/request/show/99422
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/e2fsprogs?expand=0&rev=66
This commit is contained in:
Stephan Kulow 2012-01-11 14:36:15 +00:00 committed by Git OBS Bridge
commit 582f8a4f20
3 changed files with 63 additions and 22 deletions

View File

@ -0,0 +1,35 @@
From d1c9b6ea5e3b473341650757726def797c616a84 Mon Sep 17 00:00:00 2001
From: Theodore Ts'o <tytso@mit.edu>
Date: Sat, 8 Oct 2011 13:50:10 -0400
Subject: [PATCH] dumpe2fs.8.in: add man page warning about mounted file systems
References: bnc#708243
This should be obvious, but apparently not to all users...
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Acked-by: Jan Kara <jack@suse.cz>
---
misc/dumpe2fs.8.in | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/misc/dumpe2fs.8.in b/misc/dumpe2fs.8.in
index c1dfcbd..a493789 100644
--- a/misc/dumpe2fs.8.in
+++ b/misc/dumpe2fs.8.in
@@ -23,10 +23,9 @@ prints the super block and blocks group information for the filesystem
present on
.I device.
.PP
-.B dumpe2fs
-is similar to Berkeley's
-.B dumpfs
-program for the BSD Fast File System.
+.B Note:
+When used with a mounted filesystem, the printed
+information may be old or inconsistent.
.SH OPTIONS
.TP
.B \-b
--
1.7.1

View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Tue Dec 20 20:23:14 UTC 2011 - coolo@suse.com
- add autoconf as buildrequire to avoid implicit dependency
-------------------------------------------------------------------
Thu Oct 13 09:26:51 UTC 2011 - jack@suse.cz
- Added dumpe2fs.8 manpage fix
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Jul 22 17:11:57 UTC 2011 - jack@suse.cz Fri Jul 22 17:11:57 UTC 2011 - jack@suse.cz

View File

@ -15,24 +15,23 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/ # Please submit bugfixes or comments via http://bugs.opensuse.org/
# #
# norootforbuild
Name: e2fsprogs Name: e2fsprogs
License: GPLv2
Group: System/Filesystems
Supplements: filesystem(ext2) filesystem(ext3) filesystem(ext4) Supplements: filesystem(ext2) filesystem(ext3) filesystem(ext4)
BuildRequires: libblkid-devel libuuid-devel pkg-config BuildRequires: autoconf
BuildRequires: libblkid-devel
BuildRequires: libuuid-devel
BuildRequires: pkg-config
PreReq: %install_info_prereq PreReq: %install_info_prereq
AutoReqProv: on
# bug437293 # bug437293
%ifarch ppc64 %ifarch ppc64
Obsoletes: e2fsprogs-64bit Obsoletes: e2fsprogs-64bit
%endif %endif
# #
Version: 1.41.14 Version: 1.41.14
Release: 8 Release: 0
Summary: Utilities for the Second Extended File System Summary: Utilities for the Second Extended File System
License: GPL-2.0
Group: System/Filesystems
Url: http://e2fsprogs.sourceforge.net Url: http://e2fsprogs.sourceforge.net
Source: %{name}-%{version}.tar.bz2 Source: %{name}-%{version}.tar.bz2
Source2: README.SUSE Source2: README.SUSE
@ -42,9 +41,10 @@ Source4: e2fsprogs-1.41.14.de.po.bz2
# #
# e2fsprogs patches # e2fsprogs patches
# #
Patch7: e2fsprogs-1.41.1-splash_support.patch Patch1: e2fsprogs-1.41.1-splash_support.patch
Patch2: dumpe2fs-add-man-page-warning-about-mounted-fil.patch
# libcom_err patches # libcom_err patches
Patch34: libcom_err-compile_et_permissions.patch Patch3: libcom_err-compile_et_permissions.patch
# Do not suppress make commands # Do not suppress make commands
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -54,10 +54,9 @@ under Linux. Included in this package are: chattr, lsattr, mke2fs,
mklost+found, tune2fs, e2fsck, resize2fs, and badblocks. mklost+found, tune2fs, e2fsck, resize2fs, and badblocks.
%package devel %package devel
License: LGPLv2
Summary: Dummy development package Summary: Dummy development package
License: LGPL-2.0
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
AutoReqProv: on
# bug437293 # bug437293
%ifarch ppc64 %ifarch ppc64
Obsoletes: e2fsprogs-devel-64bit Obsoletes: e2fsprogs-devel-64bit
@ -69,27 +68,25 @@ Requires: libext2fs-devel = %version libblkid-devel libuuid-devel
Dummy development package for backwards compatibility. Dummy development package for backwards compatibility.
%package -n libext2fs2 %package -n libext2fs2
License: LGPLv2
Summary: Ext2fs library Summary: Ext2fs library
License: LGPL-2.0
Group: System/Filesystems Group: System/Filesystems
AutoReqProv: on
%description -n libext2fs2 %description -n libext2fs2
The basic Ext2fs shared library. The basic Ext2fs shared library.
%package -n libext2fs-devel %package -n libext2fs-devel
License: LGPLv2
Summary: Development files for libext2fs Summary: Development files for libext2fs
License: LGPL-2.0
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
AutoReqProv: on
Requires: libext2fs2 = %version libcom_err-devel Requires: libext2fs2 = %version libcom_err-devel
%description -n libext2fs-devel %description -n libext2fs-devel
Development files for libext2fs. Development files for libext2fs.
%package -n libcom_err2 %package -n libcom_err2
License: MIT
Summary: E2fsprogs error reporting library Summary: E2fsprogs error reporting library
License: MIT
Group: System/Filesystems Group: System/Filesystems
# bug437293 # bug437293
%ifarch ppc64 %ifarch ppc64
@ -99,16 +96,14 @@ Obsoletes: libcom_err2-64bit
# #
Provides: libcom_err = %{version} Provides: libcom_err = %{version}
Obsoletes: libcom_err <= 1.40 Obsoletes: libcom_err <= 1.40
AutoReqProv: on
%description -n libcom_err2 %description -n libcom_err2
com_err is an error message display library. com_err is an error message display library.
%package -n libcom_err-devel %package -n libcom_err-devel
License: MIT
Summary: Development files for libcom_err Summary: Development files for libcom_err
License: MIT
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
AutoReqProv: on
# bug437293 # bug437293
%ifarch ppc64 %ifarch ppc64
Obsoletes: libcom_err-devel-64bit Obsoletes: libcom_err-devel-64bit
@ -122,9 +117,10 @@ Development files for the com_err error message display library.
%prep %prep
%setup -q %setup -q
# e2fsprogs patches # e2fsprogs patches
%patch7 %patch1
%patch2 -p1
# libcom_err patches # libcom_err patches
%patch34 -p1 %patch3 -p1
cp %{SOURCE2} . cp %{SOURCE2} .
bunzip2 -dc %{S:4} > po/de.po bunzip2 -dc %{S:4} > po/de.po