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

ci: Drop patches when building RPM

Browse Source 
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 authored and Atomic Bot committed 2018-04-03 14:28:13 +00:00
1 parent b190982ee6
commit 383e375099
1 file changed
+1 -1
Download Patch File Download Diff File Expand all files Collapse all files
ci/libpaprci/Makefile.dist-packaging
+1 -1
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