- added some missing German translations

[packages/rpm.git] / rpm-macros.patch

diff --git a/rpm-macros.patch b/rpm-macros.patch
index 1325e074b55d3eb65d6f474bb4995c4148b1d320..f42801e49707e0a1cd756eb63f924e88a741686c 100644 (file)
--- a/rpm-macros.patch
+++ b/rpm-macros.patch
@@ -1,29 +1,28 @@
---- rpm-3.0.4/configure.in.wiget       Wed Mar 15 13:29:09 2000
-+++ rpm-3.0.4/configure.in     Wed Mar 22 17:30:33 2000
-@@ -932,7 +932,7 @@
+diff -urN rpm-4.0.2.org/configure.in rpm-4.0.2/configure.in
+--- rpm-4.0.2.org/configure.in Mon Apr  2 10:12:52 2001
++++ rpm-4.0.2/configure.in     Mon Apr  2 10:29:49 2001
+@@ -1085,7 +1085,7 @@
  dnl export LIBS INCPATH CONFIG_SITE
  
  AC_CONFIG_SUBDIRS(popt)
--AC_OUTPUT([Doxyfile Makefile rpmrc macros platform rpmpopt scripts/brp-redhat
-+AC_OUTPUT([Doxyfile Makefile rpmrc macros macros.pld platform rpmpopt scripts/brp-redhat
-       lib/Makefile build/Makefile tools/Makefile scripts/Makefile
+-AC_OUTPUT([Doxyfile Makefile rpmrc macros platform rpmpopt rpm.spec scripts/brp-redhat
++AC_OUTPUT([Doxyfile Makefile rpmrc macros macros.pld platform rpmpopt rpm.spec scripts/brp-redhat
+       rpmio/Makefile lib/Makefile build/Makefile tools/Makefile
+       scripts/Makefile
        tests/Makefile tests/rpmrc tests/macros tests/hello-test/Makefile
-       misc/Makefile po/Makefile.in intl/Makefile
---- rpm-3.0.4/macros.in.wiget  Thu Mar  9 19:13:03 2000
-+++ rpm-3.0.4/macros.in        Wed Mar 22 17:33:43 2000
-@@ -80,9 +80,9 @@
- %_builddir            %{_topdir}/BUILD
- %_buildshell          /bin/sh
+diff -urN rpm-4.0.2.org/macros.in rpm-4.0.2/macros.in
+--- rpm-4.0.2.org/macros.in    Mon Apr  2 10:12:52 2001
++++ rpm-4.0.2/macros.in        Mon Apr  2 11:43:51 2001
+@@ -90,7 +90,7 @@
  %_bzip2bin            @BZIP2BIN@
--%_dbpath              %{_var}/lib/rpm
-+%_dbpath              %{_var}/lib/rpm
- %_rebuilddbpath               %{_dbpath}
+ %_dbpath              %{_var}/lib/rpm
+ %_dbpath_rebuild      %{_dbpath}
 -%_defaultdocdir               %{_usr}/doc
 +%_defaultdocdir               %{_usr}/share/doc
  #
  %__find_provides      @FINDPROVIDES@
  %__find_requires      @FINDREQUIRES@
-@@ -94,8 +94,8 @@
+@@ -102,8 +102,8 @@
  %__id_u                       @__ID_U@
  %__chown_Rhf          @__CHOWN_RHF@
  %__chgrp_Rhf          @__CHGRP_RHF@
@@ -34,7 +33,7 @@
  %_fixperms            %{__chmod} -Rf @FIXPERMS@
  #
  %_gzipbin             @GZIPBIN@
-@@ -104,13 +104,13 @@
+@@ -112,13 +112,13 @@
  %_rpmdir              %{_topdir}/RPMS
  #
  # XXX Note escaped %% for use in headerSprintf
@@ -47,24 +46,36 @@
  %_tmppath             %{_var}/tmp
 -%_topdir              %{_usrsrc}/redhat
 +%_topdir              %(echo $HOME)/rpm
+ %_unzipbin            @UNZIPBIN@
  
  #==============================================================================
- # ---- Optional rpmrc macros.
-@@ -384,14 +384,14 @@
+@@ -461,15 +461,15 @@
  %_sbindir             %{_exec_prefix}/sbin
  %_libexecdir          %{_exec_prefix}/libexec
  %_datadir             %{_prefix}/share
 -%_sysconfdir          %{_prefix}/etc
 +%_sysconfdir          /etc
  %_sharedstatedir      %{_prefix}/com
- %_localstatedir               %{_prefix}/var
- %_libdir              %{_exec_prefix}/lib
+-%_localstatedir               %{_prefix}/var
++%_localstatedir               /var
+ %_lib                 lib
+ %_libdir              %{_exec_prefix}/%{_lib}
  %_includedir          %{_prefix}/include
  %_oldincludedir               /usr/include
 -%_infodir             %{_prefix}/info
 -%_mandir              %{_prefix}/man
-+%_infodir             %{_prefix}/share/info
++%_infodir             /usr/share/info
 +%_mandir              %{_prefix}/share/man
  
  #==============================================================================
  # ---- config.guess platform macros.
+@@ -518,7 +518,8 @@
+ CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ; \
+ FFLAGS="${FFLAGS:-%optflags}" ; export FFLAGS ; \
+ %{?__libtoolize:[ -f configure.in ] && %{__libtoolize} --copy --force} ; \
+-./configure %{_target_platform} \\\
++./configure \\\
++      --host=%{_target_platform} \\\
+       --prefix=%{_prefix} \\\
+       --exec-prefix=%{_exec_prefix} \\\
+       --bindir=%{_bindir} \\\