[java-sig-commits] [maven-source-plugin] Use upstream source.
Alexander Kurtakov
akurtakov at fedoraproject.org
Wed Jun 8 08:12:38 UTC 2011
commit 1b2673dd908ebe7f4ffad076566e00984e47f6a3
Author: Alexander Kurtakov <akurtako at redhat.com>
Date: Wed Jun 8 11:12:18 2011 +0300
Use upstream source.
Build with maven 3.x.
Guidelines fixes.
.gitignore | 1 +
maven-source-plugin.spec | 47 +++++++++++++++------------------------------
sources | 2 +-
3 files changed, 18 insertions(+), 32 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 20845eb..0128df8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
maven-source-plugin-2.1.2.tar.xz
+/maven-source-plugin-2.1.2-source-release.zip
diff --git a/maven-source-plugin.spec b/maven-source-plugin.spec
index 6cd8b43..3b846af 100644
--- a/maven-source-plugin.spec
+++ b/maven-source-plugin.spec
@@ -1,22 +1,19 @@
Name: maven-source-plugin
Version: 2.1.2
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: Plugin creating source jar
Group: Development/Libraries
License: ASL 2.0
URL: http://maven.apache.org/plugins/maven-source-plugin/
-# svn export http://svn.apache.org/repos/asf/maven/plugins/tags/maven-source-plugin-2.1.2
-# tar caf maven-source-plugin-2.1.2.tar.xz maven-source-plugin-2.1.2/
-Source0: %{name}-%{version}.tar.xz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Source0: http://repo1.maven.org/maven2/org/apache/maven/plugins/%{name}/%{version}/%{name}-%{version}-source-release.zip
BuildArch: noarch
BuildRequires: java-devel >= 1:1.6.0
BuildRequires: plexus-utils
-BuildRequires: ant-nodeps
-BuildRequires: maven2
+BuildRequires: ant
+BuildRequires: maven
BuildRequires: maven-install-plugin
BuildRequires: maven-compiler-plugin
BuildRequires: maven-plugin-plugin
@@ -26,8 +23,8 @@ BuildRequires: maven-surefire-provider-junit
BuildRequires: maven-jar-plugin
BuildRequires: maven-javadoc-plugin
BuildRequires: jpackage-utils
-Requires: ant-nodeps
-Requires: maven2
+Requires: ant
+Requires: maven
Requires: jpackage-utils
Requires: java
Requires(post): jpackage-utils
@@ -54,23 +51,14 @@ API documentation for %{name}.
sed -i -e "s|plexus-container-default|plexus-container|g" pom.xml
%build
-export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
-mvn-jpp \
- -e \
- -Dmaven2.jpp.mode=true \
- -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
+mvn-rpmbuild \
-Dmaven.test.failure.ignore=true \
- install javadoc:javadoc
+ install javadoc:aggregate
%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-source-plugin %{version} JPP maven-source-plugin
@@ -80,10 +68,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
@@ -91,21 +77,20 @@ rm -rf target/site/api*
%postun
%update_maven_depmap
-%clean
-rm -rf %{buildroot}
-
%files
-%defattr(-,root,root,-)
%{_javadir}/*
%{_mavenpomdir}/*
%{_mavendepmapfragdir}/*
%files javadoc
-%defattr(-,root,root,-)
-%{_javadocdir}/%{name}-%{version}
%{_javadocdir}/%{name}
%changelog
+* Wed Jun 8 2011 Alexander Kurtakov <akurtako at redhat.com> 2.1.2-6
+- Use upstream source.
+- Build with maven 3.x.
+- Guidelines fixes.
+
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1.2-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
diff --git a/sources b/sources
index 7b62f61..6631b32 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7c8c14fd9fef3cdcf4f9641e468d783c maven-source-plugin-2.1.2.tar.xz
+bd85201f38b4b430a6fb0657e13cecc5 maven-source-plugin-2.1.2-source-release.zip
More information about the java-sig-commits
mailing list