Disable animal-sniffer on RHEL
This commit is contained in:
parent
6456c72388
commit
4e46797c53
18
maven.spec
18
maven.spec
@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
Name: maven
|
Name: maven
|
||||||
Version: 3.0.4
|
Version: 3.0.4
|
||||||
Release: 10%{?dist}
|
Release: 11%{?dist}
|
||||||
Summary: Java project management and project comprehension tool
|
Summary: Java project management and project comprehension tool
|
||||||
|
|
||||||
Group: Development/Tools
|
Group: Development/Tools
|
||||||
@ -45,7 +45,6 @@ Patch201: 0004-Fix-text-scope-skipping-with-maven.test.skip.patch
|
|||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
|
|
||||||
BuildRequires: aether >= 1.13.1
|
BuildRequires: aether >= 1.13.1
|
||||||
BuildRequires: animal-sniffer >= 1.6-5
|
|
||||||
BuildRequires: apache-commons-parent
|
BuildRequires: apache-commons-parent
|
||||||
BuildRequires: async-http-client
|
BuildRequires: async-http-client
|
||||||
BuildRequires: atinject
|
BuildRequires: atinject
|
||||||
@ -70,9 +69,11 @@ BuildRequires: plexus-containers-container-default
|
|||||||
BuildRequires: sisu >= 2.1.1-2
|
BuildRequires: sisu >= 2.1.1-2
|
||||||
BuildRequires: sonatype-oss-parent
|
BuildRequires: sonatype-oss-parent
|
||||||
BuildRequires: xmlunit
|
BuildRequires: xmlunit
|
||||||
|
%if 0%{?fedora}
|
||||||
|
BuildRequires: animal-sniffer >= 1.6-5
|
||||||
|
%endif
|
||||||
|
|
||||||
Requires: aether >= 1.13.1
|
Requires: aether >= 1.13.1
|
||||||
Requires: animal-sniffer >= 1.6-5
|
|
||||||
Requires: apache-commons-cli
|
Requires: apache-commons-cli
|
||||||
Requires: apache-commons-parent
|
Requires: apache-commons-parent
|
||||||
Requires: async-http-client
|
Requires: async-http-client
|
||||||
@ -99,6 +100,9 @@ Requires: sonatype-oss-parent
|
|||||||
Requires: xbean
|
Requires: xbean
|
||||||
Requires: xerces-j2
|
Requires: xerces-j2
|
||||||
Requires: yum-utils
|
Requires: yum-utils
|
||||||
|
%if 0%{?fedora}
|
||||||
|
Requires: animal-sniffer >= 1.6-5
|
||||||
|
%endif
|
||||||
|
|
||||||
|
|
||||||
# for noarch->arch change
|
# for noarch->arch change
|
||||||
@ -160,6 +164,11 @@ sed -i -e s:'-classpath "${M2_HOME}"/boot/plexus-classworlds-\*.jar':'-classpath
|
|||||||
src/bin/mvn*
|
src/bin/mvn*
|
||||||
popd
|
popd
|
||||||
|
|
||||||
|
# Disable animal-sniffer on RHEL
|
||||||
|
if [ %{?rhel} ]; then
|
||||||
|
%pom_remove_plugin :animal-sniffer-maven-plugin
|
||||||
|
fi
|
||||||
|
|
||||||
%build
|
%build
|
||||||
mvn-rpmbuild -e install javadoc:aggregate
|
mvn-rpmbuild -e install javadoc:aggregate
|
||||||
|
|
||||||
@ -367,6 +376,9 @@ ln -sf `rpm --eval '%%{_jnidir}'` %{_datadir}/%{name}/repository-jni/JPP
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Aug 27 2012 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.0.4-11
|
||||||
|
- Disable animal-sniffer on RHEL
|
||||||
|
|
||||||
* Wed Jul 25 2012 Stanislav Ochotnicky <sochotnicky@redhat.com> - 3.0.4-10
|
* Wed Jul 25 2012 Stanislav Ochotnicky <sochotnicky@redhat.com> - 3.0.4-10
|
||||||
- Fix exit code of mvn-rpmbuild outside of mock
|
- Fix exit code of mvn-rpmbuild outside of mock
|
||||||
- Fix bug in compatibility jar handling
|
- Fix bug in compatibility jar handling
|
||||||
|
Loading…
Reference in New Issue
Block a user