[Jpackage-commits] rpms/free/plexus-cli plexus-cli-1.2-jpp-depmap.xml, 1.1, 1.2 plexus-cli.spec, 1.1, 1.2

jpackage jpackage at ryu.zarb.org
Thu Feb 5 04:37:43 CET 2009


Update of /home/projects/jpackage/cvs/rpms/free/plexus-cli
In directory ryu.zarb.org:/tmp/jCIeX8DyOy/rpms/free/plexus-cli

Modified Files:
	plexus-cli-1.2-jpp-depmap.xml plexus-cli.spec 
Log Message:
1.2-3.jpp6

Index: plexus-cli.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/rpms/free/plexus-cli/plexus-cli.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** plexus-cli.spec	1 Dec 2007 14:24:14 -0000	1.1
--- plexus-cli.spec	5 Feb 2009 03:37:41 -0000	1.2
***************
*** 43,59 ****
  %define namedversion 1.2
  
! Name:           plexus-cli
  Version:        1.2
! Release:        1jpp
  Epoch:          0
! Summary:        Plexus Cli API
  License:        Apache Software License 2.0
  Group:          Development/Java
- Vendor:         JPackage Project
- Distribution:   JPackage
  URL:            http://plexus.codehaus.org/
  Source0:        %{name}-%{namedversion}-src.tar.gz
- # svn export http://svn.codehaus.org/plexus/plexus-tools/tags/plexus-cli-1.2/
- 
  
  Source1:        plexus-cli-1.2-build.xml
--- 43,57 ----
  %define namedversion 1.2
  
! Name:           %{parent}-%{subname}
  Version:        1.2
! Release:        3%{?dist}
  Epoch:          0
! Summary:        Command Line Interface facilitator for Plexus
  License:        Apache Software License 2.0
  Group:          Development/Java
  URL:            http://plexus.codehaus.org/
+ # svn export http://svn.codehaus.org/plexus/plexus-tools/tags/plexus-cli-1.2 plexus-cli
+ # tar czf plexus-cli-src.tar.gz plexus-cli/
  Source0:        %{name}-%{namedversion}-src.tar.gz
  
  Source1:        plexus-cli-1.2-build.xml
***************
*** 61,65 ****
  Source3:        plexus-cli-1.2-jpp-depmap.xml
  
! BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
  
  %if ! %{gcj_support}
--- 59,63 ----
  Source3:        plexus-cli-1.2-jpp-depmap.xml
  
! BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
  
  %if ! %{gcj_support}
***************
*** 76,89 ****
  BuildRequires:  maven2-plugin-jar
  BuildRequires:  maven2-plugin-javadoc
- BuildRequires:  maven2-plugin-release
  BuildRequires:  maven2-plugin-resources
  BuildRequires:  maven2-plugin-surefire
  %endif
  BuildRequires:  plexus-classworlds
- BuildRequires:  plexus-containers-component-api
  BuildRequires:  plexus-containers-container-default
  BuildRequires:  plexus-utils 
  %if %{gcj_support}
- BuildRequires:    gnu-crypto
  BuildRequires:    java-gcj-compat-devel
  Requires(post):   java-gcj-compat
--- 74,86 ----
  BuildRequires:  maven2-plugin-jar
  BuildRequires:  maven2-plugin-javadoc
  BuildRequires:  maven2-plugin-resources
  BuildRequires:  maven2-plugin-surefire
+ BuildRequires:	maven-release
  %endif
  BuildRequires:  plexus-classworlds
  BuildRequires:  plexus-containers-container-default
  BuildRequires:  plexus-utils 
+ 
  %if %{gcj_support}
  BuildRequires:    java-gcj-compat-devel
  Requires(post):   java-gcj-compat
***************
*** 92,96 ****
  
  Requires:  plexus-classworlds
- Requires:  plexus-containers-component-api
  Requires:  plexus-containers-container-default
  Requires:  plexus-utils 
--- 89,92 ----
***************
*** 99,115 ****
  
  %description
! The Plexus project seeks to create end-to-end developer tools for 
! writing applications. At the core is the container, which can be 
! embedded or for a full scale application server. There are many 
! reusable components for hibernate, form processing, jndi, i18n, 
! velocity, etc. Plexus also includes an application server which 
  is like a J2EE application server, without all the baggage.
  
- 
  %package javadoc
  Summary:        Javadoc for %{name}
  Group:          Development/Documentation
- Requires(post):   /bin/rm,/bin/ln
- Requires(postun): /bin/rm
  
  %description javadoc
--- 95,108 ----
  
  %description
! The Plexus project seeks to create end-to-end developer tools for
! writing applications. At the core is the container, which can be
! embedded or for a full scale application server. There are many
! reusable components for hibernate, form processing, jndi, i18n,
! velocity, etc. Plexus also includes an application server which
  is like a J2EE application server, without all the baggage.
  
  %package javadoc
  Summary:        Javadoc for %{name}
  Group:          Development/Documentation
  
  %description javadoc
***************
*** 127,148 ****
  
  %build
- sed -i -e "s|<url>__JPP_URL_PLACEHOLDER__</url>|<url>file://`pwd`/.m2/repository</url>|g" settings.xml
- sed -i -e "s|<url>__JAVADIR_PLACEHOLDER__</url>|<url>file://`pwd`/external_repo</url>|g" settings.xml
- sed -i -e "s|<url>__MAVENREPO_DIR_PLACEHOLDER__</url>|<url>file://`pwd`/.m2/repository</url>|g" settings.xml
- sed -i -e "s|<url>__MAVENDIR_PLUGIN_PLACEHOLDER__</url>|<url>file:///usr/share/maven2/plugins</url>|g" settings.xml
- sed -i -e "s|<url>__ECLIPSEDIR_PLUGIN_PLACEHOLDER__</url>|<url>file:///usr/share/eclipse/plugins</url>|g" settings.xml
- 
  export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
  mkdir -p $MAVEN_REPO_LOCAL
  
- mkdir external_repo
- ln -s %{_javadir} external_repo/JPP
- 
  %if %{with_maven}
!     mvn-jpp \
          -e \
!         -s $(pwd)/settings.xml \
          -Dmaven2.jpp.depmap.file=%{SOURCE3} \
-         -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
          install javadoc:javadoc
  
--- 120,131 ----
  
  %build
  export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
  mkdir -p $MAVEN_REPO_LOCAL
  
  %if %{with_maven}
! mvn-jpp \
          -e \
! 		-Dmaven.repo.local=$MAVEN_REPO_LOCAL \
          -Dmaven2.jpp.depmap.file=%{SOURCE3} \
          install javadoc:javadoc
  
***************
*** 168,177 ****
  %add_to_maven_depmap org.codehaus.plexus %{name} %{namedversion} JPP/%{parent} %{subname}
  
! (cd $RPM_BUILD_ROOT%{_javadir}/plexus && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed  "s|-%{version}||g"`; done)
  
! # poms
  install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
! install -pm 644 pom.xml \
!     $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{parent}-%{subname}.pom
  
  # javadoc
--- 151,159 ----
  %add_to_maven_depmap org.codehaus.plexus %{name} %{namedversion} JPP/%{parent} %{subname}
  
! (cd $RPM_BUILD_ROOT%{_javadir}/%{parent} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed  "s|-%{version}||g"`; done)
  
! # pom
  install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
! install -pm 644 pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{parent}-%{subname}.pom
  
  # javadoc
***************
*** 181,185 ****
  
  %if %{gcj_support}
- export CLASSPATH=$(build-classpath gnu-crypto)
  %{_bindir}/aot-compile-rpm
  %endif
--- 163,166 ----
***************
*** 188,200 ****
  rm -rf $RPM_BUILD_ROOT
  
