Blame macrosin.diff

Bernhard M. Wiedemann 1250f9
--- ./macros.in.orig	2018-07-02 14:46:14.912900534 +0000
Bernhard M. Wiedemann 1250f9
+++ ./macros.in	2018-07-02 14:50:35.356223235 +0000
Bernhard M. Wiedemann 1250f9
@@ -184,7 +184,7 @@
Bernhard M. Wiedemann 1250f9
     %{?_unique_build_ids:--build-id-seed "%{VERSION}-%{RELEASE}"} \\\
Bernhard M. Wiedemann 1250f9
     %{?_unique_debug_names:--unique-debug-suffix "-%{VERSION}-%{RELEASE}.%{_arch}"} \\\
Bernhard M. Wiedemann 1250f9
     %{?_unique_debug_srcs:--unique-debug-src-base "%{name}-%{VERSION}-%{RELEASE}.%{_arch}"} \\\
Bernhard M. Wiedemann 1250f9
-    %{?_find_debuginfo_dwz_opts} \\\
Bernhard M. Wiedemann 1250f9
+    %{lua:if not posix.access(rpm.expand("%_sourcedir/baselibs.conf"), "r") then print(rpm.expand("%{?_find_debuginfo_dwz_opts}")) end} \\\
Bernhard M. Wiedemann 1250f9
     %{?_find_debuginfo_opts} \\\
Bernhard M. Wiedemann 1250f9
     %{?_debugsource_packages:-S debugsourcefiles.list} \\\
Bernhard M. Wiedemann 1250f9
     "%{_builddir}/%{?buildsubdir}"\
Bernhard M. Wiedemann 1250f9
@@ -224,7 +224,8 @@ package or when debugging this package.\
Bernhard M. Wiedemann 1250f9
 %endif\
Bernhard M. Wiedemann 1250f9
 %{nil}
Bernhard M. Wiedemann 1250f9
 
Bernhard M. Wiedemann 1250f9
-%_defaultdocdir		%{_datadir}/doc
Bernhard M. Wiedemann 1250f9
+%_defaultdocdir		%{_datadir}/doc/packages
Bernhard M. Wiedemann 1250f9
+%_docdir_fmt		%%{NAME}
Bernhard M. Wiedemann 1250f9
 %_defaultlicensedir	%{_datadir}/licenses
Bernhard M. Wiedemann 1250f9
 
Bernhard M. Wiedemann 1250f9
 # Following macros for filtering auto deps must not be used in spec files.
Bernhard M. Wiedemann 1250f9
@@ -278,7 +279,8 @@ package or when debugging this package.\
Bernhard M. Wiedemann 1250f9
 %_tmppath		%{_var}/tmp
Bernhard M. Wiedemann 1250f9
 
Bernhard M. Wiedemann 1250f9
 #	Path to top of build area.
Bernhard M. Wiedemann 1250f9
-%_topdir		%{getenv:HOME}/rpmbuild
Bernhard M. Wiedemann 1250f9
+%_topdir		%{expand:%%global _topdir %{lua:if posix.access(rpm.expand("%{_usrsrc}/packages"), "w") then print "%{_usrsrc}/packages" else print "%{getenv:HOME}/rpmbuild" end} \
Bernhard M. Wiedemann 1250f9
+}%_topdir
Bernhard M. Wiedemann 1250f9
 
Bernhard M. Wiedemann 1250f9
 #	The path to the unzip executable (legacy, use %{__unzip} instead).
Bernhard M. Wiedemann 1250f9
 %_unzipbin		%{__unzip}
Bernhard M. Wiedemann 1250f9
@@ -382,7 +384,7 @@ package or when debugging this package.\
Bernhard M. Wiedemann 1250f9
 #		"w6.lzdio"	lzma-alone level 6, lzma's default
Bernhard M. Wiedemann 1250f9
 #
Bernhard M. Wiedemann 1250f9
 #%_source_payload	w9.gzdio
Bernhard M. Wiedemann 1250f9
-#%_binary_payload	w9.gzdio
Bernhard M. Wiedemann 1250f9
+%_binary_payload	w5.xzdio
Bernhard M. Wiedemann 1250f9
 
Bernhard M. Wiedemann 1250f9
 #	Algorithm to use for generating file checksum digests on build.
Bernhard M. Wiedemann 1250f9
 #	If not specified or 0, MD5 is used.
