commit fbbb4c8b8f8bcca732db5a561962b04b925ad42a
Author: Alexander Kurtakov <akurtako(a)redhat.com>
Date: Tue May 17 21:56:58 2011 +0300
Update to upstream 2.6.
Adapt to current guidelines.
.gitignore | 1 +
maven-deploy-plugin.spec | 56 ++++++++++++++++-----------------------------
sources | 2 +-
3 files changed, 22 insertions(+), 37 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index aec4b52..108bed6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
maven-deploy-plugin-2.5.tgz
+/maven-deploy-plugin-2.6-source-release.zip
diff --git a/maven-deploy-plugin.spec b/maven-deploy-plugin.spec
index ae76404..4a4335d 100644
--- a/maven-deploy-plugin.spec
+++ b/maven-deploy-plugin.spec
@@ -1,16 +1,12 @@
Name: maven-deploy-plugin
-Version: 2.5
-Release: 6%{?dist}
+Version: 2.6
+Release: 1%{?dist}
Summary: Maven Deploy Plugin
Group: Development/Libraries
License: ASL 2.0
URL:
http://maven.apache.org/plugins/maven-deploy-plugin/
-#svn export
https://svn.apache.org/repos/asf/maven/plugins/tags/maven-deploy-plugin-2.5
maven-deploy-plugin
-#tar czf maven-deploy-plugin-2.5.tgz maven-deploy-plugin
-Source0: maven-deploy-plugin-2.5.tgz
-
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Source0:
http://repo1.maven.org/maven2/org/apache/maven/plugins/%{name}/%{version}...
BuildArch: noarch
@@ -19,7 +15,7 @@ BuildRequires: jpackage-utils
BuildRequires: java-devel >= 1:1.6.0
# Maven and its dependencies
-BuildRequires: maven2
+BuildRequires: maven
BuildRequires: maven-plugin-plugin
BuildRequires: maven-resources-plugin
BuildRequires: maven-compiler-plugin
@@ -30,17 +26,17 @@ BuildRequires: maven-doxia
BuildRequires: maven-doxia-tools
BuildRequires: maven-doxia-sitetools
BuildRequires: maven-surefire-provider-junit
-BuildRequires: maven-surefire-maven-plugin
+BuildRequires: maven-surefire-plugin
BuildRequires: maven-plugin-cobertura
BuildRequires: maven-archiver
# The following maven packages haven't updated yet
-BuildRequires: maven2-plugin-idea
-BuildRequires: maven2-plugin-changes
-BuildRequires: maven2-plugin-enforcer
-BuildRequires: maven2-plugin-invoker
+BuildRequires: maven-idea-plugin
+BuildRequires: maven-changes-plugin
+BuildRequires: maven-enforcer-plugin
+BuildRequires: maven-invoker-plugin
Requires: java
-Requires: maven2
+Requires: maven
Requires: jpackage-utils
Requires(post): jpackage-utils
Requires(postun): jpackage-utils
@@ -60,27 +56,17 @@ Requires: jpackage-utils
API documentation for %{name}.
%prep
-%setup -q -n %{name}
+%setup -q
%build
-export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
-
-mvn-jpp \
- -e \
- -Dmaven2.jpp.mode=true \
- -Dmaven.test.skip=true \
- -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
+mvn-rpmbuild \
+ -Dmaven.test.failure.ignore=true \
install javadoc:javadoc
%install
-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-deploy-plugin %{version} JPP
maven-deploy-plugin
@@ -90,10 +76,8 @@ install -pm 644 pom.xml \
%{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
# javadoc
-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*
+install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}
+cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/
%post
%update_maven_depmap
@@ -101,9 +85,6 @@ rm -rf target/site/api*
%postun
%update_maven_depmap
-%clean
-rm -rf %{buildroot}
-
%files
%defattr(-,root,root,-)
%{_javadir}/*
@@ -112,10 +93,13 @@ rm -rf %{buildroot}
%files javadoc
%defattr(-,root,root,-)
-%{_javadocdir}/%{name}-%{version}
%{_javadocdir}/%{name}
%changelog
+* Tue May 17 2011 Alexander Kurtakov <akurtako(a)redhat.com> 2.6-1
+- Update to upstream 2.6.
+- Adapt to current guidelines.
+
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
2.5-6
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
diff --git a/sources b/sources
index cc0a722..20d2c32 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-afd33f8a799cdc3f1facac88985de784 maven-deploy-plugin-2.5.tgz
+caa04822c9e66ed0a27778d16914cdeb maven-deploy-plugin-2.6-source-release.zip