[Jpackage-commits] rpms/free/plexus-interactivity plexus-interactivity-1.0-jpp-depmap.xml, 1.2, 1.3 plexus-interactivity.spec, 1.2, 1.3

jpackage jpackage at ryu.zarb.org
Tue Dec 14 23:40:10 CET 2010


Update of /home/projects/jpackage/cvs/rpms/free/plexus-interactivity
In directory ryu.zarb.org:/tmp/5s03YZ9kRN/rpms/free/plexus-interactivity

Modified Files:
	plexus-interactivity-1.0-jpp-depmap.xml 
	plexus-interactivity.spec 
Log Message:
1.0-0.a6.1.jpp6

Index: plexus-interactivity.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/rpms/free/plexus-interactivity/plexus-interactivity.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -C 2 -d -r1.2 -r1.3
*** plexus-interactivity.spec	2 Oct 2008 19:43:40 -0000	1.2
--- plexus-interactivity.spec	14 Dec 2010 22:40:08 -0000	1.3
***************
*** 1,3 ****
! # Copyright (c) 2000-2008, JPackage Project
  # All rights reserved.
  #
--- 1,3 ----
! # Copyright (c) 2000-2010, JPackage Project
  # All rights reserved.
  #
***************
*** 45,49 ****
  Name:           plexus-interactivity
  Version:        1.0
! Release:        0.a5.6%{?dist}
  Epoch:          0
  Summary:        Plexus Interactivity Handler Component
--- 45,49 ----
  Name:           plexus-interactivity
  Version:        1.0
! Release:        0.a6.1%{?dist}
  Epoch:          0
  Summary:        Plexus Interactivity Handler Component
***************
*** 51,56 ****
  Group:          Development/Java
  URL:            http://plexus.codehaus.org/
! # svn export svn://svn.plexus.codehaus.org/plexus/scm/tags/plexus-interactivity-1.0-alpha-5/
! Source0:        plexus-interactivity-1.0-alpha-5-src.tar.gz
  Source1:        plexus-interactivity-1.0-api-build.xml
  Source2:        plexus-interactivity-1.0-api-project.xml
--- 51,56 ----
  Group:          Development/Java
  URL:            http://plexus.codehaus.org/
! # svn export http://svn.codehaus.org/plexus/plexus-components/tags/plexus-interactivity-1.0-alpha-6/
! Source0:        plexus-interactivity-1.0-alpha-6-src.tar.gz
  Source1:        plexus-interactivity-1.0-api-build.xml
  Source2:        plexus-interactivity-1.0-api-project.xml
***************
*** 62,71 ****
  Requires:       plexus-utils
  Requires:       jline
! Requires(post): jpackage-utils >= 0:1.7.2
! Requires(postun): jpackage-utils >= 0:1.7.2
! BuildRequires:  jpackage-utils >= 0:1.7.2
! BuildRequires:  ant >= 0:1.6
  %if %with maven
! BuildRequires:  maven2 >= 2.0.4-10jpp
  BuildRequires:  maven2-plugin-compiler
  BuildRequires:  maven2-plugin-install
--- 62,71 ----
  Requires:       plexus-utils
  Requires:       jline
! Requires(post): jpackage-utils >= 0:1.7.5
! Requires(postun): jpackage-utils >= 0:1.7.5
! BuildRequires:  jpackage-utils >= 0:1.7.5
! BuildRequires:  ant >= 0:1.7.1
  %if %with maven
! BuildRequires:  maven2 >= 2.0.8
  BuildRequires:  maven2-plugin-compiler
  BuildRequires:  maven2-plugin-install
***************
*** 74,78 ****
  BuildRequires:  maven2-plugin-resources
  BuildRequires:  maven-release
! BuildRequires:  maven-surefire-plugin
  %endif
  BuildRequires:  jline
--- 74,79 ----
  BuildRequires:  maven2-plugin-resources
  BuildRequires:  maven-release
! BuildRequires:  maven-surefire-maven-plugin
! BuildRequires:  apache-commons-parent
  %endif
  BuildRequires:  jline
***************
*** 102,106 ****
  
  %prep
! %setup -q -n plexus-interactivity-1.0-alpha-5
  cp %{SOURCE1} plexus-interactivity-api/build.xml
  cp %{SOURCE2} plexus-interactivity-api/project.xml
