- build fixes for new automake 1.10 (#220715)
This commit is contained in:
Thomas Woerner 2006-12-25 11:04:21 +00:00
parent ee1f70223f
commit 6d1b549d2c
2 changed files with 31 additions and 2 deletions

View File

@ -0,0 +1,24 @@
--- e2fsprogs-1.39/intl/Makefile.in.mkinstalldirs 2006-12-25 11:44:27.000000000 +0100
+++ e2fsprogs-1.39/intl/Makefile.in 2006-12-25 11:46:16.000000000 +0100
@@ -39,8 +39,8 @@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
-MKINSTALLDIRS = @MKINSTALLDIRS@
-mkinstalldirs = $(SHELL) $(MKINSTALLDIRS)
+MKINSTALLDIRS = @MKDIR_P@
+mkinstalldirs = $(mkdir_p)
l = @INTL_LIBTOOL_SUFFIX_PREFIX@
--- e2fsprogs-1.39/MCONFIG.in.mkinstalldirs 2006-12-25 11:47:09.000000000 +0100
+++ e2fsprogs-1.39/MCONFIG.in 2006-12-25 11:47:11.000000000 +0100
@@ -62,7 +62,7 @@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
-MKINSTALLDIRS = @MKINSTALLDIRS@
+MKINSTALLDIRS = @MKDIR_P@
#
# Library definitions

View File

@ -4,7 +4,7 @@
Summary: Utilities for managing the second and third extended (ext2/ext3) filesystems Summary: Utilities for managing the second and third extended (ext2/ext3) filesystems
Name: e2fsprogs Name: e2fsprogs
Version: 1.39 Version: 1.39
Release: 8 Release: 9
License: GPL License: GPL
Group: System Environment/Base Group: System Environment/Base
Source: ftp://download.sourceforge.net/pub/sourceforge/e2fsprogs/e2fsprogs-%{version}.tar.gz Source: ftp://download.sourceforge.net/pub/sourceforge/e2fsprogs/e2fsprogs-%{version}.tar.gz
@ -30,10 +30,11 @@ Patch58: e2fsprogs-1.39-more_rounding_overflows.patch
Patch59: e2fsprogs-1.39-large_file_size.patch Patch59: e2fsprogs-1.39-large_file_size.patch
Patch60: e2fsprogs-1.39-e2p_percent_div.patch Patch60: e2fsprogs-1.39-e2p_percent_div.patch
Patch61: e2fsprogs-1.39-uuid.patch Patch61: e2fsprogs-1.39-uuid.patch
Patch62: e2fsprogs-1.39-mkinstalldirs.patch
Url: http://e2fsprogs.sourceforge.net/ Url: http://e2fsprogs.sourceforge.net/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: e2fsprogs-libs = %{version}-%{release}, device-mapper Requires: e2fsprogs-libs = %{version}-%{release}, device-mapper
BuildRequires: gettext, texinfo, autoconf, automake, libselinux-devel BuildRequires: gettext, texinfo, autoconf, automake >= 1.10, libselinux-devel
BuildRequires: libsepol-devel, gettext-devel, pkgconfig BuildRequires: libsepol-devel, gettext-devel, pkgconfig
BuildRequires: device-mapper >= 1.02.02-3 BuildRequires: device-mapper >= 1.02.02-3
@ -110,6 +111,7 @@ also want to install e2fsprogs.
%patch59 -p1 -b .large_file_size %patch59 -p1 -b .large_file_size
%patch60 -p1 -b .e2p_percent_div %patch60 -p1 -b .e2p_percent_div
%patch61 -p1 -b .uuid %patch61 -p1 -b .uuid
%patch62 -p1 -b .mkinstalldirs
%build %build
aclocal aclocal
@ -261,6 +263,9 @@ exit 0
%{_mandir}/man3/uuid_unparse.3* %{_mandir}/man3/uuid_unparse.3*
%changelog %changelog
* Mon Dec 25 2006 Thomas Woerner <twoerner@redhat.com> - 1.39-9
- build fixes for new automake 1.10 (#220715)
* Mon Dec 18 2006 Thomas Woerner <twoerner@redhat.com> - 1.39-8 * Mon Dec 18 2006 Thomas Woerner <twoerner@redhat.com> - 1.39-8
- make uuid_generate_time generate unique uuids (#218606) - make uuid_generate_time generate unique uuids (#218606)