1 Context lines from the first chunk intentionally removed
2 to avoid conflicts with other patches.
3 ************************************************************
4 diff -uNr -C0 rpm-4.0.2.orig/configure.in rpm-4.0.2/configure.in
5 --- rpm-4.0.2.orig/configure.in Mon Sep 17 21:04:12 2001
6 +++ rpm-4.0.2/configure.in Mon Sep 17 21:05:36 2001
8 - doc/ja/Makefile doc/pl/Makefile doc/ru/Makefile doc/sk/Makefile
9 + doc/fr/Makefile doc/ja/Makefile doc/ko/Makefile
10 + doc/pl/Makefile doc/ru/Makefile doc/sk/Makefile
11 diff -uNr rpm-4.0.2.orig/doc/Makefile.am rpm-4.0.2/doc/Makefile.am
12 --- rpm-4.0.2.orig/doc/Makefile.am Mon Oct 16 19:37:46 2000
13 +++ rpm-4.0.2/doc/Makefile.am Mon Sep 17 20:52:13 2001
15 ## Process this file with automake to produce Makefile.in
17 -SUBDIRS = manual ja pl ru sk
18 +SUBDIRS = manual fr ja ko pl ru sk
20 man_MANS = gendiff.1 rpm.8 rpm2cpio.8
22 diff -uNr rpm-4.0.2.orig/doc/Makefile.in rpm-4.0.2/doc/Makefile.in
23 --- rpm-4.0.2.orig/doc/Makefile.in Tue Mar 13 14:19:01 2001
24 +++ rpm-4.0.2/doc/Makefile.in Mon Sep 17 20:52:13 2001
27 varprefix = @varprefix@
29 -SUBDIRS = manual ja pl ru sk
30 +SUBDIRS = manual fr ja ko pl ru sk
32 man_MANS = gendiff.1 rpm.8 rpm2cpio.8
34 diff -uNr rpm-4.0.2.orig/doc/fr/Makefile.am rpm-4.0.2/doc/fr/Makefile.am
35 --- rpm-4.0.2.orig/doc/fr/Makefile.am Thu Jan 1 01:00:00 1970
36 +++ rpm-4.0.2/doc/fr/Makefile.am Mon Sep 17 20:52:13 2001
38 +## Process this file with automake to produce Makefile.in
45 +EXTRA_DIST = $(man_MANS)
46 diff -uNr rpm-4.0.2.orig/doc/fr/Makefile.in rpm-4.0.2/doc/fr/Makefile.in
47 --- rpm-4.0.2.orig/doc/fr/Makefile.in Thu Jan 1 01:00:00 1970
48 +++ rpm-4.0.2/doc/fr/Makefile.in Mon Sep 17 20:52:13 2001
50 +# Makefile.in generated automatically by automake 1.4 from Makefile.am
52 +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
53 +# This Makefile.in is free software; the Free Software Foundation
54 +# gives unlimited permission to copy and/or distribute it,
55 +# with or without modifications, as long as this notice is preserved.
57 +# This program is distributed in the hope that it will be useful,
58 +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
59 +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
60 +# PARTICULAR PURPOSE.
66 +top_srcdir = @top_srcdir@
69 +exec_prefix = @exec_prefix@
73 +libexecdir = @libexecdir@
75 +sysconfdir = @sysconfdir@
76 +sharedstatedir = @sharedstatedir@
77 +localstatedir = @localstatedir@
80 +includedir = @includedir@
81 +oldincludedir = /usr/include
85 +pkgdatadir = $(datadir)/@PACKAGE@
86 +pkglibdir = $(libdir)/@PACKAGE@
87 +pkgincludedir = $(includedir)/@PACKAGE@
92 +AUTOCONF = @AUTOCONF@
93 +AUTOMAKE = @AUTOMAKE@
94 +AUTOHEADER = @AUTOHEADER@
97 +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
98 +INSTALL_DATA = @INSTALL_DATA@
99 +INSTALL_SCRIPT = @INSTALL_SCRIPT@
100 +transform = @program_transform_name@
105 +NORMAL_UNINSTALL = :
108 +build_alias = @build_alias@
109 +build_triplet = @build@
110 +host_alias = @host_alias@
111 +host_triplet = @host@
112 +target_alias = @target_alias@
113 +target_triplet = @target@
117 +BUILD_RPMNLSTOOLS = @BUILD_RPMNLSTOOLS@
118 +BZIP2BIN = @BZIP2BIN@
119 +CATALOGS = @CATALOGS@
120 +CATOBJEXT = @CATOBJEXT@
125 +DATADIRNAME = @DATADIRNAME@
126 +DBLIBOBJS = @DBLIBOBJS@
127 +DBLIBSRCS = @DBLIBSRCS@
129 +FINDPROVIDES = @FINDPROVIDES@
130 +FINDREQUIRES = @FINDREQUIRES@
131 +FIXPERMS = @FIXPERMS@
133 +GMOFILES = @GMOFILES@
138 +INCLUDE_LOCALE_H = @INCLUDE_LOCALE_H@
140 +INSTOBJEXT = @INSTOBJEXT@
141 +INTLDEPS = @INTLDEPS@
142 +INTLLIBS = @INTLLIBS@
143 +INTLOBJS = @INTLOBJS@
144 +LDFLAGS_STATIC = @LDFLAGS_STATIC@
148 +LIBRPMALIAS_FILENAME = @LIBRPMALIAS_FILENAME@
149 +LIBRPMRC_FILENAME = @LIBRPMRC_FILENAME@
153 +LOCALEDIR = @LOCALEDIR@
154 +MACROFILES = @MACROFILES@
155 +MAKEINFO = @MAKEINFO@
158 +MKINSTALLDIRS = @MKINSTALLDIRS@
166 +ROOT_GROUP = @ROOT_GROUP@
168 +RPMCANONARCH = @RPMCANONARCH@
169 +RPMCANONOS = @RPMCANONOS@
170 +RPMCANONVENDOR = @RPMCANONVENDOR@
171 +RPMCONFIGDIR = @RPMCONFIGDIR@
172 +SYSCONFIGDIR = @SYSCONFIGDIR@
173 +TOP_SOURCEDIR = @TOP_SOURCEDIR@
175 +UNZIPBIN = @UNZIPBIN@
176 +USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
179 +WITH_APIDOCS = @WITH_APIDOCS@
180 +WITH_APIDOCS_TARGET = @WITH_APIDOCS_TARGET@
181 +WITH_BZIP2 = @WITH_BZIP2@
182 +WITH_PYTHON_SUBDIR = @WITH_PYTHON_SUBDIR@
183 +WITH_PYTHON_SUBPACKAGE = @WITH_PYTHON_SUBPACKAGE@
186 +__CHGRP_RHF = @__CHGRP_RHF@
189 +__CHOWN_RHF = @__CHOWN_RHF@
192 +__DOXYGEN = @__DOXYGEN@
196 +__INSTALL = @__INSTALL@
202 +__OBJCOPY = @__OBJCOPY@
203 +__OBJDUMP = @__OBJDUMP@
206 +__PYTHON = @__PYTHON@
219 +varprefix = @varprefix@
222 +mandir = @mandir@/fr
224 +EXTRA_DIST = $(man_MANS)
225 +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
226 +CONFIG_HEADER = ../../config.h
227 +CONFIG_CLEAN_FILES =
228 +man8dir = $(mandir)/man8
232 +DIST_COMMON = Makefile.am Makefile.in
235 +DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
241 +$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
242 + cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps doc/fr/Makefile
244 +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
245 + cd $(top_builddir) \
246 + && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
250 + $(mkinstalldirs) $(DESTDIR)$(man8dir)
251 + @list='$(man8_MANS)'; \
252 + l2='$(man_MANS)'; for i in $$l2; do \
254 + *.8*) list="$$list $$i" ;; \
257 + for i in $$list; do \
258 + if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
259 + else file=$$i; fi; \
260 + ext=`echo $$i | sed -e 's/^.*\\.//'`; \
261 + inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
262 + inst=`echo $$inst | sed '$(transform)'`.$$ext; \
263 + echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man8dir)/$$inst"; \
264 + $(INSTALL_DATA) $$file $(DESTDIR)$(man8dir)/$$inst; \
268 + @list='$(man8_MANS)'; \
269 + l2='$(man_MANS)'; for i in $$l2; do \
271 + *.8*) list="$$list $$i" ;; \
274 + for i in $$list; do \
275 + ext=`echo $$i | sed -e 's/^.*\\.//'`; \
276 + inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
277 + inst=`echo $$inst | sed '$(transform)'`.$$ext; \
278 + echo " rm -f $(DESTDIR)$(man8dir)/$$inst"; \
279 + rm -f $(DESTDIR)$(man8dir)/$$inst; \
281 +install-man: $(MANS)
283 + $(MAKE) $(AM_MAKEFLAGS) install-man8
285 + @$(NORMAL_UNINSTALL)
286 + $(MAKE) $(AM_MAKEFLAGS) uninstall-man8
291 +distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
295 +distdir: $(DISTFILES)
296 + @for file in $(DISTFILES); do \
298 + if test -d $$d/$$file; then \
299 + cp -pr $$d/$$file $(distdir)/$$file; \
301 + test -f $(distdir)/$$file \
302 + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
303 + || cp -p $$d/$$file $(distdir)/$$file || :; \
313 +installcheck: installcheck-am
315 +install-exec: install-exec-am
317 +install-data-am: install-man
318 +install-data: install-data-am
321 + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
323 +uninstall-am: uninstall-man
324 +uninstall: uninstall-am
325 +all-am: Makefile $(MANS)
326 +all-redirect: all-am
328 + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
330 + $(mkinstalldirs) $(DESTDIR)$(mandir)/man8
333 +mostlyclean-generic:
338 + -rm -f Makefile $(CONFIG_CLEAN_FILES)
339 + -rm -f config.cache config.log stamp-h stamp-h[0-9]*
341 +maintainer-clean-generic:
342 +mostlyclean-am: mostlyclean-generic
344 +mostlyclean: mostlyclean-am
346 +clean-am: clean-generic mostlyclean-am
350 +distclean-am: distclean-generic clean-am
353 +distclean: distclean-am
355 +maintainer-clean-am: maintainer-clean-generic distclean-am
356 + @echo "This command is intended for maintainers to use;"
357 + @echo "it deletes files that may require special tools to rebuild."
359 +maintainer-clean: maintainer-clean-am
361 +.PHONY: install-man8 uninstall-man8 install-man uninstall-man tags \
362 +distdir info-am info dvi-am dvi check check-am installcheck-am \
363 +installcheck install-exec-am install-exec install-data-am install-data \
364 +install-am install uninstall-am uninstall all-redirect all-am all \
365 +installdirs mostlyclean-generic distclean-generic clean-generic \
366 +maintainer-clean-generic clean mostlyclean distclean maintainer-clean
371 +# Tell versions [3.59,3.63) of GNU make to not export all variables.
372 +# Otherwise a system limit (for SysV at least) may be exceeded.
374 diff -uNr rpm-4.0.2.orig/doc/ko/Makefile.am rpm-4.0.2/doc/ko/Makefile.am
375 --- rpm-4.0.2.orig/doc/ko/Makefile.am Thu Jan 1 01:00:00 1970
376 +++ rpm-4.0.2/doc/ko/Makefile.am Mon Sep 17 20:52:13 2001
378 +## Process this file with automake to produce Makefile.in
382 +man_MANS = rpm.8 rpm2cpio.8
383 +mandir = @mandir@/ko
385 +EXTRA_DIST = $(man_MANS)
386 diff -uNr rpm-4.0.2.orig/doc/ko/Makefile.in rpm-4.0.2/doc/ko/Makefile.in
387 --- rpm-4.0.2.orig/doc/ko/Makefile.in Thu Jan 1 01:00:00 1970
388 +++ rpm-4.0.2/doc/ko/Makefile.in Mon Sep 17 20:52:13 2001
390 +# Makefile.in generated automatically by automake 1.4 from Makefile.am
392 +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
393 +# This Makefile.in is free software; the Free Software Foundation
394 +# gives unlimited permission to copy and/or distribute it,
395 +# with or without modifications, as long as this notice is preserved.
397 +# This program is distributed in the hope that it will be useful,
398 +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
399 +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
400 +# PARTICULAR PURPOSE.
406 +top_srcdir = @top_srcdir@
409 +exec_prefix = @exec_prefix@
413 +libexecdir = @libexecdir@
415 +sysconfdir = @sysconfdir@
416 +sharedstatedir = @sharedstatedir@
417 +localstatedir = @localstatedir@
420 +includedir = @includedir@
421 +oldincludedir = /usr/include
425 +pkgdatadir = $(datadir)/@PACKAGE@
426 +pkglibdir = $(libdir)/@PACKAGE@
427 +pkgincludedir = $(includedir)/@PACKAGE@
429 +top_builddir = ../..
432 +AUTOCONF = @AUTOCONF@
433 +AUTOMAKE = @AUTOMAKE@
434 +AUTOHEADER = @AUTOHEADER@
437 +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
438 +INSTALL_DATA = @INSTALL_DATA@
439 +INSTALL_SCRIPT = @INSTALL_SCRIPT@
440 +transform = @program_transform_name@
445 +NORMAL_UNINSTALL = :
448 +build_alias = @build_alias@
449 +build_triplet = @build@
450 +host_alias = @host_alias@
451 +host_triplet = @host@
452 +target_alias = @target_alias@
453 +target_triplet = @target@
457 +BUILD_RPMNLSTOOLS = @BUILD_RPMNLSTOOLS@
458 +BZIP2BIN = @BZIP2BIN@
459 +CATALOGS = @CATALOGS@
460 +CATOBJEXT = @CATOBJEXT@
465 +DATADIRNAME = @DATADIRNAME@
466 +DBLIBOBJS = @DBLIBOBJS@
467 +DBLIBSRCS = @DBLIBSRCS@
469 +FINDPROVIDES = @FINDPROVIDES@
470 +FINDREQUIRES = @FINDREQUIRES@
471 +FIXPERMS = @FIXPERMS@
473 +GMOFILES = @GMOFILES@
478 +INCLUDE_LOCALE_H = @INCLUDE_LOCALE_H@
480 +INSTOBJEXT = @INSTOBJEXT@
481 +INTLDEPS = @INTLDEPS@
482 +INTLLIBS = @INTLLIBS@
483 +INTLOBJS = @INTLOBJS@
484 +LDFLAGS_STATIC = @LDFLAGS_STATIC@
488 +LIBRPMALIAS_FILENAME = @LIBRPMALIAS_FILENAME@
489 +LIBRPMRC_FILENAME = @LIBRPMRC_FILENAME@
493 +LOCALEDIR = @LOCALEDIR@
494 +MACROFILES = @MACROFILES@
495 +MAKEINFO = @MAKEINFO@
498 +MKINSTALLDIRS = @MKINSTALLDIRS@
506 +ROOT_GROUP = @ROOT_GROUP@
508 +RPMCANONARCH = @RPMCANONARCH@
509 +RPMCANONOS = @RPMCANONOS@
510 +RPMCANONVENDOR = @RPMCANONVENDOR@
511 +RPMCONFIGDIR = @RPMCONFIGDIR@
512 +SYSCONFIGDIR = @SYSCONFIGDIR@
513 +TOP_SOURCEDIR = @TOP_SOURCEDIR@
515 +UNZIPBIN = @UNZIPBIN@
516 +USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
519 +WITH_APIDOCS = @WITH_APIDOCS@
520 +WITH_APIDOCS_TARGET = @WITH_APIDOCS_TARGET@
521 +WITH_BZIP2 = @WITH_BZIP2@
522 +WITH_PYTHON_SUBDIR = @WITH_PYTHON_SUBDIR@
523 +WITH_PYTHON_SUBPACKAGE = @WITH_PYTHON_SUBPACKAGE@
526 +__CHGRP_RHF = @__CHGRP_RHF@
529 +__CHOWN_RHF = @__CHOWN_RHF@
532 +__DOXYGEN = @__DOXYGEN@
536 +__INSTALL = @__INSTALL@
542 +__OBJCOPY = @__OBJCOPY@
543 +__OBJDUMP = @__OBJDUMP@
546 +__PYTHON = @__PYTHON@
559 +varprefix = @varprefix@
561 +man_MANS = rpm.8 rpm2cpio.8
562 +mandir = @mandir@/ko
564 +EXTRA_DIST = $(man_MANS)
565 +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
566 +CONFIG_HEADER = ../../config.h
567 +CONFIG_CLEAN_FILES =
568 +man8dir = $(mandir)/man8
572 +DIST_COMMON = Makefile.am Makefile.in
575 +DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
581 +$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
582 + cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps doc/ko/Makefile
584 +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
585 + cd $(top_builddir) \
586 + && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
590 + $(mkinstalldirs) $(DESTDIR)$(man8dir)
591 + @list='$(man8_MANS)'; \
592 + l2='$(man_MANS)'; for i in $$l2; do \
594 + *.8*) list="$$list $$i" ;; \
597 + for i in $$list; do \
598 + if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
599 + else file=$$i; fi; \
600 + ext=`echo $$i | sed -e 's/^.*\\.//'`; \
601 + inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
602 + inst=`echo $$inst | sed '$(transform)'`.$$ext; \
603 + echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man8dir)/$$inst"; \
604 + $(INSTALL_DATA) $$file $(DESTDIR)$(man8dir)/$$inst; \
608 + @list='$(man8_MANS)'; \
609 + l2='$(man_MANS)'; for i in $$l2; do \
611 + *.8*) list="$$list $$i" ;; \
614 + for i in $$list; do \
615 + ext=`echo $$i | sed -e 's/^.*\\.//'`; \
616 + inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
617 + inst=`echo $$inst | sed '$(transform)'`.$$ext; \
618 + echo " rm -f $(DESTDIR)$(man8dir)/$$inst"; \
619 + rm -f $(DESTDIR)$(man8dir)/$$inst; \
621 +install-man: $(MANS)
623 + $(MAKE) $(AM_MAKEFLAGS) install-man8
625 + @$(NORMAL_UNINSTALL)
626 + $(MAKE) $(AM_MAKEFLAGS) uninstall-man8
631 +distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
635 +distdir: $(DISTFILES)
636 + @for file in $(DISTFILES); do \
638 + if test -d $$d/$$file; then \
639 + cp -pr $$d/$$file $(distdir)/$$file; \
641 + test -f $(distdir)/$$file \
642 + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
643 + || cp -p $$d/$$file $(distdir)/$$file || :; \
653 +installcheck: installcheck-am
655 +install-exec: install-exec-am
657 +install-data-am: install-man
658 +install-data: install-data-am
661 + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
663 +uninstall-am: uninstall-man
664 +uninstall: uninstall-am
665 +all-am: Makefile $(MANS)
666 +all-redirect: all-am
668 + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
670 + $(mkinstalldirs) $(DESTDIR)$(mandir)/man8
673 +mostlyclean-generic:
678 + -rm -f Makefile $(CONFIG_CLEAN_FILES)
679 + -rm -f config.cache config.log stamp-h stamp-h[0-9]*
681 +maintainer-clean-generic:
682 +mostlyclean-am: mostlyclean-generic
684 +mostlyclean: mostlyclean-am
686 +clean-am: clean-generic mostlyclean-am
690 +distclean-am: distclean-generic clean-am
693 +distclean: distclean-am
695 +maintainer-clean-am: maintainer-clean-generic distclean-am
696 + @echo "This command is intended for maintainers to use;"
697 + @echo "it deletes files that may require special tools to rebuild."
699 +maintainer-clean: maintainer-clean-am
701 +.PHONY: install-man8 uninstall-man8 install-man uninstall-man tags \
702 +distdir info-am info dvi-am dvi check check-am installcheck-am \
703 +installcheck install-exec-am install-exec install-data-am install-data \
704 +install-am install uninstall-am uninstall all-redirect all-am all \
705 +installdirs mostlyclean-generic distclean-generic clean-generic \
706 +maintainer-clean-generic clean mostlyclean distclean maintainer-clean
711 +# Tell versions [3.59,3.63) of GNU make to not export all variables.
712 +# Otherwise a system limit (for SysV at least) may be exceeded.
714 diff -uNr rpm-4.0.2.orig/doc/pl/Makefile.am rpm-4.0.2/doc/pl/Makefile.am
715 --- rpm-4.0.2.orig/doc/pl/Makefile.am Tue Jul 20 00:13:12 1999
716 +++ rpm-4.0.2/doc/pl/Makefile.am Mon Sep 17 20:52:13 2001
722 +man_MANS = rpm.8 rpm2cpio.8
725 EXTRA_DIST = $(man_MANS)
726 diff -uNr rpm-4.0.2.orig/doc/pl/Makefile.in rpm-4.0.2/doc/pl/Makefile.in
727 --- rpm-4.0.2.orig/doc/pl/Makefile.in Tue Mar 13 14:19:02 2001
728 +++ rpm-4.0.2/doc/pl/Makefile.in Mon Sep 17 20:52:52 2001
731 varprefix = @varprefix@
734 +man_MANS = rpm.8 rpm2cpio.8
737 EXTRA_DIST = $(man_MANS)