diff --git a/rpmdevtools-9.3-no_qa_robot.patch b/rpmdevtools-9.3-no_qa_robot.patch new file mode 100644 index 0000000..96b557a --- /dev/null +++ b/rpmdevtools-9.3-no_qa_robot.patch @@ -0,0 +1,21 @@ +diff -up rpmdevtools-9.3/Makefile.am.orig rpmdevtools-9.3/Makefile.am +--- rpmdevtools-9.3/Makefile.am.orig 2021-01-22 17:16:13.001772708 +0100 ++++ rpmdevtools-9.3/Makefile.am 2021-01-22 17:16:29.477084436 +0100 +@@ -1,4 +1,4 @@ +-SUBDIRS = emacs qa-robot ++SUBDIRS = emacs + + pkgsysconfdir = $(sysconfdir)/rpmdevtools + bashcompdir = @bashcompdir@ +diff -up rpmdevtools-9.3/Makefile.in.orig rpmdevtools-9.3/Makefile.in +--- rpmdevtools-9.3/Makefile.in.orig 2021-01-22 17:16:05.401628907 +0100 ++++ rpmdevtools-9.3/Makefile.in 2021-01-22 17:16:23.122964213 +0100 +@@ -316,7 +316,7 @@ target_alias = @target_alias@ + top_build_prefix = @top_build_prefix@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ +-SUBDIRS = emacs qa-robot ++SUBDIRS = emacs + pkgsysconfdir = $(sysconfdir)/rpmdevtools + bin_SCRIPTS = rpmdev-newinit rpmdev-newspec rpmdev-rmdevelrpms + dist_bin_SCRIPTS = rpmdev-checksig rpmdev-diff rpmdev-extract rpmdev-md5 \ diff --git a/rpmdevtools.spec b/rpmdevtools.spec index b11248d..4994659 100644 --- a/rpmdevtools.spec +++ b/rpmdevtools.spec @@ -17,6 +17,10 @@ Patch1: https://pagure.io/rpmdevtools/pull-request/77.patch ## Force legacy datestamp by default until rhbz#1715412 is resolved Patch1001: 0001-Force-legacy-datestamp-while-RHBZ-1715412-is-still-a.patch +# RHEL-specific downstream patches +## Remove fakeroot dependency (rhbz#1905465) +Patch2001: rpmdevtools-9.3-no_qa_robot.patch + BuildArch: noarch # help2man, pod2man, *python for creating man pages BuildRequires: make @@ -37,7 +41,6 @@ BuildRequires: xemacs-common >= 21.5.29-8 %endif Requires: curl Requires: diffutils -Requires: fakeroot Requires: file Requires: findutils Requires: gawk @@ -133,6 +136,7 @@ cp %{SOURCE1} %{buildroot}%{_datadir}/rpmdevtools/ %changelog * Thu Feb 11 2021 Michal Domonkos - 9.3-5 - Drop progressbar2 dependency and bundle a tiny replacement (#1927784) +- Drop fakeroot dependency and qa-robot scripts (#1905465) * Wed Jan 27 2021 Fedora Release Engineering - 9.3-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild