rpms/xmvn
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Change the way of skipping patches on Jenkins

Browse Source
This commit is contained in:
Mikolaj Izdebski 2014-05-29 20:25:37 +02:00
parent 72f8dc2649
commit 46427f7a85
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
build.bash
View File

@ -12,6 +12,11 @@ release=$(git describe --match="[^(jenkins)].*" --tags | sed 's/[^-]*-/0./;s/-/.
sed -i "s/^Version:\s\+[0-9.]*$/Version: ${version}/" xmvn.spec sed -i "s/^Version:\s\+[0-9.]*$/Version: ${version}/" xmvn.spec
sed -i "s/^Release:\s\+[0-9.]*%{?dist}$/Release: ${release}/" xmvn.spec sed -i "s/^Release:\s\+[0-9.]*%{?dist}$/Release: ${release}/" xmvn.spec
# Skip patch application on Jenkins - it is supposed to always use the
# latest vanilla upstream snapshot.
sed -i "/^Patch[0-9]*:/d" xmvn.spec
sed -i "/^%patch[0-9]* -p/d" xmvn.spec
# make tarball # make tarball
git archive -v --prefix=xmvn-${version}/ HEAD | xz > xmvn-${version}.tar.xz git archive -v --prefix=xmvn-${version}/ HEAD | xz > xmvn-${version}.tar.xz

5
xmvn.spec
View File

@ -135,12 +135,7 @@ This package provides %{summary}.
%prep %prep
%setup -q %setup -q
# Skip patch application on Jenkins - it is supposed to always use the
# latest vanilla upstream snapshot.
%if !0%{?jenkins}
%patch0001 -p1 %patch0001 -p1
%endif
%mvn_package :xmvn __noinstall %mvn_package :xmvn __noinstall