From 323d59b78652eb6100e954cacc4ab8e8b993dc45 Mon Sep 17 00:00:00 2001 From: Ken Dreyer Date: Tue, 12 Sep 2017 16:59:44 -0600 Subject: [PATCH] Makefile: remove fedpkg dependency for "srpm" It's not currently possible to install EPEL 7's fedpkg alongside the centos-packager package in CentOS 7 Extras (for /usr/bin/cbs), because they each depend on slightly different Koji package versions. This means that we cannot run "make srpm" on a system where centos-packager is installed, because that depends on fedpkg. Remove the dependency on fedpkg for the "srpm" target, and run rpmbuild -bs directly. The purpose of this change is to make it easier to automatically build ceph-ansible SRPMs in Jenkins/cbs.centos.org. --- Makefile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 659fccd5a..15befa123 100644 --- a/Makefile +++ b/Makefile @@ -57,7 +57,11 @@ spec: > ceph-ansible.spec srpm: dist spec - fedpkg --dist epel7 srpm + rpmbuild -bs ceph-ansible.spec \ + --define "_topdir ." \ + --define "_sourcedir ." \ + --define "_srcrpmdir ." \ + --define "dist .el7" rpm: dist srpm mock -r epel-7-x86_64 rebuild $(NVR).src.rpm \ -- 2.39.5