rpms/rpm
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- dont own localized man directories through find_lang (#569536)

Browse Source
This commit is contained in:
Panu Matilainen 2010-03-16 09:41:32 +00:00
parent 6816f23e04
commit 53b8b3c646
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
rpm-4.8.0-no-man-dirs.patch Normal file
View File

@ -0,0 +1,12 @@
diff --git a/scripts/find-lang.sh b/scripts/find-lang.sh
index bb25b31..df6b576 100755
--- a/scripts/find-lang.sh
+++ b/scripts/find-lang.sh
@@ -173,7 +173,6 @@ 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*:
s:^\([^%].*\)::
s:%lang(C) ::
/^$/d' >> $MO_NAME

4
rpm.spec
View File

@ -37,6 +37,8 @@ Patch2: rpm-4.5.90-gstreamer-provides.patch
Patch3: rpm-4.7.90-fedora-specspo.patch Patch3: rpm-4.7.90-fedora-specspo.patch
# Postscript driver provides extraction is Fedora specific for now # Postscript driver provides extraction is Fedora specific for now
Patch4: rpm-4.8.0-psdriver-deps.patch Patch4: rpm-4.8.0-psdriver-deps.patch
# In current Fedora, man-pages pkg owns all the localized man directories
Patch5: rpm-4.8.0-no-man-dirs.patch
# Patches already in upstream # Patches already in upstream
Patch200: rpm-4.8.0-url-segfault.patch Patch200: rpm-4.8.0-url-segfault.patch
@ -191,6 +193,7 @@ packages on a system.
%patch2 -p1 -b .gstreamer-prov %patch2 -p1 -b .gstreamer-prov
%patch3 -p1 -b .fedora-specspo %patch3 -p1 -b .fedora-specspo
%patch4 -p1 -b .psdriver-deps %patch4 -p1 -b .psdriver-deps
%patch5 -p1 -b .no-man-dirs
%patch200 -p1 -b .url-segfault %patch200 -p1 -b .url-segfault
%patch201 -p1 -b .verify-exitcode %patch201 -p1 -b .verify-exitcode
@ -421,6 +424,7 @@ exit 0
- merge the psdriver patch pile into one - merge the psdriver patch pile into one
- preserve empty lines in spec prep section (#573339) - preserve empty lines in spec prep section (#573339)
- teach python bindings about RPMTRANS_FLAG_NOCONTEXTS (related to #573111) - teach python bindings about RPMTRANS_FLAG_NOCONTEXTS (related to #573111)
- dont own localized man directories through find_lang (#569536)
* Mon Feb 15 2010 Panu Matilainen <pmatilai@redhat.com> - 4.8.0-10 * Mon Feb 15 2010 Panu Matilainen <pmatilai@redhat.com> - 4.8.0-10
- drop bogus dependency on lzma, xz is used to handle the lzma format too - drop bogus dependency on lzma, xz is used to handle the lzma format too