rpms
/
rpm
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

- unbreak find-lang --with-man from yesterdays braindamage

This commit is contained in:
Panu Matilainen 2010-03-17 05:31:03 +00:00
parent 53b8b3c646
commit ecc5d6babb
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
rpm-4.8.0-no-man-dirs.patch
View File

@ -1,12 +1,13 @@
diff --git a/scripts/find-lang.sh b/scripts/find-lang.sh 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 --- a/scripts/find-lang.sh
+++ b/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 ' find $TOP_DIR -type d|sed '
s:'"$TOP_DIR"':: s:'"$TOP_DIR"'::
'"$ALL_NAME$MAN"'s:\(.*/man/\([^/_]\+\).*/man[a-z0-9]\+/\):: '"$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*:
+'"$ALL_NAME$MAN"'s:\(.*/man/\([^/_]\+\).*/man[a-z0-9]\+$\):%lang(\2) \1/*:
s:^\([^%].*\):: s:^\([^%].*\)::
s:%lang(C) :: s:%lang(C) ::
/^$/d' >> $MO_NAME /^$/d' >> $MO_NAME

5
rpm.spec
View File

@ -21,7 +21,7 @@
Summary: The RPM package management system Summary: The RPM package management system
Name: rpm Name: rpm
Version: %{rpmver} Version: %{rpmver}
Release: 11%{?dist} Release: 12%{?dist}
Group: System Environment/Base Group: System Environment/Base
Url: http://www.rpm.org/ Url: http://www.rpm.org/
Source0: http://rpm.org/releases/testing/%{name}-%{srcver}.tar.bz2 Source0: http://rpm.org/releases/testing/%{name}-%{srcver}.tar.bz2
@ -419,6 +419,9 @@ exit 0
%doc doc/librpm/html/* %doc doc/librpm/html/*
%changelog %changelog
* Wed Mar 17 2010 Panu Matilainen <pmatilai@redhat.com> - 4.8.0-12
- unbreak find-lang --with-man from yesterdays braindamage
* Tue Mar 16 2010 Panu Matilainen <pmatilai@redhat.com> - 4.8.0-11 * Tue Mar 16 2010 Panu Matilainen <pmatilai@redhat.com> - 4.8.0-11
- support single PPD providing driver for devices (#568351) - support single PPD providing driver for devices (#568351)
- merge the psdriver patch pile into one - merge the psdriver patch pile into one