[fedora-java] [maven-war-plugin] - Update to new version.

Alexander Kurtakov akurtakov at fedoraproject.org
Sat Nov 20 14:50:39 UTC 2010


commit 7cb531acf2e5f66c75b9373d81aa4980cb85fb2d
Author: Alexander Kurtakov <akurtako at redhat.com>
Date:   Sat Nov 20 16:50:15 2010 +0200

    - Update to new version.

 maven-war-plugin.spec |   27 +++++++++++++++------------
 1 files changed, 15 insertions(+), 12 deletions(-)
---
diff --git a/maven-war-plugin.spec b/maven-war-plugin.spec
index ae3f04a..8df6cdc 100644
--- a/maven-war-plugin.spec
+++ b/maven-war-plugin.spec
@@ -1,7 +1,7 @@
-%global project_version 2.1-beta-1
+%global version 2.1-beta-1
 Name:           maven-war-plugin
-Version:        2.1
-Release:        0.3.b1%{?dist}
+Version:        2.1.1
+Release:        1%{?dist}
 Summary:        Maven WAR Plugin
 
 Group:          Development/Libraries
@@ -9,7 +9,7 @@ License:        ASL 2.0
 URL:            http://maven.apache.org/plugins/maven-war-plugin/
 #svn export http://svn.apache.org/repos/asf/maven/plugins/tags/maven-war-plugin-2.1-beta-1 maven-war-plugin
 #tar czf maven-war-plugin-2.1-beta-1.tgz maven-war-plugin
-Source0:        maven-war-plugin-2.1-beta-1.tgz
+Source0:        http://repo2.maven.org/maven2/org/apache/maven/plugins/maven-war-plugin/2.1.1/maven-war-plugin-2.1.1-source-release.zip
 Source1:        %{name}-depmap.xml
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -64,7 +64,7 @@ Requires:       jpackage-utils
 API documentation for %{name}.
 
 %prep
-%setup -q -n %{name}
+%setup -q 
 
 %build
 export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
@@ -87,10 +87,10 @@ rm -rf %{buildroot}
 
 # jars
 install -d -m 0755 %{buildroot}%{_javadir}
-install -m 644 target/%{name}-%{project_version}.jar   %{buildroot}%{_javadir}/%{name}-%{project_version}.jar
+install -m 644 target/%{name}-%{version}.jar   %{buildroot}%{_javadir}/%{name}-%{version}.jar
 
-(cd %{buildroot}%{_javadir} && for jar in *-%{project_version}*; \
-    do ln -sf ${jar} `echo $jar| sed "s|-%{project_version}||g"`; done)
+(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; \
+    do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
 
 %add_to_maven_depmap org.apache.maven.plugins maven-war-plugin %{version} JPP maven-war-plugin
 
@@ -100,9 +100,9 @@ install -pm 644 pom.xml \
     %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
 
 # javadoc
-install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}-%{project_version}
-cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}-%{project_version}/
-ln -s %{name}-%{project_version} %{buildroot}%{_javadocdir}/%{name}
+install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}-%{version}
+cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}-%{version}/
+ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
 rm -rf target/site/api*
 
 %post
@@ -122,10 +122,13 @@ rm -rf %{buildroot}
 
 %files javadoc
 %defattr(-,root,root,-)
-%{_javadocdir}/%{name}-%{project_version}
+%{_javadocdir}/%{name}-%{version}
 %{_javadocdir}/%{name}
 
 %changelog
+* Sat Nov 20 2010 Alexander Kurtakov <akurtako at redhat.com> 2.1.1-1
+- Update to new version.
+
 * Mon Jun 14 2010 Alexander Kurtakov <akurtako at redhat.com> 2.1-0.3.b1
 - Fix unversioned symlink.
 


More information about the java-devel mailing list