diff --git a/util-linux-2.13-mkdir_p.patch b/util-linux-2.13-mkdir_p.patch index 26452cb..eb8ed15 100644 --- a/util-linux-2.13-mkdir_p.patch +++ b/util-linux-2.13-mkdir_p.patch @@ -1,5 +1,5 @@ ---- util-linux-2.13-pre6/po/Makefile.in.in.mkdir_p 2005-10-14 22:22:14.000000000 +0200 -+++ util-linux-2.13-pre6/po/Makefile.in.in 2006-10-24 22:48:30.000000000 +0200 +--- util-linux-2.13-pre7/po/Makefile.in.in.mkdir_p 2005-10-14 22:22:14.000000000 +0200 ++++ util-linux-2.13-pre7/po/Makefile.in.in 2006-12-17 00:06:29.000000000 +0100 @@ -1,5 +1,5 @@ # Makefile for PO directory in any package using GNU gettext. -# Copyright (C) 1995-1997, 2000-2005 by Ulrich Drepper @@ -16,25 +16,13 @@ PACKAGE = @PACKAGE@ VERSION = @VERSION@ -@@ -23,18 +23,38 @@ - - prefix = @prefix@ - exec_prefix = @exec_prefix@ --datadir = $(prefix)/usr/share --localedir = $(datadir)/locale -+datarootdir = @datarootdir@ -+datadir = @datadir@ -+localedir = @localedir@ - gettextsrcdir = $(datadir)/gettext/po +@@ -29,8 +29,18 @@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ -MKINSTALLDIRS = @MKINSTALLDIRS@ -mkinstalldirs = $(SHELL) $(MKINSTALLDIRS) - --GMSGFMT = @GMSGFMT@ --MSGFMT = @MSGFMT@ --XGETTEXT = @XGETTEXT@ ++ +# We use $(mkdir_p). +# In automake <= 1.9.x, $(mkdir_p) is defined either as "mkdir -p --" or as +# "$(mkinstalldirs)" or as "$(install_sh) -d". For these automake versions, @@ -46,23 +34,10 @@ +install_sh = $(SHELL) @install_sh@ +MKDIR_P = @MKDIR_P@ +mkdir_p = @mkdir_p@ -+ -+GMSGFMT_ = @GMSGFMT@ -+GMSGFMT_no = @GMSGFMT@ -+GMSGFMT_yes = @GMSGFMT_015@ -+GMSGFMT = $(GMSGFMT_$(USE_MSGCTXT)) -+MSGFMT_ = @MSGFMT@ -+MSGFMT_no = @MSGFMT@ -+MSGFMT_yes = @MSGFMT_015@ -+MSGFMT = $(MSGFMT_$(USE_MSGCTXT)) -+XGETTEXT_ = @XGETTEXT@ -+XGETTEXT_no = @XGETTEXT@ -+XGETTEXT_yes = @XGETTEXT_015@ -+XGETTEXT = $(XGETTEXT_$(USE_MSGCTXT)) - MSGMERGE = msgmerge - MSGMERGE_UPDATE = @MSGMERGE@ --update - MSGINIT = msginit -@@ -158,7 +178,7 @@ + + GMSGFMT = @GMSGFMT@ + MSGFMT = @MSGFMT@ +@@ -158,7 +168,7 @@ install-exec: install-data: install-data-@USE_NLS@ if test "$(PACKAGE)" = "gettext-tools"; then \ @@ -71,7 +46,7 @@ for file in $(DISTFILES.common) Makevars.template; do \ $(INSTALL_DATA) $(srcdir)/$$file \ $(DESTDIR)$(gettextsrcdir)/$$file; \ -@@ -171,13 +191,13 @@ +@@ -171,13 +181,13 @@ fi install-data-no: all install-data-yes: all @@ -87,7 +62,7 @@ if test -r $$cat; then realcat=$$cat; else realcat=$(srcdir)/$$cat; fi; \ $(INSTALL_DATA) $$realcat $(DESTDIR)$$dir/$(DOMAIN).mo; \ echo "installing $$realcat as $(DESTDIR)$$dir/$(DOMAIN).mo"; \ -@@ -217,19 +237,19 @@ +@@ -217,19 +227,19 @@ installdirs-exec: installdirs-data: installdirs-data-@USE_NLS@ if test "$(PACKAGE)" = "gettext-tools"; then \ @@ -110,7 +85,7 @@ for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \ if test -n "$$lc"; then \ if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc 2>/dev/null) | grep ' -> ' >/dev/null; then \ -@@ -374,8 +394,7 @@ +@@ -374,8 +384,7 @@ Makefile: Makefile.in.in Makevars $(top_builddir)/config.status @POMAKEFILEDEPS@ cd $(top_builddir) \ diff --git a/util-linux.spec b/util-linux.spec index 4a93844..fc1cd62 100644 --- a/util-linux.spec +++ b/util-linux.spec @@ -9,7 +9,7 @@ Summary: A collection of basic system utilities. Name: util-linux Version: 2.13 -Release: 0.47%{?dist} +Release: 0.48%{?dist} License: distributable Group: System Environment/Base @@ -750,6 +750,9 @@ exit 0 /sbin/losetup %changelog +* Sun Dec 17 2006 Karel Zak 2.13-0.48 +- fix paths in po/Makefile.in.in + * Fri Dec 15 2006 Karel Zak 2.13-0.47 - fix #217240 - namei ignores non-directory components instead of saying "Not a directory" - fix #217241 - namei enforces symlink limits inconsistently