X-Git-Url: http://git.pld-linux.org/?p=packages%2Frpm.git;a=blobdiff_plain;f=rpm-non-english-man-pages.patch;h=52edb9daafb35733a5b34f9c3f985c7573f95ace;hp=a70b974d8c616b98941ddc8cb88e25c25f594a41;hb=d8fcb9b056b0a39f3c327402f218703b537aae47;hpb=7f8abe0758f96a795cd412df1b1c7d84dce917b0

diff --git a/rpm-non-english-man-pages.patch b/rpm-non-english-man-pages.patch
index a70b974..52edb9d 100644
--- a/rpm-non-english-man-pages.patch
+++ b/rpm-non-english-man-pages.patch
@@ -1,6 +1,39 @@
+Context lines from the first chunk intentionally removed
+to avoid conflicts with other patches.
+************************************************************
+diff -uNr -C0 rpm-4.0.2.orig/configure.in rpm-4.0.2/configure.in
+--- rpm-4.0.2.orig/configure.in	Mon Sep 17 21:04:12 2001
++++ rpm-4.0.2/configure.in	Mon Sep 17 21:05:36 2001
+@@ -1094,1 +1094,2 @@
+-	doc/ja/Makefile doc/pl/Makefile doc/ru/Makefile doc/sk/Makefile
++	doc/fr/Makefile doc/ja/Makefile doc/ko/Makefile
++	doc/pl/Makefile doc/ru/Makefile doc/sk/Makefile
+diff -uNr rpm-4.0.2.orig/doc/Makefile.am rpm-4.0.2/doc/Makefile.am
+--- rpm-4.0.2.orig/doc/Makefile.am	Mon Oct 16 19:37:46 2000
++++ rpm-4.0.2/doc/Makefile.am	Mon Sep 17 20:52:13 2001
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to produce Makefile.in
+ 
+-SUBDIRS		= manual ja pl ru sk
++SUBDIRS		= manual fr ja ko pl ru sk
+ 
+ man_MANS	= gendiff.1 rpm.8 rpm2cpio.8
+ 
+diff -uNr rpm-4.0.2.orig/doc/Makefile.in rpm-4.0.2/doc/Makefile.in
+--- rpm-4.0.2.orig/doc/Makefile.in	Tue Mar 13 14:19:01 2001
++++ rpm-4.0.2/doc/Makefile.in	Mon Sep 17 20:52:13 2001
+@@ -170,7 +170,7 @@
+ tmpdir = @tmpdir@
+ varprefix = @varprefix@
+ 
+-SUBDIRS = manual ja pl ru sk
++SUBDIRS = manual fr ja ko pl ru sk
+ 
+ man_MANS = gendiff.1 rpm.8 rpm2cpio.8
+ 
 diff -uNr rpm-4.0.2.orig/doc/fr/Makefile.am rpm-4.0.2/doc/fr/Makefile.am
 --- rpm-4.0.2.orig/doc/fr/Makefile.am	Thu Jan  1 01:00:00 1970
-+++ rpm-4.0.2/doc/fr/Makefile.am	Sun Sep 16 23:38:02 2001
++++ rpm-4.0.2/doc/fr/Makefile.am	Mon Sep 17 20:52:13 2001
 @@ -0,0 +1,8 @@
 +## Process this file with automake to produce Makefile.in
 +
@@ -12,7 +45,7 @@ diff -uNr rpm-4.0.2.orig/doc/fr/Makefile.am rpm-4.0.2/doc/fr/Makefile.am
 +EXTRA_DIST	= $(man_MANS)
 diff -uNr rpm-4.0.2.orig/doc/fr/Makefile.in rpm-4.0.2/doc/fr/Makefile.in
 --- rpm-4.0.2.orig/doc/fr/Makefile.in	Thu Jan  1 01:00:00 1970
-+++ rpm-4.0.2/doc/fr/Makefile.in	Sun Sep 16 23:42:12 2001
++++ rpm-4.0.2/doc/fr/Makefile.in	Mon Sep 17 20:52:13 2001
 @@ -0,0 +1,324 @@
 +# Makefile.in generated automatically by automake 1.4 from Makefile.am
 +
@@ -340,7 +373,7 @@ diff -uNr rpm-4.0.2.orig/doc/fr/Makefile.in rpm-4.0.2/doc/fr/Makefile.in
 +.NOEXPORT:
 diff -uNr rpm-4.0.2.orig/doc/ko/Makefile.am rpm-4.0.2/doc/ko/Makefile.am
 --- rpm-4.0.2.orig/doc/ko/Makefile.am	Thu Jan  1 01:00:00 1970
-+++ rpm-4.0.2/doc/ko/Makefile.am	Sun Sep 16 23:38:37 2001
++++ rpm-4.0.2/doc/ko/Makefile.am	Mon Sep 17 20:52:13 2001
 @@ -0,0 +1,8 @@
 +## Process this file with automake to produce Makefile.in
 +
@@ -352,7 +385,7 @@ diff -uNr rpm-4.0.2.orig/doc/ko/Makefile.am rpm-4.0.2/doc/ko/Makefile.am
 +EXTRA_DIST	= $(man_MANS)
 diff -uNr rpm-4.0.2.orig/doc/ko/Makefile.in rpm-4.0.2/doc/ko/Makefile.in
 --- rpm-4.0.2.orig/doc/ko/Makefile.in	Thu Jan  1 01:00:00 1970
-+++ rpm-4.0.2/doc/ko/Makefile.in	Sun Sep 16 23:38:35 2001
++++ rpm-4.0.2/doc/ko/Makefile.in	Mon Sep 17 20:52:13 2001
 @@ -0,0 +1,324 @@
 +# Makefile.in generated automatically by automake 1.4 from Makefile.am
 +
@@ -678,3 +711,27 @@ diff -uNr rpm-4.0.2.orig/doc/ko/Makefile.in rpm-4.0.2/doc/ko/Makefile.in
 +# Tell versions [3.59,3.63) of GNU make to not export all variables.
 +# Otherwise a system limit (for SysV at least) may be exceeded.
 +.NOEXPORT:
+diff -uNr rpm-4.0.2.orig/doc/pl/Makefile.am rpm-4.0.2/doc/pl/Makefile.am
+--- rpm-4.0.2.orig/doc/pl/Makefile.am	Tue Jul 20 00:13:12 1999
++++ rpm-4.0.2/doc/pl/Makefile.am	Mon Sep 17 20:52:13 2001
+@@ -2,7 +2,7 @@
+ 
+ @SET_MAKE@
+ 
+-man_MANS	= rpm.8
++man_MANS	= rpm.8 rpm2cpio.8
+ mandir		= @mandir@/pl
+ 
+ EXTRA_DIST	= $(man_MANS)
+diff -uNr rpm-4.0.2.orig/doc/pl/Makefile.in rpm-4.0.2/doc/pl/Makefile.in
+--- rpm-4.0.2.orig/doc/pl/Makefile.in	Tue Mar 13 14:19:02 2001
++++ rpm-4.0.2/doc/pl/Makefile.in	Mon Sep 17 20:52:52 2001
+@@ -169,7 +169,7 @@
+ tmpdir = @tmpdir@
+ varprefix = @varprefix@
+ 
+-man_MANS = rpm.8
++man_MANS = rpm.8 rpm2cpio.8
+ mandir = @mandir@/pl
+ 
+ EXTRA_DIST = $(man_MANS)