- improved comments

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

diff --git a/rpm-macros.patch b/rpm-macros.patch
index 1f1048143d53ead06d0fb061ce986fe6a20c6312..02e40168c71394e1c79bba61a4f1944ec564829c 100644 (file)
--- a/rpm-macros.patch
+++ b/rpm-macros.patch
@@ -1,6 +1,19 @@
---- rpm-4.4.8/macros.in.orig   2007-04-08 20:24:47.206783474 +0200
-+++ rpm-4.4.8/macros.in        2007-04-08 20:36:08.925632417 +0200
-@@ -206,7 +206,7 @@
+--- rpm-5.3.1/macros/macros.rpmbuild.in.wiget  2010-05-30 17:03:38.009271449 +0200
++++ rpm-5.3.1/macros/macros.rpmbuild.in        2010-05-30 17:08:25.676741951 +0200
+@@ -123,8 +123,8 @@
+ #             "w6.lzdio"      lzma level 6 (legacy, stable).
+ #             "w6.xzdio"      xz level 6 (obsoletes lzma, unstable).
+ #
+-#%_source_payload     w9.gzdio
+-#%_binary_payload     w9.gzdio
++%_source_payload      w9.gzdio
++%_binary_payload      w9.lzdio
+ 
+ #     Archive formats to use for source/binary package payloads.
+ #             "cpio"          cpio archive (default)
+--- rpm-5.3.1/macros/macros.in.wiget   2010-05-30 17:03:38.009271449 +0200
++++ rpm-5.3.1/macros/macros.in 2010-05-30 17:06:26.886075137 +0200
+@@ -150,7 +150,7 @@ pakietu oraz przy odpluskwianiu samego p
  %endif\
  %{nil}
  
@@ -9,9 +22,12 @@
  
  #     The path to the pgp executable (legacy, use %{__pgp} instead).
  %_pgpbin              %{__pgp}
-@@ -233,12 +233,12 @@
- #     The directory where newly built source packages will be written.
- %_srcrpmdir           %{_topdir}/SRPMS
+@@ -183,14 +183,14 @@ pakietu oraz przy odpluskwianiu samego p
+ %_buildrootdir                @BUILDROOTDIR_MACRO@
+ 
+ #       Build root path, where %install installs the package during build.
+-%buildroot              %{_buildrootdir}/%{name}-root
++%buildroot            %{_tmppath}/%{name}-%{version}-root-%(id -u -n)
  
 -#     Directory where temporaray files can be created.
 -%_tmppath             %{_var}/tmp
@@ -24,43 +40,14 @@
 +%_topdir              %(echo $HOME)/rpm
  
  #==============================================================================
- # ---- Optional rpmrc macros.
-@@ -248,7 +248,7 @@
- #     Configurable build root path, same as BuildRoot: in a specfile.
- #     (Note: the configured macro value will override the spec file value).
- #
--%buildroot            %{_tmppath}/%{name}-root
-+%buildroot            %{_tmppath}/%{name}-%{version}-root-%(id -u -n)
- 
- #     The sub-directory (relative to %{_builddir}) where sources are compiled.
- #     This macro is set after processing %setup, either explicitly from the
-@@ -347,8 +347,8 @@
- #             "w9.bzdio"      bzip2 level 9.
- #             "w9.lzdio"      lzma level 9.
- #
--#%_source_payload     w9.gzdio
--#%_binary_payload     w9.gzdio
-+%_source_payload      w9.gzdio
-+%_binary_payload      w9.lzdio
- 
- #     Archive formats to use for source/binary package payloads.
- #             "cpio"          cpio archive (default)
-@@ -498,7 +498,7 @@
- 
- #
- # Path to magic file used for file classification.
--%_rpmfc_magic_path    %{_rpmhome}/magic
-+%_rpmfc_magic_path    /usr/share/file/magic
- 
- #==============================================================================
- # ---- Database configuration macros.
-@@ -1127,17 +1127,17 @@
- %_exec_prefix         %{_prefix}
+ # ---- Optional macros.
+@@ -846,11 +846,11 @@ pakietu oraz przy odpluskwianiu samego p
+ %_datarootdir         %{_prefix}/share
  %_bindir              %{_exec_prefix}/bin
  %_sbindir             %{_exec_prefix}/sbin
 -%_libexecdir          %{_exec_prefix}/libexec
 +%_libexecdir          %{_exec_prefix}/lib
- %_datadir             %{_prefix}/share
+ %_datadir             %{_datarootdir}
 -%_sysconfdir          %{_prefix}/etc
 -%_sharedstatedir      %{_prefix}/com
 -%_localstatedir               %{_prefix}/var
@@ -70,24 +57,19 @@
  %_lib                 lib
  %_libdir              %{_exec_prefix}/%{_lib}
  %_includedir          %{_prefix}/include
- %_oldincludedir               /usr/include
--%_infodir             %{_prefix}/info
--%_mandir              %{_prefix}/man
-+%_infodir             %{_prefix}/share/info
-+%_mandir              %{_prefix}/share/man
- %_localedir           %{_datadir}/locale
- 
- #==============================================================================
-@@ -1428,7 +1428,25 @@
+@@ -941,7 +941,33 @@ pakietu oraz przy odpluskwianiu samego p
  # helpers are also used by %{_rpmhome}/rpmdeps {--provides|--requires}.
  #%__executable_provides       %{_rpmhome}/executabledeps.sh --provides
  #%__executable_requires       %{_rpmhome}/executabledeps.sh --requires
--%__scriptlet_requires /bin/bash --rpm-requires
-+#%__scriptlet_requires        /bin/bash --rpm-requires
+-%__scriptlet_requires %{__bash} --rpm-requires
++#%__scriptlet_requires        %{__bash} --rpm-requires
  
 +# PLD rpm macros
 +%_enable_debug_packages 1
 +
++# provides don't obsolete
++%_upgrade_tag name
++
 +#-----------------------------------------------------------------
 +# CFLAGS and LDFLAGS used to build
 +
@@ -102,7 +84,12 @@
 +%rpmcflags    %{?debug:%debugcflags}%{!?debug:%optflags}%{?debuginfocflags}
 +%rpmcxxflags  %{rpmcflags}
 +%rpmldflags   %{!?no_build_with_as_needed:-Wl,--as-needed}
++
++# arch macros
++%ix86 i386 i486 i586 i686 pentium3 pentium4 athlon
++%x8664        x86_64 amd64 ia32e
++%ppc  ppc ppc7400 ppc7450
 +  
- # \endverbatim
- #*/
-
+ #==============================================================================
+ # XXX Caveat:
+ # XXX With %{load:...} being interpreted immediately -- not lazily --