rpms/rpm/devel rpm-4.8.0-no-man-dirs.patch, NONE, 1.1 rpm.spec, 1.391, 1.392

[Panu Matilainen]

Author: pmatilai

Update of /cvs/pkgs/rpms/rpm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11101

Modified Files:
	rpm.spec 
Added Files:
	rpm-4.8.0-no-man-dirs.patch 
Log Message:
- dont own localized man directories through find_lang (#569536)


rpm-4.8.0-no-man-dirs.patch:
 find-lang.sh |    1 -
 1 file changed, 1 deletion(-)

--- NEW FILE rpm-4.8.0-no-man-dirs.patch ---
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


Index: rpm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpm/devel/rpm.spec,v
retrieving revision 1.391
retrieving revision 1.392
diff -u -p -r1.391 -r1.392
--- rpm.spec	16 Mar 2010 09:27:14 -0000	1.391
+++ rpm.spec	16 Mar 2010 09:41:32 -0000	1.392
@@ -37,6 +37,8 @@ Patch2: rpm-4.5.90-gstreamer-provides.pa
 Patch3: rpm-4.7.90-fedora-specspo.patch
 # Postscript driver provides extraction is Fedora specific for now
 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
 Patch200: rpm-4.8.0-url-segfault.patch
@@ -191,6 +193,7 @@ packages on a system.
 %patch2 -p1 -b .gstreamer-prov
 %patch3 -p1 -b .fedora-specspo
 %patch4 -p1 -b .psdriver-deps
+%patch5 -p1 -b .no-man-dirs
 
 %patch200 -p1 -b .url-segfault
 %patch201 -p1 -b .verify-exitcode
@@ -421,6 +424,7 @@ exit 0
 - merge the psdriver patch pile into one
 - preserve empty lines in spec prep section (#573339)
 - 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 at redhat.com> - 4.8.0-10
 - drop bogus dependency on lzma, xz is used to handle the lzma format too