[Jpackage-commits] dist/plexus-compiler/JPP-5 plexus-compiler-1.5.3-jpp-depmap.xml, 1.1, 1.2 plexus-compiler.spec, 1.1, 1.2

jpackage jpackage at ryu.zarb.org
Fri Feb 27 19:18:32 CET 2009


Update of /home/projects/jpackage/cvs/dist/plexus-compiler/JPP-5
In directory ryu.zarb.org:/tmp/cvs-serv14900

Modified Files:
	plexus-compiler-1.5.3-jpp-depmap.xml plexus-compiler.spec 
Log Message:
1.5.3-2.jpp5

Index: plexus-compiler-1.5.3-jpp-depmap.xml
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/plexus-compiler/JPP-5/plexus-compiler-1.5.3-jpp-depmap.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** plexus-compiler-1.5.3-jpp-depmap.xml	28 May 2008 19:31:45 -0000	1.1
--- plexus-compiler-1.5.3-jpp-depmap.xml	27 Feb 2009 18:18:30 -0000	1.2
***************
*** 74,76 ****
--- 74,89 ----
    </dependency>
  
+   <dependency>
+     <maven>
+       <groupId>org.codehaus.plexus</groupId>
+       <artifactId>plexus-cdc</artifactId>
+       <version>1.0-alpha-10</version>
+     </maven>
+     <jpp>
+       <groupId>JPP/plexus</groupId>
+       <artifactId>cdc</artifactId>
+       <version>1.0-alpha-11</version>
+     </jpp>
+   </dependency>
+ 
  </dependencies>

Index: plexus-compiler.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/plexus-compiler/JPP-5/plexus-compiler.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** plexus-compiler.spec	28 May 2008 19:31:45 -0000	1.1
--- plexus-compiler.spec	27 Feb 2009 18:18:30 -0000	1.2
***************
*** 1,3 ****
! # Copyright (c) 2000-2008, JPackage Project
  # All rights reserved.
  #
--- 1,3 ----
! # Copyright (c) 2000-2009, JPackage Project
  # All rights reserved.
  #
***************
*** 43,53 ****
  Name:           plexus-compiler
  Version:        1.5.3
! Release:        1jpp
  Epoch:          0
  Summary:        Plexus Compiler
  License:        Apache Software License 2.0
  Group:          Development/Java
- Vendor:         JPackage Project
- Distribution:   JPackage
  URL:            http://plexus.codehaus.org/
  Source0:        plexus-compiler-1.5.3.tar.gz
--- 43,51 ----
  Name:           plexus-compiler
  Version:        1.5.3
! Release:        2%{dist}
  Epoch:          0
  Summary:        Plexus Compiler
  License:        Apache Software License 2.0
  Group:          Development/Java
  URL:            http://plexus.codehaus.org/
  Source0:        plexus-compiler-1.5.3.tar.gz
***************
*** 56,60 ****
  Source1:        plexus-compiler-settings.xml
  Source2:        plexus-compiler-1.5.3-autogenerated-files.tar.gz
! Source3:       plexus-compiler-1.5.3-jpp-depmap.xml
  
  Patch0:         plexus-compiler-1.5.3-javac-Commandline.patch
--- 54,58 ----
  Source1:        plexus-compiler-settings.xml
  Source2:        plexus-compiler-1.5.3-autogenerated-files.tar.gz
! Source3:        plexus-compiler-1.5.3-jpp-depmap.xml
  
  Patch0:         plexus-compiler-1.5.3-javac-Commandline.patch
***************
*** 64,68 ****
  Patch4:         plexus-compiler-1.5.3-compiler-jikes-pom.patch
  
! Patch99:         plexus-compiler-1.5.3-temp-AspectJCompilerTest.patch
  
  BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
--- 62,66 ----
  Patch4:         plexus-compiler-1.5.3-compiler-jikes-pom.patch
  
! Patch99:        plexus-compiler-1.5.3-temp-AspectJCompilerTest.patch
  
  BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
***************
*** 71,80 ****
  BuildArch:      noarch
  %endif
! BuildRequires:  jpackage-utils >= 0:1.7.4
! BuildRequires:  java-devel = 0:1.5.0
  BuildRequires:  ant >= 0:1.6.5
  BuildRequires:  ant-nodeps
  %if %{with_maven}
! BuildRequires:  maven2 >= 0:2.0.4
  BuildRequires:  maven2-plugin-ant
  BuildRequires:  maven2-plugin-compiler
--- 69,78 ----
  BuildArch:      noarch
  %endif
