diff --git a/build.bash b/build.bash index bed8e81..93364eb 100644 --- a/build.bash +++ b/build.bash @@ -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/^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 git archive -v --prefix=xmvn-${version}/ HEAD | xz > xmvn-${version}.tar.xz diff --git a/xmvn.spec b/xmvn.spec index 9143cd8..3338e58 100644 --- a/xmvn.spec +++ b/xmvn.spec @@ -135,12 +135,7 @@ This package provides %{summary}. %prep %setup -q - -# Skip patch application on Jenkins - it is supposed to always use the -# latest vanilla upstream snapshot. -%if !0%{?jenkins} %patch0001 -p1 -%endif %mvn_package :xmvn __noinstall