--- 103,107 ----
  
  %prep
! %setup -q -n plexus-interactivity-1.0-alpha-6
  cp %{SOURCE1} plexus-interactivity-api/build.xml
  cp %{SOURCE2} plexus-interactivity-api/project.xml
***************
*** 123,127 ****
  
  %if %with maven
! mvn-jpp -e -s $(pwd)/settings.xml -Dmaven2.jpp.depmap.file=%{SOURCE6} -Dmaven.repo.local=$MAVEN_REPO_LOCAL install javadoc:javadoc
  %else
  export CLASSPATH=
--- 124,132 ----
  
  %if %with maven
! mvn-jpp -e \
!         -s $(pwd)/settings.xml \
!         -Dmaven2.jpp.depmap.file=%{SOURCE6} \
!         -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
!         install javadoc:javadoc
  %else
  export CLASSPATH=
***************
*** 146,151 ****
  # jars
  install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/plexus
! install -pm 644 plexus-interactivity-api/target/%{name}-api-%{version}-alpha-5.jar $RPM_BUILD_ROOT%{_javadir}/plexus/interactivity-api-%{version}.jar
! install -pm 644 plexus-interactivity-jline/target/%{name}-jline-%{version}-alpha-5.jar $RPM_BUILD_ROOT%{_javadir}/plexus/interactivity-jline-%{version}.jar
  (cd $RPM_BUILD_ROOT%{_javadir}/plexus && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed  "s|-%{version}||g"`; done)
  
--- 151,156 ----
  # jars
  install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/plexus
! install -m 644 plexus-interactivity-api/target/%{name}-api-%{version}-alpha-6.jar $RPM_BUILD_ROOT%{_javadir}/plexus/interactivity-api-%{version}.jar
! install -m 644 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 ln -sf ${jar} `echo $jar| sed  "s|-%{version}||g"`; done)
  
***************
*** 156,164 ****
  install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
  install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/default_poms
! install -pm 644 pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{parent}-%{subname}.pom
! install -pm 644 pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/default_poms/org.codehaus.plexus-%{parent}-%{subname}.pom
  
! install -pm 644 plexus-interactivity-api/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{parent}-%{subname}-api.pom
! install -pm 644 plexus-interactivity-jline/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{parent}-%{subname}-jline.pom
  
  # javadoc
--- 161,169 ----
  install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
  install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/default_poms
! install -m 644 pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{parent}-%{subname}.pom
! install -m 644 pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/default_poms/org.codehaus.plexus-%{parent}-%{subname}.pom
  
! install -m 644 plexus-interactivity-api/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{parent}-%{subname}-api.pom
! install -m 644 plexus-interactivity-jline/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{parent}-%{subname}-jline.pom
  
  # javadoc
***************
*** 212,215 ****
--- 217,223 ----
  
  %changelog
+ * Tue Dec 14 2010 Ralph Apel <r.apel at r-apel.de> 0:1.0-0.a6.1
+ - 1.0-alpha-6 for JPackage 6
+ 
  * Thu Oct 02 2008 David Walluck <dwalluck at redhat.com> 0:1.0-0.a5.6
  - build for JPackage 5

Index: plexus-interactivity-1.0-jpp-depmap.xml
===================================================================
RCS file: /home/projects/jpackage/cvs/rpms/free/plexus-interactivity/plexus-interactivity-1.0-jpp-depmap.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C 2 -d -r1.2 -r1.3
*** plexus-interactivity-1.0-jpp-depmap.xml	2 Oct 2008 19:43:40 -0000	1.2
--- plexus-interactivity-1.0-jpp-depmap.xml	14 Dec 2010 22:40:08 -0000	1.3
***************
*** 13,15 ****
--- 13,28 ----
    </dependency>
  
+   <dependency>
+     <maven>
+       <groupId>org.mortbay.jetty</groupId>
+       <artifactId>servlet-api</artifactId>
+       <version>2.5-20081211</version>
+     </maven>
+     <jpp>
+       <groupId>JPP</groupId>
+       <artifactId>servlet_2_5_api</artifactId>
+       <version>2.5</version>
+     </jpp>
+   </dependency>
+ 
  </dependencies>




More information about the JPackage-commits mailing list