rpms/plexus-interactivity/devel sources, 1.2, 1.3 plexus-interactivity.spec, 1.5, 1.6 .cvsignore, 1.2, 1.3

[Alexander Kurtakov]

Author: akurtakov

Update of /cvs/pkgs/rpms/plexus-interactivity/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv14066/devel

Modified Files:
	sources plexus-interactivity.spec .cvsignore 
Log Message:
- Update to alpha 6.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/plexus-interactivity/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	13 Mar 2007 23:08:09 -0000	1.2
+++ sources	21 Jul 2010 14:07:21 -0000	1.3
@@ -1 +1 @@
-7b2a814da29fc1118bc5b4e4bc6225eb  plexus-interactivity-1.0-alpha-5-src.tar.bz2
+8d18d894a2a393bf2dd6574b7beda32b  plexus-interactivity-1.0-alpha-6-src.tar.xz


Index: plexus-interactivity.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plexus-interactivity/devel/plexus-interactivity.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- plexus-interactivity.spec	26 Jul 2009 18:55:57 -0000	1.5
+++ plexus-interactivity.spec	21 Jul 2010 14:07:21 -0000	1.6
@@ -28,36 +28,19 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
-# We just want to use ant
-%define _without_maven 1
-
-# If you don't want to build with maven, and use straight ant instead,
-# give rpmbuild option '--without maven'
-
-%define with_maven %{!?_without_maven:1}%{?_without_maven:0}
-%define without_maven %{?_without_maven:1}%{!?_without_maven:0}
-
 Name:           plexus-interactivity
 Version:        1.0
-Release:        0.3.a5.2.3%{?dist}
+Release:        0.3.a6.3%{?dist}
 Epoch:          0
 Summary:        Plexus Interactivity Handler Component
 License:        MIT
 Group:          Development/Libraries
 URL:            http://plexus.codehaus.org/
 # svn export \
-#   svn://svn.plexus.codehaus.org/plexus/tags/plexus-interactivity-1.0-alpha-5/
-# tar cjf plexus-interactivity-1.0-alpha-5-src.tar.bz2 \
-#   plexus-interactivity-1.0-alpha-5
-# md5sum 7b2a814da29fc1118bc5b4e4bc6225eb
-Source0:        plexus-interactivity-1.0-alpha-5-src.tar.bz2
-
-Source1:        plexus-interactivity-1.0-api-build.xml
-Source2:        plexus-interactivity-1.0-jline-build.xml
-%if %{with_maven}
-Source3:        plexus-interactivity-1.0-api-project.xml
-Source4:        plexus-interactivity-1.0-jline-project.xml
-%endif
+#   http://svn.codehaus.org/plexus/plexus-components/tags/plexus-interactivity-1.0-alpha-6/
+# tar caf plexus-interactivity-1.0-alpha-6-src.tar.xz \
+#   plexus-interactivity-1.0-alpha-6
+Source0:        plexus-interactivity-1.0-alpha-6-src.tar.xz
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -65,9 +48,14 @@ BuildArch:      noarch
 BuildRequires:  jpackage-utils >= 0:1.6
 BuildRequires:  ant >= 0:1.6
 BuildRequires:  ant-nodeps 
-%if %{with_maven}
-BuildRequires:  maven
-%endif
+BuildRequires:  maven2
+BuildRequires:  maven-compiler-plugin
+BuildRequires:  maven-javadoc-plugin
+BuildRequires:  maven-site-plugin
+BuildRequires:  maven-surefire-maven-plugin
+BuildRequires:  maven-install-plugin
+BuildRequires:  maven-resources-plugin
+BuildRequires:  maven-jar-plugin
 BuildRequires:  jline
 BuildRequires:  plexus-container-default
 BuildRequires:  plexus-utils
@@ -92,68 +80,26 @@ Group:          Development/Documentatio
 Javadoc for %{name}.
 
 %prep
-%setup -q -n plexus-interactivity-1.0-alpha-5
-cp %{SOURCE1} plexus-interactivity-api/build.xml
-cp %{SOURCE2} plexus-interactivity-jline/build.xml
-%if %{with_maven}
-cp %{SOURCE3} plexus-interactivity-api/project.xml
-cp %{SOURCE4} plexus-interactivity-jline/project.xml
-%endif
+%setup -q -n plexus-interactivity-1.0-alpha-6
 
 %build
