- update to rpm-4.11.1

OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=275

macrosin.diff

@@ -1,35 +1,32 @@
---- ./macros.in.orig	2012-05-22 10:53:51.000000000 +0000
-+++ ./macros.in	2012-06-01 12:39:35.000000000 +0000
-@@ -181,22 +181,22 @@
+--- ./macros.in.orig	2013-06-10 15:55:10.000000000 +0000
++++ ./macros.in	2013-07-12 11:53:07.000000000 +0000
+@@ -185,22 +185,22 @@
  
  #	Template for debug information sub-package.
  %debug_package \
 -%ifnarch noarch\
  %global __debug_package 1\
--%package debug\
-+%package debuginfo\
+ %package debuginfo\
  Summary: Debug information for package %{name}\
  Group: Development/Debug\
  AutoReqProv: 0\
--%description debug\
 +#Requires: %{?!debug_package_requires:%{name} = %{version}-%{release}}%{?debug_package_requires}\
-+%description debuginfo\
+ %description debuginfo\
  This package provides debug information for package %{name}.\
  Debug information is useful when developing applications that use this\
  package or when debugging this package.\
--%files debug -f debugfiles.list\
-+%files debuginfo -f debugfiles.list\
+ %files debuginfo -f debugfiles.list\
  %defattr(-,root,root)\
 -%endif\
  %{nil}
  
 -%_defaultdocdir		%{_datadir}/doc
 +%_defaultdocdir		%{_datadir}/doc/packages
-+%_docdir_fmt          %%{NAME}
++%_docdir_fmt		%%{NAME}
+ %_defaultlicensedir	%{_datadir}/licenses
  
  #	The path to the gzip executable (legacy, use %{__gzip} instead).
- %_gzipbin		%{__gzip}
-@@ -233,7 +233,8 @@ package or when debugging this package.\
+@@ -238,7 +238,8 @@ package or when debugging this package.\
  %_tmppath		%{_var}/tmp
  
  #	Path to top of build area.
@@ -39,7 +36,7 @@
  
  #	The path to the unzip executable (legacy, use %{__unzip} instead).
  %_unzipbin		%{__unzip}
-@@ -336,7 +337,7 @@ package or when debugging this package.\
+@@ -341,7 +342,7 @@ package or when debugging this package.\
  #		"w7.lzdio"	lzma-alone level 7, lzma's default
  #
  #%_source_payload	w9.gzdio
@@ -48,7 +45,7 @@
  
  #	Algorithm to use for generating file checksum digests on build.
  #	If not specified or 0, MD5 is used.
-@@ -435,16 +436,22 @@ package or when debugging this package.\
+@@ -440,16 +441,22 @@ package or when debugging this package.\
  # Directories whose contents should be considered as documentation.
  %__docdir_path %{_datadir}/doc:%{_datadir}/man:%{_datadir}/info:%{_datadir}/gtk-doc/html:%{?_docdir}:%{?_mandir}:%{?_infodir}:%{?_javadocdir}:/usr/doc:/usr/man:/usr/info:/usr/X11R6/man
  
@@ -73,7 +70,7 @@
  
  # 
  # Path to file attribute classifications for automatic dependency 
-@@ -507,10 +514,10 @@ package or when debugging this package.\
+@@ -512,10 +519,10 @@ package or when debugging this package.\
  # Misc BDB tuning options
  %__dbi_other			mp_mmapsize=128Mb mp_size=1Mb
  
@@ -86,7 +83,7 @@
  
  #==============================================================================
  # ---- GPG/PGP/PGP5 signature macros.
-@@ -809,7 +816,7 @@ package or when debugging this package.\
+@@ -816,7 +823,7 @@ package or when debugging this package.\
  %_build_vendor		%{_host_vendor}
  %_build_os		%{_host_os}
  %_host			@host@
@@ -95,7 +92,7 @@
  %_host_cpu		@host_cpu@
  %_host_vendor		@host_vendor@
  %_host_os		@host_os@
-@@ -973,6 +980,183 @@ done \
+@@ -980,6 +987,183 @@ done \
  %python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; import sys; sys.stdout.write(get_python_lib(1))")
  %python_version %(%{__python} -c "import sys; sys.stdout.write(sys.version[:3])")
  
@@ -279,7 +276,7 @@
  #------------------------------------------------------------------------------
  # arch macro for all Intel i?86 compatibile processors
  #  (Note: This macro (and it's analogues) will probably be obsoleted when
-@@ -983,7 +1167,9 @@ done \
+@@ -990,7 +1174,9 @@ done \
  
  #------------------------------------------------------------------------------
  # arch macro for all supported ARM processors
@@ -290,7 +287,7 @@
  
  #------------------------------------------------------------------------------
  # arch macro for all supported Sparc processors
-@@ -1023,3 +1209,26 @@ done \
+@@ -1110,3 +1296,26 @@ end}
  
  # \endverbatim
  #*/