From 79cf324c750fa5ff7c0f15cd31711a15ba6597ac Mon Sep 17 00:00:00 2001
From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Wed, 28 Nov 2007 01:00:11 +0000
Subject: [PATCH] devel rpms are needed for srpm
---
Makefile | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index 5b8b343d..9937e603 100644
--- a/Makefile
+++ b/Makefile
@@ -391,6 +391,7 @@ ifeq "$(subst srpm,,$(1))" "$(1)"
$($(1)-SRPM): $($(1)_specpath) .rpmmacros $($(1)-TARBALLS)
mkdir -p BUILD SRPMS tmp
@(echo -n "XXXXXXXXXXXXXXX -- BEG SRPM $(1) " ; date)
+ -$(foreach devel,$($(1)-DEPENDDEVELS), $(if $($(devel)-DEVEL-RPMS),rpm -Uvh $($(devel)-DEVEL-RPMS);))
$(if $($(1)-RPMBUILD),\
$($(1)-RPMBUILD) $($(1)-RPMFLAGS) -bs $($(1)_specpath),
$(RPMBUILD) $($(1)-RPMFLAGS) -bs $($(1)_specpath))
@@ -399,6 +400,7 @@ else
$($(1)-SRPM): $($(1)_specpath) .rpmmacros $($(1)-CODEBASE)
mkdir -p BUILD SRPMS tmp
@(echo -n "XXXXXXXXXXXXXXX -- BEG SRPM $(1) (using make srpm) " ; date)
+ -$(foreach devel,$($(1)-DEPENDDEVELS), $(if $($(devel)-DEVEL-RPMS),rpm -Uvh $($(devel)-DEVEL-RPMS);))
make -C $($(1)-CODEBASE) srpm && \
rm -f SRPMS/$(notdir $($(1)-SRPM)) && \
ln $($(1)-CODEBASE)/$(notdir $($(1)-SRPM)) SRPMS/$(notdir $($(1)-SRPM))
@@ -422,7 +424,6 @@ $($(1)-RPMS): $($(1)-SRPM)
mkdir -p BUILD RPMS SPECS tmp
@(echo -n "XXXXXXXXXXXXXXX -- BEG RPM $(1) " ; date)
$(if $(findstring RPMS/yumgroups.xml,$($(1)-DEPENDFILES)), createrepo --quiet -g yumgroups.xml RPMS/ , )
- -$(foreach devel,$($(1)-DEPENDDEVELS), $(if $($(devel)-DEVEL-RPMS),rpm -Uvh $($(devel)-DEVEL-RPMS);))
$(if $($(1)-RPMBUILD),\
$($(1)-RPMBUILD) $($(1)-RPMFLAGS) --rebuild $($(1)-SRPM), \
$(RPMBUILD) $($(1)-RPMFLAGS) --rebuild $($(1)-SRPM))
--
2.47.0