! BuildRequires:  jpackage-utils >= 0:1.7.5
! BuildRequires:  java-devel >= 0:1.5.0
  BuildRequires:  ant >= 0:1.6.5
  BuildRequires:  ant-nodeps
  %if %{with_maven}
! BuildRequires:  maven2 >= 0:2.0.7
  BuildRequires:  maven2-plugin-ant
  BuildRequires:  maven2-plugin-compiler
***************
*** 84,88 ****
  BuildRequires:  maven2-plugin-release
  BuildRequires:  maven2-plugin-resources
! BuildRequires:  maven2-plugin-surefire
  BuildRequires:  maven-shared-reporting-impl
  BuildRequires:  jmock
--- 82,86 ----
  BuildRequires:  maven2-plugin-release
  BuildRequires:  maven2-plugin-resources
! BuildRequires:  maven-surefire-plugin
  BuildRequires:  maven-shared-reporting-impl
  BuildRequires:  jmock
***************
*** 107,112 ****
  Requires(postun): java-gcj-compat
  %endif
! Requires(post):    jpackage-utils >= 0:1.7.4
! Requires(postun):  jpackage-utils >= 0:1.7.4
  
  %description
--- 105,110 ----
  Requires(postun): java-gcj-compat
  %endif
! Requires(post):    jpackage-utils >= 0:1.7.5
! Requires(postun):  jpackage-utils >= 0:1.7.5
  
  %description
***************
*** 116,121 ****
  Summary:        Javadoc for %{name}
  Group:          Development/Documentation
- Requires(post):   /bin/rm,/bin/ln
- Requires(postun): /bin/rm
  
  %description javadoc
--- 114,117 ----
***************
*** 142,146 ****
  
  %build
- export JAVA_HOME=%{_jvmdir}/java-1.5.0
  export MAVEN_REPO_LOCAL=`pwd`/.m2/repository
  mkdir -p $MAVEN_REPO_LOCAL
--- 138,141 ----
***************
*** 248,251 ****
--- 243,249 ----
    $RPM_BUILD_ROOT%{_javadir}/%{parent}/compiler-manager-%{version}.jar
  %add_to_maven_depmap org.codehaus.plexus %{name}-manager %{version} JPP/%{parent} %{subname}-manager
+ 
+ %add_to_maven_depmap org.codehaus.plexus plexus-compilers %{version} JPP/%{parent} compilers
+ 
  install -pm 644 %{parent}-compilers/plexus-compiler-aspectj/target/%{name}-aspectj-%{version}.jar \
    $RPM_BUILD_ROOT%{_javadir}/%{parent}/compiler-aspectj-%{version}.jar
***************
*** 275,278 ****
--- 273,278 ----
  install -pm 644 %{name}-manager/pom.xml \
      $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{parent}-%{subname}-manager.pom
+ install -pm 644 %{name}s/pom.xml \
+     $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{parent}-compilers.pom
  install -pm 644 %{name}s/%{name}-aspectj/pom.xml \
      $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{parent}-%{subname}-aspectj.pom
***************
*** 317,329 ****
  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
--- 317,320 ----
***************
*** 348,352 ****
  %{_javadir}/%{parent}/*
  %{_datadir}/maven2/poms/*
! %{_mavendepmapfragdir}
  %if %{gcj_support}
  %dir %attr(-,root,root) %{_libdir}/gcj/%{name}
--- 339,343 ----
  %{_javadir}/%{parent}/*
  %{_datadir}/maven2/poms/*
! %{_mavendepmapfragdir}/*
  %if %{gcj_support}
  %dir %attr(-,root,root) %{_libdir}/gcj/%{name}
***************
*** 357,363 ****
  %defattr(-,root,root,-)
  %doc %{_javadocdir}/%{name}-%{version}
! %ghost %doc %{_javadocdir}/%{name}
  
  %changelog
  * Thu Jan 03 2008 Ralph Apel <r.apel at r-apel.de> - 0:1.5.3-1jpp
  - 1.5.3
--- 348,357 ----
  %defattr(-,root,root,-)
  %doc %{_javadocdir}/%{name}-%{version}
! %doc %{_javadocdir}/%{name}
  
  %changelog
+ * Fri Feb 27 2008 Ralph Apel <r.apel at r-apel.de> - 0:1.5.3-2.jpp5
+ - Add one pom and depmap frag
+ 
  * Thu Jan 03 2008 Ralph Apel <r.apel at r-apel.de> - 0:1.5.3-1jpp
  - 1.5.3




More information about the JPackage-commits mailing list