packaging
/
ostree
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ci: Drop patches when building RPM 

Things fell over when downstream added a patch we had already merged
upstream.

Closes: #1530
Approved by: jlebon
This commit is contained in:
Colin Walters 2018-04-03 09:59:20 -04:00 committed by Atomic Bot
parent b190982ee6
commit 383e375099
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ci/libpaprci/Makefile.dist-packaging
View File

@ -30,7 +30,7 @@ srpm: dist-snapshot
origdir=$$(pwd); \ origdir=$$(pwd); \
cd $(DISTGIT_NAME) && \ cd $(DISTGIT_NAME) && \
git stash && git pull -r && \ 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 && \ rm -f *.src.rpm && \
$(mypath)/rpmbuild-cwd -bs $(DISTGIT_NAME).spec && mv *.src.rpm $${origdir}; \ $(mypath)/rpmbuild-cwd -bs $(DISTGIT_NAME).spec && mv *.src.rpm $${origdir}; \
fi fi