From ecc5d6babb1c456c231a8c8c5fe653af482e4f1e Mon Sep 17 00:00:00 2001 From: Panu Matilainen Date: Wed, 17 Mar 2010 05:31:03 +0000 Subject: [PATCH] - unbreak find-lang --with-man from yesterdays braindamage --- rpm-4.8.0-no-man-dirs.patch | 5 +++-- rpm.spec | 5 ++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/rpm-4.8.0-no-man-dirs.patch b/rpm-4.8.0-no-man-dirs.patch index cd1c090..8539ac2 100644 --- a/rpm-4.8.0-no-man-dirs.patch +++ b/rpm-4.8.0-no-man-dirs.patch @@ -1,12 +1,13 @@ diff --git a/scripts/find-lang.sh b/scripts/find-lang.sh -index bb25b31..df6b576 100755 +index bb25b31..e4a22db 100755 --- a/scripts/find-lang.sh +++ b/scripts/find-lang.sh -@@ -173,7 +173,6 @@ s:%lang(C) :: +@@ -173,7 +173,7 @@ s:%lang(C) :: find $TOP_DIR -type d|sed ' s:'"$TOP_DIR"':: '"$ALL_NAME$MAN"'s:\(.*/man/\([^/_]\+\).*/man[a-z0-9]\+/\):: -'"$ALL_NAME$MAN"'s:\(.*/man/\([^/_]\+\).*/man[a-z0-9]\+$\):%lang(\2) \1*: ++'"$ALL_NAME$MAN"'s:\(.*/man/\([^/_]\+\).*/man[a-z0-9]\+$\):%lang(\2) \1/*: s:^\([^%].*\):: s:%lang(C) :: /^$/d' >> $MO_NAME diff --git a/rpm.spec b/rpm.spec index 9cc529c..201b3b9 100644 --- a/rpm.spec +++ b/rpm.spec @@ -21,7 +21,7 @@ Summary: The RPM package management system Name: rpm Version: %{rpmver} -Release: 11%{?dist} +Release: 12%{?dist} Group: System Environment/Base Url: http://www.rpm.org/ Source0: http://rpm.org/releases/testing/%{name}-%{srcver}.tar.bz2 @@ -419,6 +419,9 @@ exit 0 %doc doc/librpm/html/* %changelog +* Wed Mar 17 2010 Panu Matilainen - 4.8.0-12 +- unbreak find-lang --with-man from yesterdays braindamage + * Tue Mar 16 2010 Panu Matilainen - 4.8.0-11 - support single PPD providing driver for devices (#568351) - merge the psdriver patch pile into one