From 3d4b8e62f133353bdef65f67f3fb7ed60fb68fb6 Mon Sep 17 00:00:00 2001
From: OBS User unknown <null@suse.de>
Date: Fri, 13 Jul 2007 16:05:59 +0000
Subject: [PATCH] Rev openSUSE:Factory/13 Md5 a2341728434c5e4c342b5de3d5431d07
 2007-07-13 16:05:59 unknown None

---
 e2fsprogs-1.39-cleanup.patch  | 12 ------------
 e2fsprogs-1.40.1.tar.bz2      |  3 +++
 e2fsprogs-1.40.tar.bz2        |  3 ---
 e2fsprogs-no_cmd_hiding.patch |  4 ++--
 e2fsprogs.changes             |  8 ++++++++
 e2fsprogs.spec                | 17 +++++++++--------
 6 files changed, 22 insertions(+), 25 deletions(-)
 delete mode 100644 e2fsprogs-1.39-cleanup.patch
 create mode 100644 e2fsprogs-1.40.1.tar.bz2
 delete mode 100644 e2fsprogs-1.40.tar.bz2

diff --git a/e2fsprogs-1.39-cleanup.patch b/e2fsprogs-1.39-cleanup.patch
deleted file mode 100644
index f805711..0000000
--- a/e2fsprogs-1.39-cleanup.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- config/parse-types.sh
-+++ config/parse-types.sh
-@@ -22,6 +22,9 @@
- cp asm_types.h asm_types.c
- 
- cat >> asm_types.c <<EOF
-+#include <stdio.h>
-+#include <stdlib.h>
-+
- main(int argc, char **argv)
- {
- #ifdef __U8_TYPEDEF
diff --git a/e2fsprogs-1.40.1.tar.bz2 b/e2fsprogs-1.40.1.tar.bz2
new file mode 100644
index 0000000..e62d3fe
--- /dev/null
+++ b/e2fsprogs-1.40.1.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4f1564d2832a292f0053ae654e2262515c1dfe1196fb839e14c4de4734c781a4
+size 3559536
diff --git a/e2fsprogs-1.40.tar.bz2 b/e2fsprogs-1.40.tar.bz2
deleted file mode 100644
index ad75b8f..0000000
--- a/e2fsprogs-1.40.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:46d1fb8e2b6ed5f078923e6f659ff69b34db720a0a929d5864e3b9e535bcd0a3
-size 3718339
diff --git a/e2fsprogs-no_cmd_hiding.patch b/e2fsprogs-no_cmd_hiding.patch
index b5bd0db..3c3a911 100644
--- a/e2fsprogs-no_cmd_hiding.patch
+++ b/e2fsprogs-no_cmd_hiding.patch
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6b4228bb3934b0b1f944e0b3e1177c051c2ddbe1a96d52646f13ba48e83c8266
-size 58355
+oid sha256:a8b2db52179f6143fd39ab5832d9c84e33b6a34e4446c95c7c42cf843095f02c
+size 55359
diff --git a/e2fsprogs.changes b/e2fsprogs.changes
index d5b9efc..8e051e5 100644
--- a/e2fsprogs.changes
+++ b/e2fsprogs.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Mon Jul  9 12:52:41 CEST 2007 - mkoenig@suse.de
+
+- update to version 1.40.1:
+  * Bugfix release
+- removed patch (merged upstream)
+  e2fsprogs-1.39-cleanup.patch 
+
 -------------------------------------------------------------------
 Wed Jul  4 19:02:51 CEST 2007 - mkoenig@suse.de
 
diff --git a/e2fsprogs.spec b/e2fsprogs.spec
index 6f19c78..ddf6bbb 100644
--- a/e2fsprogs.spec
+++ b/e2fsprogs.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package e2fsprogs (Version 1.40)
+# spec file for package e2fsprogs (Version 1.40.1)
 #
 # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
@@ -15,13 +15,11 @@ Name:           e2fsprogs
 BuildRequires:  libvolume_id-devel
 License:        GPL v2 or later
 Group:          System/Filesystems
-Provides:       e2fsbn ext2fs
 Supplements:    filesystem(ext2) filesystem(ext3)
-Obsoletes:      ext2fs
 PreReq:         %install_info_prereq
 Autoreqprov:    on
-Version:        1.40
-Release:        2
+Version:        1.40.1
+Release:        1
 Summary:        Utilities for the Second Extended File System
 URL:            http://e2fsprogs.sourceforge.net
 Source:         %{name}-%{version}.tar.bz2
@@ -40,7 +38,6 @@ Patch10:        close.patch
 Patch11:        fsck-ignore-mounted.patch
 Patch12:        e2fsprogs-mkinstalldirs.patch
 Patch13:        e2fsprogs-special_make_targets.patch
-Patch14:        e2fsprogs-1.39-cleanup.patch
 Patch15:        e2fsprogs-1.39-uuid_duplicates.patch
 Patch16:        e2fsprogs-1.39-resize2fs_manpage.patch
 Patch17:        e2fsprogs-strncat.patch
@@ -227,7 +224,6 @@ Authors:
 %patch10 -p1
 %patch11
 %patch12
-%patch14
 %patch15 -p1
 %patch16
 %patch17 -p1
@@ -309,7 +305,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(-, root, root)
-%doc RELEASE-NOTES ChangeLog README doc/libblkid.txt
+%doc RELEASE-NOTES README doc/libblkid.txt
 %config /etc/mke2fs.conf
 /sbin/badblocks
 /sbin/debugfs
@@ -414,6 +410,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/com_err.3.gz
 
 %changelog
+* Mon Jul 09 2007 - mkoenig@suse.de
+- update to version 1.40.1:
+  * Bugfix release
+- removed patch (merged upstream)
+  e2fsprogs-1.39-cleanup.patch
 * Wed Jul 04 2007 - mkoenig@suse.de
 - update to version 1.40
 - branch off libraries: