[maven-rar-plugin/f20] Update for latest guidelines, rhbz #992198
mbooth
mbooth at fedoraproject.org
Mon Sep 2 13:01:03 UTC 2013
commit 84176bbf308ea485f1b1d4a3b130d2ca2659ad01
Author: Mat Booth <fedora at matbooth.co.uk>
Date: Mon Sep 2 14:00:13 2013 +0100
Update for latest guidelines, rhbz #992198
- Update to latest upstream version 2.3
.gitignore | 1 +
maven-rar-plugin.spec | 72 +++++++++++++-----------------------------------
sources | 2 +-
3 files changed, 22 insertions(+), 53 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b77852a..204d854 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
maven-rar-plugin-2.2.tar.bz2
+/maven-rar-plugin-2.3-source-release.zip
diff --git a/maven-rar-plugin.spec b/maven-rar-plugin.spec
index 28b4d34..63ea562 100644
--- a/maven-rar-plugin.spec
+++ b/maven-rar-plugin.spec
@@ -1,15 +1,12 @@
Name: maven-rar-plugin
-Version: 2.2
-Release: 11%{?dist}
+Version: 2.3
+Release: 1%{?dist}
Summary: Plugin to create Resource Adapter Archive which can be deployed to a J2EE server
Group: Development/Libraries
License: ASL 2.0
URL: http://maven.apache.org/plugins/maven-rar-plugin/
-# svn export http://svn.apache.org/repos/asf/maven/plugins/tags/maven-rar-plugin-2.2/
-# tar jcf maven-rar-plugin-2.2.tar.bz2 maven-rar-plugin-2.2/
-Source0: %{name}-%{version}.tar.bz2
-Patch0: add-maven-core.patch
+Source0: http://archive.apache.org/dist/maven/plugins/%{name}-%{version}-source-release.zip
BuildArch: noarch
@@ -17,21 +14,7 @@ BuildRequires: java-devel >= 1:1.6.0
BuildRequires: plexus-utils
BuildRequires: ant
BuildRequires: maven-local
-BuildRequires: maven-install-plugin
-BuildRequires: maven-compiler-plugin
-BuildRequires: maven-plugin-plugin
-BuildRequires: maven-resources-plugin
-BuildRequires: maven-surefire-plugin
-BuildRequires: maven-surefire-provider-junit
-BuildRequires: maven-jar-plugin
-BuildRequires: maven-javadoc-plugin
BuildRequires: jpackage-utils
-Requires: ant
-Requires: maven
-Requires: jpackage-utils
-Requires: java
-Requires(post): jpackage-utils
-Requires(postun): jpackage-utils
Obsoletes: maven2-plugin-rar <= 0:2.0.8
Provides: maven2-plugin-rar = 1:%{version}-%{release}
@@ -47,52 +30,37 @@ to store these resource adapters to an archive
%package javadoc
Group: Documentation
Summary: Javadoc for %{name}
-Requires: jpackage-utils
%description javadoc
API documentation for %{name}.
-
%prep
%setup -q
-%patch0
-
-%build
-mvn-rpmbuild \
- -Dmaven.test.failure.ignore=true \
- install javadoc:javadoc
-
-%install
-# jars
-install -d -m 0755 %{buildroot}%{_javadir}
-install -m 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
-%add_to_maven_depmap org.apache.maven.plugins %{name} %{version} JPP %{name}
+# Fix deps to build against maven 3
+%pom_remove_dep org.apache.maven:maven-project
+%pom_add_dep org.apache.maven:maven-compat
+%pom_add_dep org.apache.maven:maven-core
-# poms
-install -d -m 755 %{buildroot}%{_mavenpomdir}
-install -pm 644 pom.xml \
- %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
+%mvn_file : %{name}
-# javadoc
-install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}
-cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/
-
-%post
-%update_maven_depmap
+%build
+%mvn_build -- -Dmaven.test.failure.ignore=true
-%postun
-%update_maven_depmap
+%install
+%mvn_install
-%files
-%{_javadir}/*
-%{_mavenpomdir}/*
-%{_mavendepmapfragdir}/*
+%files -f .mfiles
+%doc LICENSE NOTICE DEPENDENCIES
-%files javadoc
-%{_javadocdir}/%{name}
+%files javadoc -f .mfiles-javadoc
+%doc LICENSE NOTICE
%changelog
+* Mon Sep 02 2013 Mat Booth <fedora at matbooth.co.uk> - 2.3-1
+- Update for latest guidelines, rhbz #992198
+- Update to latest upstream version 2.3
+
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
diff --git a/sources b/sources
index fbcd771..339289c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d0609124bcd473816f758e4c5cf75191 maven-rar-plugin-2.2.tar.bz2
+b316dc74d47bfb53e964f36e6de34d69 maven-rar-plugin-2.3-source-release.zip
More information about the scm-commits
mailing list