[Jpackage-commits] dist/plexus-compiler/devel .cvsignore, 1.2, 1.3 plexus-compiler-1.5.3-compiler-aspectj-pom.patch, 1.1, NONE plexus-compiler-1.5.3-compiler-eclipse-pom.patch, 1.1, NONE plexus-compiler-1.5.3-compiler-jikes-pom.patch, 1.1, NONE plexus-compiler-1.5.3-compilers-pom.patch, 1.1, NONE plexus-compiler-1.5.3-javac-Commandline.patch, 1.1, NONE plexus-compiler-1.5.3-jpp-depmap.xml, 1.1, NONE plexus-compiler-1.5.3-temp-AspectJCompilerTest.patch, 1.1, NONE plexus-compiler-1.8.1-jpp-depmap.xml, NONE, 1.1 plexus-compiler.spec, 1.1, 1.2 sources, 1.2, 1.3

jpackage jpackage at ryu.zarb.org
Tue Dec 14 22:12:42 CET 2010


Update of /home/projects/jpackage/cvs/dist/plexus-compiler/devel
In directory ryu.zarb.org:/tmp/cvs-serv20673

Modified Files:
	.cvsignore plexus-compiler.spec sources 
Added Files:
	plexus-compiler-1.8.1-jpp-depmap.xml 
Removed Files:
	plexus-compiler-1.5.3-compiler-aspectj-pom.patch 
	plexus-compiler-1.5.3-compiler-eclipse-pom.patch 
	plexus-compiler-1.5.3-compiler-jikes-pom.patch 
	plexus-compiler-1.5.3-compilers-pom.patch 
	plexus-compiler-1.5.3-javac-Commandline.patch 
	plexus-compiler-1.5.3-jpp-depmap.xml 
	plexus-compiler-1.5.3-temp-AspectJCompilerTest.patch 
Log Message:
1.8.1-1

Index: .cvsignore
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/plexus-compiler/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -C 2 -d -r1.2 -r1.3
*** .cvsignore	28 May 2008 19:31:45 -0000	1.2
--- .cvsignore	14 Dec 2010 21:12:39 -0000	1.3
***************
*** 1,2 ****
! plexus-compiler-1.5.3-autogenerated-files.tar.gz
! plexus-compiler-1.5.3.tar.gz
--- 1,2 ----
! plexus-compiler-1.8.1.tar.gz
! plexus-compiler-1.8.1-autogenerated-files.tar.gz

--- plexus-compiler-1.5.3-compiler-aspectj-pom.patch DELETED ---

--- plexus-compiler-1.5.3-compilers-pom.patch DELETED ---

--- plexus-compiler-1.5.3-jpp-depmap.xml DELETED ---

--- plexus-compiler-1.5.3-temp-AspectJCompilerTest.patch DELETED ---

--- plexus-compiler-1.5.3-javac-Commandline.patch DELETED ---

--- NEW FILE: plexus-compiler-1.8.1-jpp-depmap.xml ---
<dependencies>
<!--
  <dependency>
    <maven>
      <groupId>ant</groupId>
      <artifactId>ant-nodeps</artifactId>
      <version>1.6.5</version>
    </maven>
    <jpp>
      <groupId>JPP/ant</groupId>
      <artifactId>ant-nodeps</artifactId>
      <version>1.6.5</version>
    </jpp>
  </dependency>
  <dependency>
    <maven>
      <groupId>aspectj</groupId>
      <artifactId>aspectjtools</artifactId>
      <version>1.5.0</version>
    </maven>
    <jpp>
      <groupId>JPP</groupId>
      <artifactId>aspectjtools</artifactId>
      <version>1.2.1</version>
    </jpp>
  </dependency>
  <dependency>
    <maven>
      <groupId>aspectj</groupId>
      <artifactId>aspectjrt</artifactId>
      <version>1.5.0</version>
    </maven>
    <jpp>
      <groupId>JPP</groupId>
      <artifactId>aspectjrt</artifactId>
      <version>1.2.1</version>
    </jpp>
  </dependency>
  <dependency>
    <maven>
      <groupId>org.eclipse.jdt</groupId>
      <artifactId>core</artifactId>
      <version>3.1.0</version>
    </maven>
    <jpp>
      <groupId>JPP</groupId>
      <artifactId>ecj</artifactId>
      <version>3.2.2</version>
    </jpp>
  </dependency>
  <dependency>
    <maven>
      <groupId>commons-lang</groupId>
      <artifactId>commons-lang</artifactId>
      <version>2.0</version>
    </maven>
    <jpp>
      <groupId>JPP</groupId>
      <artifactId>commons-lang</artifactId>
      <version>2.3</version>
    </jpp>
  </dependency>

  <dependency>
    <maven>
      <groupId>javax.servlet</groupId>
      <artifactId>servlet-api</artifactId>
      <version>2.3</version>
    </maven>
    <jpp>
      <groupId>JPP</groupId>
      <artifactId>servletapi4</artifactId>
      <version>2.3</version>
    </jpp>
  </dependency>