Bernhard M. Wiedemann 1250f9
@@ -489,6 +491,19 @@ package or when debugging this package.\
Bernhard M. Wiedemann 1250f9
 #
Bernhard M. Wiedemann 1250f9
 #%_include_minidebuginfo	1
Bernhard M. Wiedemann 1250f9
 
Bernhard M. Wiedemann 1250f9
+# Number of debugging information entries (DIEs) above which
Bernhard M. Wiedemann 1250f9
+# dwz will stop considering file for multifile optimizations
Bernhard M. Wiedemann 1250f9
+# and enter a low memory mode, in which it will optimize
Bernhard M. Wiedemann 1250f9
+# in about half the memory needed otherwise.
Bernhard M. Wiedemann 1250f9
+%_dwz_low_mem_die_limit          10000000
Bernhard M. Wiedemann 1250f9
+# Number of DIEs above which dwz will stop processing
Bernhard M. Wiedemann 1250f9
+# a file altogether.
Bernhard M. Wiedemann 1250f9
+%_dwz_max_die_limit              50000000
Bernhard M. Wiedemann 1250f9
+
Bernhard M. Wiedemann 1250f9
+%_find_debuginfo_dwz_opts --run-dwz\\\
Bernhard M. Wiedemann 1250f9
+   --dwz-low-mem-die-limit %{_dwz_low_mem_die_limit}\\\
Bernhard M. Wiedemann 1250f9
+   --dwz-max-die-limit %{_dwz_max_die_limit}
Bernhard M. Wiedemann 1250f9
+
Bernhard M. Wiedemann 1250f9
 #
Bernhard M. Wiedemann 1250f9
 # Include a .gdb_index section in the .debug files.
Bernhard M. Wiedemann 1250f9
 # Requires _enable_debug_packages and gdb-add-index installed.
Bernhard M. Wiedemann 1250f9
@@ -521,7 +536,7 @@ package or when debugging this package.\
Bernhard M. Wiedemann 1250f9
 #   Same as for "separate" but if the __debug_package global is set then
Bernhard M. Wiedemann 1250f9
 #   the -debuginfo package will have a compatibility link for the main
Bernhard M. Wiedemann 1250f9
 #   ELF /usr/lib/debug/.build-id/xx/yyy -> /usr/lib/.build-id/xx/yyy
Bernhard M. Wiedemann 1250f9
-%_build_id_links compat
Bernhard M. Wiedemann 1250f9
+%_build_id_links alldebug
Bernhard M. Wiedemann 1250f9
 
Bernhard M. Wiedemann 1250f9
 # Whether build-ids should be made unique between package version/releases
Bernhard M. Wiedemann 1250f9
 # when generating debuginfo packages. If set to 1 this will pass
Bernhard M. Wiedemann 1250f9
@@ -550,10 +565,10 @@ package or when debugging this package.\
Bernhard M. Wiedemann 1250f9
 %_unique_debug_srcs	1
Bernhard M. Wiedemann 1250f9
 
Bernhard M. Wiedemann 1250f9
 # Whether rpm should put debug source files into its own subpackage
Bernhard M. Wiedemann 1250f9
-#%_debugsource_packages	1
Bernhard M. Wiedemann 1250f9
+%_debugsource_packages	1
Bernhard M. Wiedemann 1250f9
 
Bernhard M. Wiedemann 1250f9
 # Whether rpm should create extra debuginfo packages for each subpackage
Bernhard M. Wiedemann 1250f9
-#%_debuginfo_subpackages 1
Bernhard M. Wiedemann 1250f9
+%_debuginfo_subpackages 1
Bernhard M. Wiedemann 1250f9
 
Bernhard M. Wiedemann 1250f9
 #
Bernhard M. Wiedemann 1250f9
 # Use internal dependency generator rather than external helpers?
Bernhard M. Wiedemann 1250f9
@@ -566,6 +581,10 @@ package or when debugging this package.\
Bernhard M. Wiedemann 1250f9
 # Directories whose contents should be considered as documentation.
Bernhard M. Wiedemann 1250f9
 %__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
Bernhard M. Wiedemann 1250f9
 
Bernhard M. Wiedemann 1250f9
+# maxnum,cuttime,minnum
Bernhard M. Wiedemann 1250f9
+# 2014/10/13 (SLES12 GA)
Bernhard M. Wiedemann 1250f9
+%_binarychangelogtrim 0,1413151200,10
Bernhard M. Wiedemann 1250f9
+
Bernhard M. Wiedemann 1250f9
 #
