[Jpackage-commits] rpms/free/maven-jxr maven-jxr-jpp-depmap.xml, 1.2, 1.3 maven-jxr-maven-jxr-plugin-pom.patch, 1.1, NONE maven-jxr-maven-jxr-pom.patch, 1.1, NONE maven-jxr.spec, 1.3, 1.4

jpackage jpackage at ryu.zarb.org
Sun Dec 5 23:53:08 CET 2010


Update of /home/projects/jpackage/cvs/rpms/free/maven-jxr
In directory ryu.zarb.org:/tmp/LFK9pRISQ5/rpms/free/maven-jxr

Modified Files:
	maven-jxr-jpp-depmap.xml maven-jxr.spec 
Removed Files:
	maven-jxr-maven-jxr-plugin-pom.patch 
	maven-jxr-maven-jxr-pom.patch 
Log Message:
2.2-1.jpp6

Index: maven-jxr.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/rpms/free/maven-jxr/maven-jxr.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -C 2 -d -r1.3 -r1.4
*** maven-jxr.spec	12 Feb 2008 12:36:37 -0000	1.3
--- maven-jxr.spec	5 Dec 2010 22:53:06 -0000	1.4
***************
*** 1,3 ****
! # Copyright (c) 2000-2008, JPackage Project
  # All rights reserved.
  #
--- 1,3 ----
! # Copyright (c) 2000-2010, JPackage Project
  # All rights reserved.
  #
***************
*** 42,56 ****
  
  Name:           maven-jxr
! Version:        2.1
! Release:        2jpp
  Epoch:          0
  Summary:        Maven JXR
  License:        Apache Software License 2.0
  Group:          Development/Java
- Vendor: %{?_vendorinfo:%{_vendorinfo}}%{!?_vendorinfo:%{_vendor}}
- Distribution: %{?_distribution:%{_distribution}}%{!?_distribution:%{_vendor}}
  URL:            http://maven.apache.org/
  Source0:        %{name}-%{version}.tar.gz
! # svn export http://svn.apache.org/repos/asf/maven/jxr/tags/jxr-2.1/ maven-jxr-2.1
  
  
--- 42,54 ----
  
  Name:           maven-jxr
! Version:        2.2
! Release:        1%{?dist}
  Epoch:          0
  Summary:        Maven JXR
  License:        Apache Software License 2.0
  Group:          Development/Java
  URL:            http://maven.apache.org/
  Source0:        %{name}-%{version}.tar.gz
! # svn export http://svn.apache.org/repos/asf/maven/jxr/tags/jxr-2.2/ maven-jxr-2.2
  
  
***************
*** 59,75 ****
  Source3:        %{name}-settings.xml
  Source4:        %{name}-autogenerated-files.tar.gz
- Patch0:         %{name}-maven-jxr-pom.patch
- Patch1:         %{name}-maven-jxr-plugin-pom.patch
  
  BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
  
  BuildArch:      noarch
! BuildRequires:  jpackage-utils >= 0:1.7.4
! BuildRequires:  java-devel = 0:1.5.0
! BuildRequires:  ant >= 0:1.6.5
  BuildRequires:  junit
  %if %{with_maven}
  BuildRequires:  maven2-common-poms
! BuildRequires:  maven2 >= 0:2.0.7
  BuildRequires:  maven2-plugin-ant
  BuildRequires:  maven2-plugin-changelog
--- 57,71 ----
  Source3:        %{name}-settings.xml
  Source4:        %{name}-autogenerated-files.tar.gz
  
  BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
  
  BuildArch:      noarch
! BuildRequires:  jpackage-utils >= 0:1.7.5
! BuildRequires:  java-devel >= 0:1.6.0
! BuildRequires:  ant >= 0:1.7.1
  BuildRequires:  junit
  %if %{with_maven}
  BuildRequires:  maven2-common-poms
! BuildRequires:  maven2 >= 0:2.0.8
  BuildRequires:  maven2-plugin-ant
  BuildRequires:  maven2-plugin-changelog
***************
*** 82,85 ****
--- 78,82 ----
  BuildRequires:  maven2-plugin-site
  BuildRequires:  maven2-plugin-surefire
+ BuildRequires:  apache-commons-parent
  %endif
  BuildRequires:  classworlds
***************
*** 88,93 ****
  BuildRequires:  jakarta-oro
  BuildRequires:  jmock
! BuildRequires:  maven2-bootstrap >= 0:2.0.7
! BuildRequires:  maven-doxia >= 0:1.0-0.a10
  BuildRequires:  maven-shared-plugin-testing-harness
  BuildRequires:  maven-shared-reporting-impl