-->

</dependencies>

Index: sources
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/plexus-compiler/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -C 2 -d -r1.2 -r1.3
*** sources	28 May 2008 19:31:45 -0000	1.2
--- sources	14 Dec 2010 21:12:39 -0000	1.3
***************
*** 1,2 ****
! d374acd687f1727ff485eafc5c22f3e5  plexus-compiler-1.5.3-autogenerated-files.tar.gz
! 3d66bd7baa19bc167956e5646f3df2dc  plexus-compiler-1.5.3.tar.gz
--- 1,2 ----
! f5e554052c3702bde8c6ddf17b71100f  plexus-compiler-1.8.1.tar.gz
! d374acd687f1727ff485eafc5c22f3e5  plexus-compiler-1.8.1-autogenerated-files.tar.gz

Index: plexus-compiler.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/plexus-compiler/devel/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	14 Dec 2010 21:12:39 -0000	1.2
***************
*** 1,3 ****
! # Copyright (c) 2000-2008, JPackage Project
  # All rights reserved.
  #
--- 1,3 ----
! # Copyright (c) 2000-2010, JPackage Project
  # All rights reserved.
  #
***************
*** 36,39 ****
--- 36,41 ----
  %define with_maven %{!?_without_maven:1}%{?_without_maven:0}
  %define without_maven %{?_without_maven:1}%{!?_without_maven:0}
+ %define with_maven 1
+ %define without_maven 0
  
  %define section     free
***************
*** 42,68 ****
  
  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
! # svn export http://svn.codehaus.org/plexus/tags/plexus-compiler-1.5.3/
  
  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
! Patch1:         plexus-compiler-1.5.3-compilers-pom.patch
! Patch2:         plexus-compiler-1.5.3-compiler-aspectj-pom.patch
! Patch3:         plexus-compiler-1.5.3-compiler-eclipse-pom.patch
! 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
--- 44,62 ----
  
  Name:           plexus-compiler
! Version:        1.8.1
! Release:        1%{dist}
  Epoch:          0
  Summary:        Plexus Compiler
  License:        Apache Software License 2.0
  Group:          Development/Java
  URL:            http://plexus.codehaus.org/
! Source0:        plexus-compiler-1.8.1.tar.gz
! # svn export http://svn.codehaus.org/plexus/plexus-components/tags/1.8.1/ plexus-compiler-1.8.1
! # tar czf plexus-compiler-1.8.1.tar.gz plexus-compiler-1.8.1/
  
  Source1:        plexus-compiler-settings.xml
! Source2:        plexus-compiler-1.8.1-autogenerated-files.tar.gz
! Source3:        plexus-compiler-1.8.1-jpp-depmap.xml
  
  
  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
--- 65,74 ----
  BuildArch:      noarch
  %endif
! BuildRequires:  jpackage-utils >= 0:1.7.5
! BuildRequires:  java-devel >= 0:1.6.0
! BuildRequires:  ant >= 0:1.7.1
  BuildRequires:  ant-nodeps
  %if %{with_maven}
! BuildRequires:  maven2 >= 0:2.0.8
  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
--- 78,82 ----
  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
--- 101,106 ----
  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
--- 110,113 ----
***************
*** 133,146 ****
  %endif
  
! %patch0 -b .sav0
! %patch1 -b .sav1
! %patch2 -b .sav2
! %patch3 -b .sav3
! %patch4 -b .sav4
! 
! %patch99 -b .sav99
  
  %build
- export JAVA_HOME=%{_jvmdir}/java-1.5.0
  export MAVEN_REPO_LOCAL=`pwd`/.m2/repository
  mkdir -p $MAVEN_REPO_LOCAL
--- 125,131 ----
  %endif
  
! #%patch0 -b .sav0
  
  %build
  export MAVEN_REPO_LOCAL=`pwd`/.m2/repository
  mkdir -p $MAVEN_REPO_LOCAL
***************
*** 248,251 ****
--- 233,239 ----
    $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 ****
--- 263,268 ----
  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
--- 307,310 ----
***************
*** 348,352 ****
  %{_javadir}/%{parent}/*
  %{_datadir}/maven2/poms/*
! %{_mavendepmapfragdir}
  %if %{gcj_support}
  %dir %attr(-,root,root) %{_libdir}/gcj/%{name}
--- 329,333 ----
  %{_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
--- 338,350 ----
  %defattr(-,root,root,-)
  %doc %{_javadocdir}/%{name}-%{version}
! %doc %{_javadocdir}/%{name}
  
  %changelog
+ * Mon Mar 02 2009 Ralph Apel <r.apel at r-apel.de> - 0:1.5.3-3.jpp5
+ - Rebuild once with ant
+ 
+ * Fri Feb 27 2009 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

--- plexus-compiler-1.5.3-compiler-eclipse-pom.patch DELETED ---

--- plexus-compiler-1.5.3-compiler-jikes-pom.patch DELETED ---




More information about the JPackage-commits mailing list