[packages/rpm] - make sure all macros are loaded - reenable parallel build - rel 55
baggins
baggins at pld-linux.org
Wed Jan 22 14:48:07 CET 2020
commit ad1682b36c70ff8e1dd6c76b62e2d01a28110bad
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Wed Jan 22 14:46:02 2020 +0100
- make sure all macros are loaded
- reenable parallel build
- rel 55
rpm-5.4.7-kmod-dependencies.patch | 13 ----
rpm-5.4.9-keep-loading-script-macros.patch | 107 +++++++++++++----------------
rpm.spec | 8 +--
3 files changed, 52 insertions(+), 76 deletions(-)
---
diff --git a/rpm.spec b/rpm.spec
index 79e088b..564f2ac 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -47,7 +47,7 @@ Summary(ru.UTF-8): Менеджер пакетов от RPM
Summary(uk.UTF-8): Менеджер пакетів від RPM
Name: rpm
Version: 5.4.15
-Release: 54
+Release: 55
License: LGPL v2.1
Group: Base
# http://rpm5.org/files/rpm/rpm-5.4/rpm-5.4.15-0.20140824.src.rpm
@@ -1027,7 +1027,7 @@ sed -i \
--with-xz=external \
--with-zlib=external
-%{__make} -j1
+%{__make}
%{?with_apidocs:%{__make} apidocs}
@@ -1052,7 +1052,7 @@ install -d $RPM_BUILD_ROOT{/bin,/%{_lib},/etc/sysconfig,%{_sysconfdir}/rpm} \
install %{SOURCE16} $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/PLD-3.0-Th-GPG-key.asc
-%{__make} -j1 install \
+%{__make} install \
pkgconfigdir=%{_pkgconfigdir} \
DESTDIR=$RPM_BUILD_ROOT
@@ -1231,7 +1231,7 @@ install %{SOURCE29} $RPM_BUILD_ROOT%{_rpmlibdir}/bin/dbupgrade.sh
# create macro loading wrappers for backward compatibility
for m in gstreamer libtool mono pkgconfig selinux; do
- %{__mv} RPM_BUILD_ROOT%{_rpmlibdir}/macros.d/{$m,macros.$m}
+ %{__mv} $RPM_BUILD_ROOT%{_rpmlibdir}/macros.d/{$m,macros.$m}
done
install %{SOURCE30} $RPM_BUILD_ROOT%{_rpmlibdir}/macros.d/macros.prov-req
diff --git a/rpm-5.4.7-kmod-dependencies.patch b/rpm-5.4.7-kmod-dependencies.patch
index df3d02c..daa0dc2 100644
--- a/rpm-5.4.7-kmod-dependencies.patch
+++ b/rpm-5.4.7-kmod-dependencies.patch
@@ -51,16 +51,3 @@
# helpers are also used by %{_rpmhome}/rpmdeps {--provides|--requires}.
%__kernel_provides %{_rpmhome}/kmod-deps.sh --provides --modinfo %__modinfo
#%__kernel_requires %{_rpmhome}/kmod-deps.sh --requires --modinfo %__modinfo
---- rpm-5.4.7/macros/macros.in.kmod~ 2012-03-16 16:34:04.614654786 +0100
-+++ rpm-5.4.7/macros/macros.in 2012-03-16 16:34:04.645654836 +0100
-@@ -981,6 +981,10 @@ $_arbitrary_tags_tests Foo:Bar
- %{load:%{_usrlibrpm}/macros.d/haskell}
-
- #------------------------------------------------------------------------
-+# kmod(...) configuration.
-+%{load:%{_usrlibrpm}/macros.d/kernel}
-+
-+#------------------------------------------------------------------------
- # perl(...) configuration
- %{load:%{_usrlibrpm}/macros.d/perl}
-
diff --git a/rpm-5.4.9-keep-loading-script-macros.patch b/rpm-5.4.9-keep-loading-script-macros.patch
index a9d23f9..8237f40 100644
--- a/rpm-5.4.9-keep-loading-script-macros.patch
+++ b/rpm-5.4.9-keep-loading-script-macros.patch
@@ -1,80 +1,69 @@
---- rpm-5.4.9/macros/macros.in.script_macros~ 2012-05-07 00:36:51.000000000 +0200
-+++ rpm-5.4.9/macros/macros.in 2012-05-15 01:39:37.382649841 +0200
-@@ -993,63 +993,63 @@ $_arbitrary_tags_tests Foo:Bar
- # XXX %{load:...}, then loading will CEASE at that point in the file.
+--- rpm-5.4.15/macros/macros.in~ 2020-01-22 14:38:03.000000000 +0100
++++ rpm-5.4.15/macros/macros.in 2020-01-22 14:39:17.309422644 +0100
+@@ -1024,64 +1024,11 @@
+ # XXX if the file %{_usrlibrpm}/macros.d/cmake attempts another
+ # XXX %{load:...}, then the statement will be IGNORED.
#==============================================================================
- # ---- SELinux configuration macros.
+-# ---- SELinux configuration macros.
-#%%{load:%{_usrlibrpm}/macros.d/selinux}
-+%{load:%{_usrlibrpm}/macros.d/selinux}
-
- #==============================================================================
+-
+-#==============================================================================
# ---- rpmbuild macros.
-#%%{load:%{_usrlibrpm}/macros.rpmbuild}
-+%{load:%{_usrlibrpm}/macros.rpmbuild}
-
- #------------------------------------------------------------------------
- # cmake(...) configuration
+-
+-#------------------------------------------------------------------------
+-# cmake(...) configuration
-#%%{load:%{_usrlibrpm}/macros.d/cmake}
-+%{load:%{_usrlibrpm}/macros.d/cmake}
-
- #------------------------------------------------------------------------
- # gstreamer(...) configuration.
+-
+-#------------------------------------------------------------------------
+-# gstreamer(...) configuration.
-#%%{load:%{_usrlibrpm}/macros.d/gstreamer}
-+%{load:%{_usrlibrpm}/macros.d/gstreamer}
-
- #------------------------------------------------------------------------
- # haskell(...) configuration.
- #%%{load:%{_usrlibrpm}/macros.d/haskell}
-
- #------------------------------------------------------------------------
- # perl(...) configuration
+-
+-#------------------------------------------------------------------------
+-# haskell(...) configuration.
+-#%%{load:%{_usrlibrpm}/macros.d/haskell}
+-
+-#------------------------------------------------------------------------
+-# perl(...) configuration
-#%%{load:%{_usrlibrpm}/macros.d/perl}
-+%{load:%{_usrlibrpm}/macros.d/perl}
-
- #------------------------------------------------------------------------
- # python(...) configuration.
+-
+-#------------------------------------------------------------------------
+-# python(...) configuration.
-#%%{load:%{_usrlibrpm}/macros.d/python}
-+%{load:%{_usrlibrpm}/macros.d/python}
-
- #------------------------------------------------------------------------
- # php(...) configuration.
+-
+-#------------------------------------------------------------------------
+-# php(...) configuration.
-#%%{load:%{_usrlibrpm}/macros.d/php}
-+%{load:%{_usrlibrpm}/macros.d/php}
-
- #------------------------------------------------------------------------
- # java(...) configuration.
+-
+-#------------------------------------------------------------------------
+-# java(...) configuration.
-#%%{load:%{_usrlibrpm}/macros.d/java}
-+%{load:%{_usrlibrpm}/macros.d/java}
-
- #------------------------------------------------------------------------
- # libtool(...) configuration.
+-
+-#------------------------------------------------------------------------
+-# libtool(...) configuration.
-#%%{load:%{_usrlibrpm}/macros.d/libtool}
-+%{load:%{_usrlibrpm}/macros.d/libtool}
-
- #------------------------------------------------------------------------
- # pkgconfig(...) configuration.
+-
+-#------------------------------------------------------------------------
+-# pkgconfig(...) configuration.
-#%%{load:%{_usrlibrpm}/macros.d/pkgconfig}
-+%{load:%{_usrlibrpm}/macros.d/pkgconfig}
-
- #------------------------------------------------------------------------
- # mono(...) configuration.
+-
+-#------------------------------------------------------------------------
+-# mono(...) configuration.
-#%%{load:%{_usrlibrpm}/macros.d/mono}
-+%{load:%{_usrlibrpm}/macros.d/mono}
-
- #------------------------------------------------------------------------
- # ruby(...) configuration.
+-
+-#------------------------------------------------------------------------
+-# ruby(...) configuration.
-#%%{load:%{_usrlibrpm}/macros.d/ruby}
-+%{load:%{_usrlibrpm}/macros.d/ruby}
-
- #------------------------------------------------------------------------
- # tcl(...) configuration.
+-
+-#------------------------------------------------------------------------
+-# tcl(...) configuration.
-#%%{load:%{_usrlibrpm}/macros.d/tcl}
-+%{load:%{_usrlibrpm}/macros.d/tcl}
++%{load:%{_usrlibrpm}/macros.rpmbuild}
#------------------------------------------------------------------------
- # typelib(...) configuration.
+-# typelib(...) configuration.
-#%%{load:%{_usrlibrpm}/macros.d/typelib}
-+#%%{load:%{_usrlibrpm}/macros.d/typelib}
++%{load:%{_usrlibrpm}/macros.d/macros.*}
# \endverbatim
#*/
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/rpm.git/commitdiff/ad1682b36c70ff8e1dd6c76b62e2d01a28110bad
More information about the pld-cvs-commit
mailing list