From 383e375099067d55cf49c864684c4c7dba2c5ac1 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Tue, 3 Apr 2018 09:59:20 -0400 Subject: [PATCH] ci: Drop patches when building RPM Things fell over when downstream added a patch we had already merged upstream. Closes: #1530 Approved by: jlebon --- ci/libpaprci/Makefile.dist-packaging | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/libpaprci/Makefile.dist-packaging b/ci/libpaprci/Makefile.dist-packaging index 8ecaeffb..de77be6c 100644 --- a/ci/libpaprci/Makefile.dist-packaging +++ b/ci/libpaprci/Makefile.dist-packaging @@ -30,7 +30,7 @@ srpm: dist-snapshot origdir=$$(pwd); \ cd $(DISTGIT_NAME) && \ git stash && git pull -r && \ - sed -i -e "s,^Version:.*,Version: $(GITREV_FOR_PKG)," $(DISTGIT_NAME).spec && \ + sed -i -e '/^Patch/d' -e "s,^Version:.*,Version: $(GITREV_FOR_PKG)," $(DISTGIT_NAME).spec && \ rm -f *.src.rpm && \ $(mypath)/rpmbuild-cwd -bs $(DISTGIT_NAME).spec && mv *.src.rpm $${origdir}; \ fi