--- 85,90 ----
  BuildRequires:  jakarta-oro
  BuildRequires:  jmock
! BuildRequires:  maven2-bootstrap >= 0:2.0.8
! BuildRequires:  maven-doxia >= 0:1.0
  BuildRequires:  maven-shared-plugin-testing-harness
  BuildRequires:  maven-shared-reporting-impl
***************
*** 98,106 ****
  BuildRequires:  velocity14
  
  Requires:  classworlds
  Requires:  jakarta-commons-collections
  Requires:  jakarta-commons-lang
  Requires:  jakarta-oro
! Requires:  maven2-bootstrap >= 0:2.0.7
  Requires:  maven-shared-reporting-impl
  Requires:  plexus-container-default
--- 95,104 ----
  BuildRequires:  velocity14
  
+ Requires:  java >= 0:1.6.0
  Requires:  classworlds
  Requires:  jakarta-commons-collections
  Requires:  jakarta-commons-lang
  Requires:  jakarta-oro
! Requires:  maven2-bootstrap >= 0:2.0.8
  Requires:  maven-shared-reporting-impl
  Requires:  plexus-container-default
***************
*** 110,115 ****
  Requires:  velocity14
  
! Requires(post):   jpackage-utils >= 0:1.7.4
! Requires(postun): jpackage-utils >= 0:1.7.4
  Provides:  maven2-plugin-jxr = %{epoch}:%{version}-%{release}
  Obsoletes: maven2-plugin-jxr < %{epoch}:2.0.5
--- 108,113 ----
  Requires:  velocity14
  
! Requires(post):   jpackage-utils >= 0:1.7.5
! Requires(postun): jpackage-utils >= 0:1.7.5
  Provides:  maven2-plugin-jxr = %{epoch}:%{version}-%{release}
  Obsoletes: maven2-plugin-jxr < %{epoch}:2.0.5
***************
*** 121,126 ****
  Summary:        Javadoc for %{name}
  Group:          Development/Documentation
- Requires(post):   /bin/rm,/bin/ln
- Requires(postun): /bin/rm
  
  %description javadoc
--- 119,122 ----
***************
*** 135,144 ****
  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
- %patch0 -b .sav0
- %patch1 -b .sav1
  
  %build
- export JAVA_HOME=%{_jvmdir}/java-1.5.0
- 
  export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
  mkdir -p $MAVEN_REPO_LOCAL
--- 131,136 ----
***************
*** 274,286 ****
  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
--- 266,269 ----
***************
*** 301,304 ****
--- 284,290 ----
  
  %changelog
+ * Sun Dec 05 2010 Ralph Apel <r.apel at r-apel.de> 0:2.2-1
+ - 2.2 for JPP-6
+ 
  * Tue Feb 12 2008 Ralph Apel <r.apel at r-apel.de> 0:2.1-2jpp
  - Change scope of maven-shared-plugin-testing-harness to test

--- maven-jxr-maven-jxr-plugin-pom.patch DELETED ---

Index: maven-jxr-jpp-depmap.xml
===================================================================
RCS file: /home/projects/jpackage/cvs/rpms/free/maven-jxr/maven-jxr-jpp-depmap.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C 2 -d -r1.2 -r1.3
*** maven-jxr-jpp-depmap.xml	11 Feb 2008 10:09:23 -0000	1.2
--- maven-jxr-jpp-depmap.xml	5 Dec 2010 22:53:06 -0000	1.3
***************
*** 13,15 ****
--- 13,41 ----
    </dependency>
  
+   <dependency>
+ 	<maven>
+ 	  <groupId>org.apache.maven.plugin-testing</groupId>
+ 	  <artifactId>maven-plugin-testing-harness</artifactId>
+ 	  <version>1.2</version>
+ 	</maven>
+ 	<jpp>
+ 	  <groupId>JPP/maven-shared</groupId>
+ 	  <artifactId>plugin-testing-harness</artifactId>
+ 	  <version>1.2</version>
+ 	</jpp>
+   </dependency>
+ 
+   <dependency>
+ 	<maven>
+ 	  <groupId>velocity</groupId>
+ 	  <artifactId>velocity</artifactId>
+ 	  <version>1.4</version>
+ 	</maven>
+ 	<jpp>
+ 	  <groupId>JPP</groupId>
+ 	  <artifactId>velocity14</artifactId>
+ 	  <version>1.4</version>
+ 	</jpp>
+   </dependency>
+ 
  </dependencies>

--- maven-jxr-maven-jxr-pom.patch DELETED ---




More information about the JPackage-commits mailing list