- %post javadoc
- rm -f %{_javadocdir}/%{name}
- ln -s %{name}-%{version} %{_javadocdir}/%{name}
- 
- %postun javadoc
- if [ "$1" = "0" ]; then
-   rm -f %{_javadocdir}/%{name}
- fi
- 
  %post
  %update_maven_depmap
--- 169,172 ----
***************
*** 218,223 ****
  %defattr(-,root,root,-)
  %{_javadir}/%{parent}/*
! %{_datadir}/maven2/poms/*
  %{_mavendepmapfragdir}
  %if %{gcj_support}
  %dir %attr(-,root,root) %{_libdir}/gcj/%{name}
--- 190,196 ----
  %defattr(-,root,root,-)
  %{_javadir}/%{parent}/*
! %{_datadir}/maven2
  %{_mavendepmapfragdir}
+ 
  %if %{gcj_support}
  %dir %attr(-,root,root) %{_libdir}/gcj/%{name}
***************
*** 227,235 ****
  %files javadoc
  %defattr(-,root,root,-)
! %doc %{_javadocdir}/%{name}-%{version}
! %ghost %doc %{_javadocdir}/%{name}
  
  %changelog
! * Tue Aug 27 2007 Ralph Apel <r.apel at r-apel.de> - 0:1.2-1jpp
! - First JPackage build
  
--- 200,216 ----
  %files javadoc
  %defattr(-,root,root,-)
! %doc %{_javadocdir}/*
! 
  
  %changelog
! * Thu Feb 05 2009 Yong Yang <yyang at redhat.com> 0:1.2-3
! - fix release tag
! 
! * Wed Jan 14 2009 Yong Yang <yyang at redhat.com> 0:1.2-2jpp.2
! -re-build with gcj
  
+ * Wed Jan 14 2009 Yong Yang <yyang at redhat.com> 0:1.2-2jpp.1
+ - Import from maven 2.0.8 packages, initial bulding
+ 
+ * Wed Jan 30 2008 Deepak Bhole <dbhole at redhat.com> 0:1.2-1jpp.1
+ - Initial build with merge from JPackage

Index: plexus-cli-1.2-jpp-depmap.xml
===================================================================
RCS file: /home/projects/jpackage/cvs/rpms/free/plexus-cli/plexus-cli-1.2-jpp-depmap.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** plexus-cli-1.2-jpp-depmap.xml	1 Dec 2007 14:24:14 -0000	1.1
--- plexus-cli-1.2-jpp-depmap.xml	5 Feb 2009 03:37:41 -0000	1.2
***************
*** 1,41 ****
  <dependencies>
- <!--
-   <dependency>
-     <maven>
-       <groupId>junit</groupId>
-       <artifactId>junit</artifactId>
-       <version>3.8.1</version>
-     </maven>
-     <jpp>
-       <groupId>JPP</groupId>
-       <artifactId>junit</artifactId>
-       <version>3.8.2</version>
-     </jpp>
-   </dependency>
-   <dependency>
-     <maven>
-       <groupId>org.codehaus.plexus</groupId>
-       <artifactId>plexus-utils</artifactId>
-       <version>1.0.4</version>
-     </maven>
-     <jpp>
-       <groupId>JPP/plexus</groupId>
-       <artifactId>utils</artifactId>
-       <version>1.2</version>
-     </jpp>
-   </dependency>
-   <dependency>
-     <maven>
-       <groupId>classworlds</groupId>
-       <artifactId>classworlds</artifactId>
-       <version>1.1-alpha-2</version>
-     </maven>
-     <jpp>
-       <groupId>JPP</groupId>
-       <artifactId>classworlds</artifactId>
-       <version>1.1</version>
-     </jpp>
-   </dependency>
- -->
    <dependency>
      <maven>
--- 1,3 ----
***************
*** 50,53 ****
      </jpp>
    </dependency>
- 
  </dependencies>
--- 12,14 ----




More information about the JPackage-commits mailing list