rpms/e2fsprogs/devel e2fsprogs-1.40.4-no-static-e2fsck.patch, NONE, 1.1 e2fsprogs.spec, 1.94, 1.95

[Eric Sandeen (sandeen)]

Author: sandeen

Update of /cvs/pkgs/rpms/e2fsprogs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22755

Modified Files:
	e2fsprogs.spec 
Added Files:
	e2fsprogs-1.40.4-no-static-e2fsck.patch 
Log Message:
* Wed Jan 23 2008 Eric Sandeen <sandeen at redhat.com> 1.40.4-6
- Completely clobber e2fsck.static build.


e2fsprogs-1.40.4-no-static-e2fsck.patch:

--- NEW FILE e2fsprogs-1.40.4-no-static-e2fsck.patch ---
Index: e2fsprogs-1.40.4/e2fsck/Makefile.in
===================================================================
--- e2fsprogs-1.40.4.orig/e2fsck/Makefile.in
+++ e2fsprogs-1.40.4/e2fsck/Makefile.in
@@ -104,7 +104,7 @@ SRCS= $(srcdir)/e2fsck.c \
 	prof_err.c \
 	$(MTRACE_SRC)
 
-all:: profiled $(PROGS) e2fsck.static e2fsck.shared $(MANPAGES) $(FMANPAGES)
+all:: profiled $(PROGS) e2fsck. at E2FSCK_TYPE@ $(MANPAGES) $(FMANPAGES)
 
 @PROFILE_CMT at all:: e2fsck.profiled
 


Index: e2fsprogs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/e2fsprogs/devel/e2fsprogs.spec,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- e2fsprogs.spec	23 Jan 2008 20:43:41 -0000	1.94
+++ e2fsprogs.spec	24 Jan 2008 05:55:42 -0000	1.95
@@ -4,7 +4,7 @@
 Summary: Utilities for managing the second and third extended (ext2/ext3) filesystems
 Name: e2fsprogs
 Version: 1.40.4
-Release: 5%{?dist}
+Release: 6%{?dist}
 # License based on upstream-modified COPYING file,
 # which clearly states "V2" intent.
 License: GPLv2
@@ -19,6 +19,7 @@
 Patch4: e2fsprogs-1.40.4-uuidd-tidy.patch
 Patch5: e2fsprogs-1.40.4-sb_feature_check_ignore.patch
 Patch6: e2fsprogs-1.40.4-blkid-ext4dev.patch
+Patch7: e2fsprogs-1.40.4-no-static-e2fsck.patch
 
 Url: http://e2fsprogs.sourceforge.net/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -102,6 +103,8 @@
 %patch5 -p1 -b .featurecheck
 # teach blkid about ext4dev, for now
 %patch6 -p1 -b .ext4-blkid
+# completely clobber e2fsck.static build
+%patch7 -p1 -b .e2fsck-static
 
 %build
 aclocal
@@ -291,9 +294,12 @@
 %dir %attr(2775, uuidd, uuidd) /var/lib/libuuid
 
 %changelog
+* Wed Jan 23 2008 Eric Sandeen <sandeen at redhat.com> 1.40.4-6
+- Completely clobber e2fsck.static build.
+
 * Wed Jan 23 2008 Eric Sandeen <sandeen at redhat.com> 1.40.4-5
-- ignore some primary/backup superblock flag differences (#428893)
-- teach libblkid about ext4dev
+- Ignore some primary/backup superblock flag differences (#428893)
+- Teach libblkid about ext4dev.
 
 * Mon Jan 10 2008 Eric Sandeen <sandeen at redhat.com> 1.40.4-4
 - Build e2fsck as a dynamically linked binary.