Make it work with ant 1.8.2.
This commit is contained in:
parent
e0d4546630
commit
b6f0795006
13
fix-ant-1.8.2.patch
Normal file
13
fix-ant-1.8.2.patch
Normal file
@ -0,0 +1,13 @@
|
||||
--- pom.xml.sav 2011-01-10 10:33:07.000000000 +0200
|
||||
+++ pom.xml 2011-01-10 10:35:17.354126766 +0200
|
||||
@@ -72,8 +72,8 @@ under the License.
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.ant</groupId>
|
||||
- <artifactId>ant-nodeps</artifactId>
|
||||
- <version>1.8.1</version>
|
||||
+ <artifactId>ant</artifactId>
|
||||
+ <version>1.8.2</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.codehaus.plexus</groupId>
|
||||
@ -1,6 +1,6 @@
|
||||
Name: maven-antrun-plugin
|
||||
Version: 1.6
|
||||
Release: 1%{?dist}
|
||||
Release: 2%{?dist}
|
||||
Summary: Maven AntRun Plugin
|
||||
|
||||
Group: Development/Libraries
|
||||
@ -8,13 +8,14 @@ License: ASL 2.0
|
||||
URL: http://maven.apache.org/plugins/maven-antrun-plugin/
|
||||
Source0: http://repo2.maven.org/maven2/org/apache/maven/plugins/%{name}/%{version}/%{name}-%{version}-source-release.zip
|
||||
Patch0: fix-deps.patch
|
||||
Patch1: fix-ant-1.8.2.patch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
|
||||
BuildArch: noarch
|
||||
|
||||
BuildRequires: java-devel >= 1:1.6.0
|
||||
BuildRequires: plexus-utils
|
||||
BuildRequires: ant-nodeps
|
||||
BuildRequires: ant
|
||||
BuildRequires: maven2
|
||||
BuildRequires: maven-install-plugin
|
||||
BuildRequires: maven-compiler-plugin
|
||||
@ -24,7 +25,7 @@ BuildRequires: maven-surefire-plugin
|
||||
BuildRequires: maven-surefire-provider-junit
|
||||
BuildRequires: maven-jar-plugin
|
||||
BuildRequires: maven-javadoc-plugin
|
||||
Requires: ant-nodeps
|
||||
Requires: ant
|
||||
Requires: maven2
|
||||
Requires: jpackage-utils
|
||||
Requires: java
|
||||
@ -49,6 +50,7 @@ API documentation for %{name}.
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0
|
||||
%patch1
|
||||
|
||||
%build
|
||||
export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
|
||||
@ -63,10 +65,7 @@ rm -rf %{buildroot}
|
||||
|
||||
# jars
|
||||
install -d -m 0755 %{buildroot}%{_javadir}
|
||||
install -m 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar
|
||||
|
||||
(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; \
|
||||
do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
|
||||
install -m 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
|
||||
|
||||
%add_to_maven_depmap org.apache.maven.plugins maven-antrun-plugin %{version} JPP maven-antrun-plugin
|
||||
|
||||
@ -104,6 +103,9 @@ rm -rf %{buildroot}
|
||||
%{_javadocdir}/%{name}
|
||||
|
||||
%changelog
|
||||
* Mon Jan 10 2011 Alexander Kurtakov <akurtako@redhat.com> 1.6-2
|
||||
- Make it work with ant 1.8.2.
|
||||
|
||||
* Thu Oct 14 2010 Alexander Kurtakov <akurtako@redhat.com> 1.6-1
|
||||
- Update to 1.6.
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user