- update to rpm-4.14.0
OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=420
This commit is contained in:
Git OBS Bridge
@@ -1,23 +1,7 @@
|
||||
--- ./macros.in.orig 2017-02-16 09:40:09.908649457 +0000
|
||||
+++ ./macros.in 2017-07-05 14:15:53.855734802 +0000
|
||||
@@ -185,22 +185,22 @@
|
||||
|
||||
# Template for debug information sub-package.
|
||||
%debug_package \
|
||||
-%ifnarch noarch\
|
||||
%global __debug_package 1\
|
||||
%package debuginfo\
|
||||
Summary: Debug information for package %{name}\
|
||||
Group: Development/Debug\
|
||||
AutoReqProv: 0\
|
||||
+#Requires: %{?!debug_package_requires:%{name} = %{version}-%{release}}%{?debug_package_requires}\
|
||||
%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 debuginfo -f debugfiles.list\
|
||||
%defattr(-,root,root)\
|
||||
-%endif\
|
||||
--- ./macros.in.orig 2017-12-01 15:20:22.361232667 +0000
|
||||
+++ ./macros.in 2017-12-01 15:20:45.769165491 +0000
|
||||
@@ -224,7 +224,8 @@ package or when debugging this package.\
|
||||
%endif\
|
||||
%{nil}
|
||||
|
||||
-%_defaultdocdir %{_datadir}/doc
|
||||
@@ -25,8 +9,8 @@
|
||||
+%_docdir_fmt %%{NAME}
|
||||
%_defaultlicensedir %{_datadir}/licenses
|
||||
|
||||
# The path to the gzip executable (legacy, use %{__gzip} instead).
|
||||
@@ -238,7 +238,8 @@ package or when debugging this package.\
|
||||
# Following macros for filtering auto deps must not be used in spec files.
|
||||
@@ -278,7 +279,8 @@ package or when debugging this package.\
|
||||
%_tmppath %{_var}/tmp
|
||||
|
||||
# Path to top of build area.
|
||||
@@ -36,8 +20,8 @@
|
||||
|
||||
# The path to the unzip executable (legacy, use %{__unzip} instead).
|
||||
%_unzipbin %{__unzip}
|
||||
@@ -341,7 +342,7 @@ package or when debugging this package.\
|
||||
# "w7.lzdio" lzma-alone level 7, lzma's default
|
||||
@@ -382,7 +384,7 @@ package or when debugging this package.\
|
||||
# "w6.lzdio" lzma-alone level 6, lzma's default
|
||||
#
|
||||
#%_source_payload w9.gzdio
|
||||
-#%_binary_payload w9.gzdio
|
||||
@@ -45,7 +29,7 @@
|
||||
|
||||
# Algorithm to use for generating file checksum digests on build.
|
||||
# If not specified or 0, MD5 is used.
|
||||
@@ -448,6 +449,19 @@ package or when debugging this package.\
|
||||
@@ -489,6 +491,19 @@ package or when debugging this package.\
|
||||
#
|
||||
#%_include_minidebuginfo 1
|
||||
|
||||
@@ -62,10 +46,23 @@
|
||||
+ --dwz-low-mem-die-limit %{_dwz_low_mem_die_limit}\\\
|
||||
+ --dwz-max-die-limit %{_dwz_max_die_limit}
|
||||
+
|
||||
#
|
||||
# Include a .gdb_index section in the .debug files.
|
||||
# Requires _enable_debug_packages and gdb-add-index installed.
|
||||
@@ -550,10 +565,10 @@ package or when debugging this package.\
|
||||
%_unique_debug_srcs 1
|
||||
|
||||
# Whether rpm should put debug source files into its own subpackage
|
||||
-#%_debugsource_packages 1
|
||||
+%_debugsource_packages 1
|
||||
|
||||
# Whether rpm should create extra debuginfo packages for each subpackage
|
||||
-#%_debuginfo_subpackages 1
|
||||
+%_debuginfo_subpackages 1
|
||||
|
||||
#
|
||||
# Use internal dependency generator rather than external helpers?
|
||||
%_use_internal_dependency_generator 1
|
||||
@@ -459,16 +473,22 @@ package or when debugging this package.\
|
||||
@@ -566,16 +581,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
|
||||
|
||||
@@ -90,7 +87,7 @@
|
||||
|
||||
#
|
||||
# Path to file attribute classifications for automatic dependency
|
||||
@@ -538,10 +558,10 @@ package or when debugging this package.\
|
||||
@@ -654,10 +675,10 @@ package or when debugging this package.\
|
||||
# Misc BDB tuning options
|
||||
%__dbi_other mp_mmapsize=128Mb mp_size=1Mb
|
||||
|
||||
@@ -103,7 +100,7 @@
|
||||
|
||||
#==============================================================================
|
||||
# ---- GPG/PGP/PGP5 signature macros.
|
||||
@@ -840,7 +860,7 @@ package or when debugging this package.\
|
||||
@@ -969,7 +990,7 @@ package or when debugging this package.\
|
||||
%_build_vendor %{_host_vendor}
|
||||
%_build_os %{_host_os}
|
||||
%_host @host@
|
||||
@@ -112,9 +109,20 @@
|
||||
%_host_cpu @host_cpu@
|
||||
%_host_vendor @host_vendor@
|
||||
%_host_os @host_os@
|
||||
@@ -1009,6 +1029,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])")
|
||||
@@ -1095,7 +1116,9 @@ package or when debugging this package.\
|
||||
|
||||
#------------------------------------------------------------------------------
|
||||
# arch macro for all supported ARM processors
|
||||
-%arm armv3l armv4b armv4l armv4tl armv5tl armv5tel armv5tejl armv6l armv6hl armv7l armv7hl armv7hnl
|
||||
+%arm armv3l armv4b armv4l armv4tl armv5b armv5l armv5teb armv5tel armv5tejl armv6l armv6hl armv7l armv7hl armv7hnl
|
||||
+%arml armv3l armv4l armv5l armv5tel armv6l armv6hl armv7l armv7hl armv7hnl
|
||||
+%armb armv4b armv5b armv5teb
|
||||
|
||||
#------------------------------------------------------------------------------
|
||||
# arch macro for 32-bit MIPS processors
|
||||
@@ -1125,6 +1148,183 @@ package or when debugging this package.\
|
||||
# arch macro for all supported Alpha processors
|
||||
%alpha alpha alphaev56 alphaev6 alphaev67
|
||||
|
||||
+# More useful perl macros (from Raul Dias <rsd@swi.com.br>)
|
||||
+#
|
||||
@@ -294,20 +302,9 @@
|
||||
+EOF
|
||||
+
|
||||
#------------------------------------------------------------------------------
|
||||
# arch macro for all Intel i?86 compatibile processors
|
||||
# (Note: This macro (and it's analogues) will probably be obsoleted when
|
||||
@@ -1019,7 +1216,9 @@ done \
|
||||
|
||||
#------------------------------------------------------------------------------
|
||||
# arch macro for all supported ARM processors
|
||||
-%arm armv3l armv4b armv4l armv4tl armv5tel armv5tejl armv6l armv6hl armv7l armv7hl armv7hnl
|
||||
+%arm armv3l armv4b armv4l armv4tl armv5b armv5l armv5teb armv5tel armv5tejl armv6l armv6hl armv7l armv7hl armv7hnl
|
||||
+%arml armv3l armv4l armv5l armv5tel armv6l armv6hl armv7l armv7hl armv7hnl
|
||||
+%armb armv4b armv5b armv5teb
|
||||
|
||||
#------------------------------------------------------------------------------
|
||||
# arch macro for 32-bit MIPS processors
|
||||
@@ -1174,3 +1373,24 @@ end}
|
||||
# arch macro for all supported PowerPC 64 processors
|
||||
%power64 ppc64 ppc64p7 ppc64le
|
||||
@@ -1257,3 +1457,24 @@ end}
|
||||
|
||||
# \endverbatim
|
||||
#*/
|
||||
|
||||
Reference in New Issue
Block a user