From 6b41b96834b7e76c5ab66e9b66e818e62b773b93 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Apr 28 2020 08:55:53 +0000 Subject: import redhat-rpm-config-122-1.el8 --- diff --git a/README.debrand b/README.debrand deleted file mode 100644 index 01c46d2..0000000 --- a/README.debrand +++ /dev/null @@ -1,2 +0,0 @@ -Warning: This package was configured for automatic debranding, but the changes -failed to apply. diff --git a/SOURCES/macros b/SOURCES/macros index 73dc5a2..2cbb14e 100644 --- a/SOURCES/macros +++ b/SOURCES/macros @@ -157,7 +157,7 @@ print(result) %__brp_strip /usr/lib/rpm/brp-strip %{__strip} %__brp_strip_comment_note /usr/lib/rpm/brp-strip-comment-note %{__strip} %{__objdump} %__brp_strip_static_archive /usr/lib/rpm/brp-strip-static-archive %{__strip} -%__brp_python_bytecompile /usr/lib/rpm/brp-python-bytecompile %{?_python_bytecompile_errors_terminate_build} +%__brp_python_bytecompile /usr/lib/rpm/brp-python-bytecompile "" %{?_python_bytecompile_errors_terminate_build} %__brp_python_hardlink /usr/lib/rpm/brp-python-hardlink # __brp_mangle_shebangs_exclude - shebangs to exclude # __brp_mangle_shebangs_exclude_file - file from which to get shebangs to exclude diff --git a/SOURCES/macros.kmp b/SOURCES/macros.kmp index eae0bda..a765547 100644 --- a/SOURCES/macros.kmp +++ b/SOURCES/macros.kmp @@ -2,6 +2,8 @@ %global redhat_kernel_module_package 1 %global kernel_module_package_release 1 +%global redhat_kmp_has_post_hooks 1 + %__brp_kmod_set_exec_bit /usr/lib/rpm/redhat/brp-kmod-set-exec-bit %__brp_kmod_restore_perms /usr/lib/rpm/redhat/brp-kmod-restore-perms @@ -48,6 +50,11 @@ echo " %%%%{?__debug_package:%%%%{__debug_install_post}} \\\\" \ echo " %%{__arch_install_post} \\\\" \ echo " %%{__os_install_post} \\\\" \ + echo " %%{?__brp_kmod_pre_sign_process} \\\\" \ + echo " %%{?__brp_kmod_sign} \\\\" \ + echo " %%{?__brp_kmod_post_sign_process} \\\\" \ + echo " %%{?__brp_kmod_compress} \\\\" \ + echo " %%{?__brp_kmod_post_compress_process} \\\\" \ echo " %%{?__brp_kmod_restore_perms} \\\\" \ echo "%%{nil}" \ fi \ diff --git a/SOURCES/redhat-rpm-config-116-centos.dist.patch b/SOURCES/redhat-rpm-config-116-centos.dist.patch deleted file mode 100644 index 371e95f..0000000 --- a/SOURCES/redhat-rpm-config-116-centos.dist.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -uNrp redhat-rpm-config-116.orig/dist.sh redhat-rpm-config-116/dist.sh ---- redhat-rpm-config-116.orig/dist.sh 2019-05-09 21:50:36.521460585 +0000 -+++ redhat-rpm-config-116/dist.sh 2019-05-09 21:53:19.328349008 +0000 -@@ -25,7 +25,7 @@ function check_rhl { - } - - function check_rhel { -- egrep -q "(Enterprise|Advanced)" $RELEASEFILE && echo $DISTNUM -+ egrep -q "(Enterprise|Advanced|CentOS)" $RELEASEFILE && echo $DISTNUM - } - - function check_fedora { diff --git a/SPECS/redhat-rpm-config.spec b/SPECS/redhat-rpm-config.spec index 2687833..4bec78e 100644 --- a/SPECS/redhat-rpm-config.spec +++ b/SPECS/redhat-rpm-config.spec @@ -4,9 +4,9 @@ # 2) When making changes, update version by +1, leave release alone. # -Summary: CentOS specific rpm configuration files +Summary: Red Hat specific rpm configuration files Name: redhat-rpm-config -Version: 120 +Version: 122 Release: 1%{?dist} # No version specified. License: GPL+ @@ -83,8 +83,6 @@ Source702: brp-kmod-restore-perms # Documentation Source900: buildflags.md -Patch9999: redhat-rpm-config-116-centos.dist.patch - BuildArch: noarch BuildRequires: perl-generators Requires: coreutils @@ -120,7 +118,7 @@ Provides: system-rpm-config = %{version}-%{release} %global rrcdir /usr/lib/rpm/redhat %description -CentOS specific rpm configuration files. +Red Hat specific rpm configuration files. %package -n kernel-rpm-macros Summary: Macros and scripts for building kernel module packages. @@ -137,7 +135,6 @@ Macros and scripts for building kernel module packages. # of source numbers in install section %setup -c -T cp -p %{sources} . -%patch9999 -p1 %install mkdir -p %{buildroot}%{rrcdir} @@ -201,6 +198,11 @@ install -p -m 755 %{SOURCE21} %{buildroot}%{_rpmconfigdir}/kabi.sh %{_rpmconfigdir}/macros.d/macros.kmp %changelog +* Mon Feb 24 2020 Michal Domonkos - 122-1 +- Fix argument shift in %%__brp_python_bytecompile (#1724567) + +* Tue Nov 26 2019 Eugene Syromiatnikov - 121-1 +- macros.kmp: add post-install hooks for kmod processing (#1664478, #1673200) * Thu Jul 04 2019 Florian Festi - 120-1 - Fix permission for various build scripts (#1719363)