[java-sig-commits] [plexus-io] Update to upstream 1.0.1.

[Alexander Kurtakov]

commit 647a595035c284f117f442b9b089beae2987cf31
Author: Alexander Kurtakov <akurtako at redhat.com>
Date:   Tue May 17 11:30:58 2011 +0300

    Update to upstream 1.0.1.
    
    Adapt to current guidelines.

 .gitignore     |    1 +
 plexus-io.spec |   66 +++++++++++++++++++++----------------------------------
 sources        |    2 +-
 3 files changed, 27 insertions(+), 42 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 90e1b70..ba4df9e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 plexus-io-1.0-alpha-5.tar.bz2
+/plexus-io-1.0.1.tar.xz
diff --git a/plexus-io.spec b/plexus-io.spec
index 5ba8fb8..3dfb8fc 100644
--- a/plexus-io.spec
+++ b/plexus-io.spec
@@ -1,16 +1,14 @@
 Name:           plexus-io
-Version:        1.0
-Release:        0.3.a5%{?dist}
+Version:        1.0.1
+Release:        1%{?dist}
 Summary:        Plexus IO Components
 
 Group:          Development/Libraries
 License:        ASL 2.0
 URL:            http://plexus.codehaus.org/plexus-components/plexus-io
-#svn export http://svn.codehaus.org/plexus/plexus-components/tags/plexus-io-1.0-alpha-5/
-#tar cjf plexus-io-1.0-alpha-5.tar.bz2 plexus-io-1.0-alpha-5/      
-Source0:        plexus-io-1.0-alpha-5.tar.bz2
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
+#svn export http://svn.codehaus.org/plexus/plexus-components/tags/plexus-io-1.0.1/
+#tar caf plexus-io-1.0.1.tar.xz plexus-io-1.0.1/      
+Source0:        plexus-io-%{version}.tar.xz
 BuildArch: noarch
 
 BuildRequires: java-devel >= 1:1.6.0 
@@ -18,13 +16,13 @@ BuildRequires:  jpackage-utils
 
 BuildRequires: plexus-utils
 BuildRequires: plexus-container-default
-BuildRequires: maven2
-BuildRequires: maven2-plugin-resources
-BuildRequires: maven2-plugin-compiler
-BuildRequires: maven2-plugin-jar
-BuildRequires: maven2-plugin-install
-BuildRequires: maven2-plugin-javadoc
-BuildRequires: maven-surefire-maven-plugin
+BuildRequires: maven
+BuildRequires: maven-resources-plugin
+BuildRequires: maven-compiler-plugin
+BuildRequires: maven-jar-plugin
+BuildRequires: maven-install-plugin
+BuildRequires: maven-javadoc-plugin
+BuildRequires: maven-surefire-plugin
 BuildRequires: maven-surefire-provider-junit
 BuildRequires: maven-doxia-sitetools
 BuildRequires: plexus-maven-plugin
@@ -42,47 +40,33 @@ in I/O operations.
 %package javadoc
 Group:          Documentation
 Summary:        Javadoc for %{name}
+Requires:       jpackage-utils
 
 %description javadoc
 API documentation for %{name}.
 
 
 %prep
-%setup -q -n %{name}-1.0-alpha-5
-
-mkdir external_repo
-ln -s %{_javadir} external_repo/JPP
+%setup -q 
 
 %build
-export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
-mvn-jpp \
-        -e \
-        -Dmaven2.jpp.mode=true \
-        -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
-        install javadoc:javadoc
+mvn-rpmbuild install javadoc:javadoc
 
 %install
-rm -rf %{buildroot}
-
 # jars
 install -d -m 0755 %{buildroot}%{_javadir}/plexus
-install -m 644 target/%{name}-1.0-alpha-5.jar   %{buildroot}%{_javadir}/plexus/io-1.0.jar
-
-(cd %{buildroot}%{_javadir}/plexus && for jar in *-%{version}*; \
-    do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
+install -m 644 target/%{name}-%{version}.jar   %{buildroot}%{_javadir}/plexus/io.jar
 
 %add_to_maven_depmap org.codehaus.plexus %{name} %{version} JPP/plexus io
 
 # poms
-install -d -m 755 %{buildroot}%{_datadir}/maven2/poms
+install -d -m 755 %{buildroot}%{_mavenpomdir}
 install -pm 644 pom.xml \
-    %{buildroot}%{_datadir}/maven2/poms/JPP.%{name}.pom
+    %{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
@@ -90,22 +74,22 @@ rm -rf target/site/api*
 %postun
 %update_maven_depmap
 
-%clean
-%{__rm} -rf %{buildroot}
-
 %files
 %defattr(-,root,root,-)
 %doc NOTICE.txt
 %{_javadir}/plexus/*.jar
-%{_datadir}/maven2/poms/*
+%{_mavenpomdir}/*
 %{_mavendepmapfragdir}/*
 
 %files javadoc
 %defattr(-,root,root,-)
-%{_javadocdir}/%{name}-%{version}
 %{_javadocdir}/%{name}
 
 %changelog
+* Tue May 17 2011 Alexander Kurtakov <akurtako at redhat.com> 1.0.1-1
+- Update to upstream 1.0.1.
+- Adapt to current guidelines.
+
 * Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-0.3.a5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
diff --git a/sources b/sources
index c3fc052..815acf2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2e17dcd94ebdd064dc4d0b01e90bc5ff  plexus-io-1.0-alpha-5.tar.bz2
+bdd7cdef53b5981bdc72338479504ade  plexus-io-1.0.1.tar.xz