Merge remote-tracking branch 'up/master' into master-riscv64

Signed-off-by: David Abdurachmanov <david.abdurachmanov@gmail.com>

buildflags.md

@@ -64,7 +64,7 @@ For building shared objects, you must compile with `-fPIC` in
 
 For other considerations involving shared objects, see:
 
-* [Fedora Packaging Guidelines: Shared Libraries](https://fedoraproject.org/wiki/Packaging:Guidelines#Shared_Libraries)
+* [Fedora Packaging Guidelines: Shared Libraries](https://docs.fedoraproject.org/en-US/packaging-guidelines/#_shared_libraries)
 
 # Customizing compiler flags
 

macros

@@ -117,19 +117,6 @@ print(result)
 	--mandir=%{_mandir} \\\
 	--infodir=%{_infodir}
 
-# Maximum number of CPU's to use when building, 0 for unlimited.
-#
-# This was for some time capped at 16.  Please see
-# https://bugzilla.redhat.com/show_bug.cgi?id=669638 and
-# https://bugzilla.redhat.com/show_bug.cgi?id=1384938 for the situation
-# surrounding this.
-#%_smp_ncpus_max 0
-%_smp_mflags %([ -z "$RPM_BUILD_NCPUS" ] \\\
-	&& RPM_BUILD_NCPUS="`/usr/bin/getconf _NPROCESSORS_ONLN`"; \\\
-        ncpus_max=%{?_smp_ncpus_max}; \\\
-        if [ -n "$ncpus_max" ] && [ "$ncpus_max" -gt 0 ] && [ "$RPM_BUILD_NCPUS" -gt "$ncpus_max" ]; then RPM_BUILD_NCPUS="$ncpus_max"; fi; \\\
-        if [ "$RPM_BUILD_NCPUS" -gt 1 ]; then echo "-j$RPM_BUILD_NCPUS"; fi)
-
 #==============================================================================
 # ---- Build policy macros.
 #

redhat-rpm-config.spec

@@ -6,7 +6,7 @@
 
 Summary: Red Hat specific rpm configuration files
 Name: redhat-rpm-config
-Version: 127
+Version: 128
 Release: 1.0.riscv64%{?dist}
 # No version specified.
 License: GPL+
@@ -199,12 +199,15 @@ install -p -m 644 -t %{buildroot}%{_rpmluadir}/fedora/srpm forge.lua
 %{_rpmconfigdir}/macros.d/macros.kmp
 
 %changelog
-* Mon Jan 14 2019 David Abdurachmanov <david.abdurachmanov@gmail.com> - 127-1.0.riscv64
+* Thu Mar 14 2019 David Abdurachmanov <david.abdurachmanov@gmail.com> - 128-1.0.riscv64
 - Disable perl_default_subpackage_tests (test suite subpackage for perl packages)
 - Disable %check for riscv64
 - Add -fasynchronous-unwind-tables -fstack-clash-protection to riscv64 (other
   arches seem to have them now)
 
+* Tue Jan 15 2019 Panu Matilainen <pmatilai@redhat.com> - 128-1
+- Drop redundant _smp_mflag re-definition, use the one from rpm instead
+
 * Thu Dec 20 2018 Florian Weimer <fweimer@redhat.com> - 127-1
 - Build flags: Add support for extension builders (#1543394)