[maven-war-plugin] Update to latest upstream and adopt to latest quidelines.

Alexander Kurtakov akurtakov at fedoraproject.org
Mon Aug 12 14:03:31 UTC 2013


commit 0a729470bd63eb38dcbe93c801224f1942fa5ccb
Author: Alexander Kurtakov <akurtako at redhat.com>
Date:   Mon Aug 12 17:03:20 2013 +0300

    Update to latest upstream and adopt to latest quidelines.

 .gitignore            |    1 +
 maven-war-plugin.spec |   33 +++++++++------------------------
 sources               |    2 +-
 3 files changed, 11 insertions(+), 25 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 277e7b6..0134c78 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ maven-war-plugin-2.1-beta-1.tgz
 maven-war-plugin-2.1.1-source-release.zip
 maven-war-plugin-2.2-source-release.zip
 /maven-war-plugin-2.3-source-release.zip
+/maven-war-plugin-2.4-source-release.zip
diff --git a/maven-war-plugin.spec b/maven-war-plugin.spec
index 6ae8cd8..1fca8d8 100644
--- a/maven-war-plugin.spec
+++ b/maven-war-plugin.spec
@@ -1,6 +1,6 @@
 Name:           maven-war-plugin
-Version:        2.3
-Release:        7%{?dist}
+Version:        2.4
+Release:        1%{?dist}
 Summary:        Maven WAR Plugin
 
 Group:          Development/Libraries
@@ -54,36 +54,21 @@ API documentation for %{name}.
 %setup -q 
 
 %build
-mvn-rpmbuild -Dmaven.test.skip=true \
-        install javadoc:javadoc
+%mvn_build -f
 
 %install
-# jars
-install -d -m 0755 %{buildroot}%{_javadir}
-install -m 644 target/%{name}-%{version}.jar   %{buildroot}%{_javadir}/%{name}.jar
+%mvn_install
 
-%add_to_maven_depmap org.apache.maven.plugins maven-war-plugin %{version} JPP maven-war-plugin
-
-# poms
-install -d -m 755 %{buildroot}%{_mavenpomdir}
-install -pm 644 pom.xml \
-    %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
-
-# javadoc
-install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}
-cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/
-
-%files
-%{_javadir}/*
-%{_mavenpomdir}/*
-%{_mavendepmapfragdir}/*
+%files -f .mfiles
 %doc LICENSE NOTICE
 
-%files javadoc
-%{_javadocdir}/%{name}
+%files javadoc -f .mfiles-javadoc
 %doc LICENSE NOTICE
 
 %changelog
+* Mon Aug 12 2013 Alexander Kurtakov <akurtako at redhat.com> 2.4-1
+- Update to latest upstream and adopt to latest quidelines.
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.3-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
diff --git a/sources b/sources
index 1a75463..76f4c21 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1286ae87954ec7a0176fd459eb4f8e3d  maven-war-plugin-2.3-source-release.zip
+6c5eb8d91aa0b39ff7a08bd5c14007e7  maven-war-plugin-2.4-source-release.zip


More information about the scm-commits mailing list