Bernhard M. Wiedemann 1250f9
 # Path to scripts to autogenerate package dependencies,
Bernhard M. Wiedemann 1250f9
 #
Bernhard M. Wiedemann 1250f9
@@ -576,6 +595,7 @@ package or when debugging this package.\
Bernhard M. Wiedemann 1250f9
 %__find_requires	%{_rpmconfigdir}/find-requires
Bernhard M. Wiedemann 1250f9
 #%__find_conflicts	???
Bernhard M. Wiedemann 1250f9
 #%__find_obsoletes	???
Bernhard M. Wiedemann 1250f9
+%__find_supplements	%{_rpmconfigdir}/find-supplements
Bernhard M. Wiedemann 1250f9
 
Bernhard M. Wiedemann 1250f9
 # 
Bernhard M. Wiedemann 1250f9
 # Path to file attribute classifications for automatic dependency 
Bernhard M. Wiedemann 1250f9
@@ -654,10 +674,10 @@ package or when debugging this package.\
Bernhard M. Wiedemann 1250f9
 # Misc BDB tuning options
Bernhard M. Wiedemann 1250f9
 %__dbi_other			mp_mmapsize=128Mb mp_size=1Mb
Bernhard M. Wiedemann 1250f9
 
Bernhard M. Wiedemann 1250f9
-%_dbi_config			%{?__dbi_other}
Bernhard M. Wiedemann 1250f9
+%_dbi_config			%{?__dbi_other} nofsync
Bernhard M. Wiedemann 1250f9
 
Bernhard M. Wiedemann 1250f9
 # "Packages" should have shared/exclusive fcntl(2) lock using "lockdbfd".
Bernhard M. Wiedemann 1250f9
-%_dbi_config_Packages		%{?_dbi_config} lockdbfd
Bernhard M. Wiedemann 1250f9
+%_dbi_config_Packages		%{?__dbi_other} lockdbfd
Bernhard M. Wiedemann 1250f9
 
Bernhard M. Wiedemann 1250f9
 #==============================================================================
Bernhard M. Wiedemann 1250f9
 # ---- GPG/PGP/PGP5 signature macros.
Bernhard M. Wiedemann 1250f9
@@ -969,7 +989,7 @@ package or when debugging this package.\
Bernhard M. Wiedemann 1250f9
 %_build_vendor		%{_host_vendor}
Bernhard M. Wiedemann 1250f9
 %_build_os		%{_host_os}
Bernhard M. Wiedemann 1250f9
 %_host			@host@
Bernhard M. Wiedemann 1250f9
-%_host_alias		@host_alias@%{nil}
Bernhard M. Wiedemann 1250f9
+%_host_alias		@host@%{nil}
Bernhard M. Wiedemann 1250f9
 %_host_cpu		@host_cpu@
Bernhard M. Wiedemann 1250f9
 %_host_vendor		@host_vendor@
Bernhard M. Wiedemann 1250f9
 %_host_os		@host_os@
Bernhard M. Wiedemann 1250f9
@@ -1095,7 +1115,9 @@ package or when debugging this package.\
Bernhard M. Wiedemann 1250f9
 
Bernhard M. Wiedemann 1250f9
 #------------------------------------------------------------------------------
Bernhard M. Wiedemann 1250f9
 # arch macro for all supported ARM processors
Bernhard M. Wiedemann 1250f9
-%arm	armv3l armv4b armv4l armv4tl armv5tl armv5tel armv5tejl armv6l armv6hl armv7l armv7hl armv7hnl
Bernhard M. Wiedemann 1250f9
+%arm    armv3l armv4b armv4l armv4tl armv5b armv5l armv5teb armv5tel armv5tejl armv6l armv6hl armv7l armv7hl armv7hnl
Bernhard M. Wiedemann 1250f9
+%arml   armv3l armv4l armv5l armv5tel armv6l armv6hl armv7l armv7hl armv7hnl
Bernhard M. Wiedemann 1250f9
+%armb   armv4b armv5b armv5teb
Bernhard M. Wiedemann 1250f9
 
Bernhard M. Wiedemann 1250f9
 #------------------------------------------------------------------------------
Bernhard M. Wiedemann 1250f9
 # arch macro for 32-bit MIPS processors