-%if %{with_maven}
-mkdir -p .maven/repository/maven/jars
-build-jar-repository .maven/repository/maven/jars \
-maven-jelly-tags
-
-mkdir -p .maven/repository/JPP/jars
-build-jar-repository -s -p .maven/repository/JPP/jars \
-jline plexus/container-default plexus/utils
-export MAVEN_HOME_LOCAL=$(pwd)/.maven
-%endif
-
-pushd plexus-interactivity-api
-%if %{with_maven}
-maven \
-        -Dmaven.repo.remote=file:/usr/share/maven/repository \
-        -Dmaven.home.local=$MAVEN_HOME_LOCAL \
-        jar:install javadoc
-
-%else
-
-mkdir -p target/lib
-build-jar-repository -s -p target/lib plexus/container-default plexus/utils
-ant jar javadoc
-%endif
-popd
-
-pushd plexus-interactivity-jline
-%if %{with_maven}
-maven \
-        -Dmaven.repo.remote=file:/usr/share/maven/repository \
-        -Dmaven.home.local=$MAVEN_HOME_LOCAL \
-        jar:install javadoc
-
-%else
-
-mkdir -p target/lib
-cp \
-  ../plexus-interactivity-api/target/plexus-interactivity-api-1.0-alpha-5.jar \
-  target/lib
-build-jar-repository -s -p target/lib jline plexus/container-default
-ant jar javadoc
-%endif
-popd
+export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
+mvn-jpp \
+        -e \
+        -Dmaven2.jpp.mode=true \
+        -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
+        -Dmaven.test.skip=true \
+        install javadoc:javadoc
 
 %install
 rm -rf $RPM_BUILD_ROOT
 # jars
 install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/plexus
 install -pm 644 \
-  plexus-interactivity-api/target/%{name}-api-%{version}-alpha-5.jar \
+  plexus-interactivity-api/target/%{name}-api-%{version}-alpha-6.jar \
   $RPM_BUILD_ROOT%{_javadir}/plexus/interactivity-api-%{version}.jar
 install -pm 644 \
-  plexus-interactivity-jline/target/%{name}-jline-%{version}-alpha-5.jar \
+  plexus-interactivity-jline/target/%{name}-jline-%{version}-alpha-6.jar \
   $RPM_BUILD_ROOT%{_javadir}/plexus/interactivity-jline-%{version}.jar
 (cd $RPM_BUILD_ROOT%{_javadir}/plexus && \
  for jar in *-%{version}*; do \
@@ -161,22 +107,44 @@ install -pm 644 \
  done \
 )
 
+install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
+install -pm 644 \
+pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{parent}-%{subname}.pom 
+install -pm 644 \
+plexus-interactivity-api/pom.xml \
+ 	$RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-interactivity-api.pom 
+install -pm 644 \
+plexus-interactivity-jline/pom.xml \
+ 	$RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-interactivity-jline.pom 
+
+%add_to_maven_depmap org.codehaus.plexus %{name} %{version} JPP/%{parent} %{subname}
+%add_to_maven_depmap org.codehaus.plexus %{name}-api %{version} JPP/%{parent} interactivity-api
+%add_to_maven_depmap org.codehaus.plexus %{name}-jline %{version} JPP/%{parent} interactivity-jline 
+
 # javadoc
 install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/api
-cp -pr plexus-interactivity-api/target/docs/apidocs/* \
+cp -pr plexus-interactivity-api/target/site/apidocs/* \
   $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/api
 install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/jline
-cp -pr plexus-interactivity-jline/target/docs/apidocs/* \
+cp -pr plexus-interactivity-jline/target/site/apidocs/* \
   $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/jline
 ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post
+%update_maven_depmap
+
+%postun
+%update_maven_depmap
+
 %files
 %defattr(-,root,root,-)
 %{_javadir}/*
+%{_mavenpomdir}/*
+%{_mavendepmapfragdir}/*
 
 %files javadoc
 %defattr(-,root,root,-)
@@ -184,6 +152,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Jul 21 2010 Alexander Kurtakov <akurtako at redhat.com> 0:1.0-0.3.a6.3
+- Update to alpha 6.
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:1.0-0.3.a5.2.3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
@@ -206,4 +177,3 @@ rm -rf $RPM_BUILD_ROOT
 
 * Mon Nov 07 2005 Ralph Apel <r.apel at r-apel.de> - 0:1.0-0.a5.1jpp
 - First JPackage build
-


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/plexus-interactivity/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	13 Mar 2007 23:08:09 -0000	1.2
+++ .cvsignore	21 Jul 2010 14:07:21 -0000	1.3
@@ -1 +1 @@
-plexus-interactivity-1.0-alpha-5-src.tar.bz2
+plexus-interactivity-1.0-alpha-6-src.tar.xz