[Jpackage-commits] rpms/free/db-torque db-torque.spec, 1.4, 1.4.2.1 pom-maven2jpp-mapdeps.xsl, 1.2, 1.2.4.1

jpackage jpackage at ryu.zarb.org
Sun Feb 1 17:54:08 CET 2009


Update of /home/projects/jpackage/cvs/rpms/free/db-torque
In directory ryu.zarb.org:/tmp/yKFo1z9dDG/rpms/free/db-torque

Modified Files:
      Tag: JPACKAGE-5_0
	db-torque.spec pom-maven2jpp-mapdeps.xsl 
Log Message:
3.3-2.jpp5

Index: db-torque.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/rpms/free/db-torque/db-torque.spec,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -C 2 -d -r1.4 -r1.4.2.1
*** db-torque.spec	14 Aug 2008 08:46:15 -0000	1.4
--- db-torque.spec	1 Feb 2009 16:54:06 -0000	1.4.2.1
***************
*** 1,3 ****
! # Copyright (c) 2000-2008, JPackage Project
  # All rights reserved.
  #
--- 1,3 ----
! # Copyright (c) 2000-2009, JPackage Project
  # All rights reserved.
  #
***************
*** 42,46 ****
  Name:           db-torque
  Version:        3.3
! Release:        1%{dist}
  Epoch:          0
  Summary:        Torque persistence layer
--- 42,46 ----
  Name:           db-torque
  Version:        3.3
! Release:        2%{dist}
  Epoch:          0
  Summary:        Torque persistence layer
***************
*** 74,79 ****
  Patch2:         db-torque-3.3-generator-project_xml.patch
  BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
- #Distribution:   JPackage
- #Vendor:         JPackage Project
  
  %if ! %{gcj_support}
--- 74,77 ----
***************
*** 89,94 ****
  BuildRequires:  maven-plugin-changes
  BuildRequires:  maven-plugin-checkstyle
! BuildRequires:  checkstyle < 0:5
! BuildRequires:  checkstyle-optional < 0:5
  BuildRequires:  maven-plugin-developer-activity
  BuildRequires:  maven-plugin-file-activity
--- 87,92 ----
  BuildRequires:  maven-plugin-changes
  BuildRequires:  maven-plugin-checkstyle
! BuildRequires:  checkstyle = 0:4.3
! BuildRequires:  checkstyle-optional = 0:4.3
  BuildRequires:  maven-plugin-developer-activity
  BuildRequires:  maven-plugin-file-activity
***************
*** 105,110 ****
  BuildRequires:  maven-plugin-xdoc
  BuildRequires:  sf-findbugs-maven-plugin
! BuildRequires:  saxon
! BuildRequires:  saxon-scripts
  BuildRequires:  maven2 >= 0:2.0.7
  BuildRequires:  maven2-plugin-compiler
--- 103,108 ----
  BuildRequires:  maven-plugin-xdoc
  BuildRequires:  sf-findbugs-maven-plugin
! 
! #
  BuildRequires:  maven2 >= 0:2.0.7
  BuildRequires:  maven2-plugin-compiler
***************
*** 123,127 ****
  BuildRequires:  fulcrum-testcontainer
  BuildRequires:  fulcrum-yaafi
! BuildRequires:  gnu-getopt
  BuildRequires:  jakarta-commons-beanutils
  BuildRequires:  jakarta-commons-collections
--- 121,125 ----
  BuildRequires:  fulcrum-testcontainer
  BuildRequires:  fulcrum-yaafi
! BuildRequires:  gnu.getopt
  BuildRequires:  jakarta-commons-beanutils
  BuildRequires:  jakarta-commons-collections
***************
*** 135,146 ****
  BuildRequires:  log4j
  BuildRequires:  mysql-connector-java
! #BuildRequires:  village
  BuildRequires:  texen
  BuildRequires:  xerces-j2
  BuildRequires:  xml-commons-apis
  
- 
  Requires:  java >= 0:1.5.0
  Requires:  excalibur-avalon-framework-api
  Requires:  excalibur-avalon-logkit
  Requires:  jakarta-commons-beanutils
--- 133,145 ----
  BuildRequires:  log4j
  BuildRequires:  mysql-connector-java
! BuildRequires:  saxon
! BuildRequires:  saxon-scripts
  BuildRequires:  texen
  BuildRequires:  xerces-j2
  BuildRequires:  xml-commons-apis
  
  Requires:  java >= 0:1.5.0
  Requires:  excalibur-avalon-framework-api
+ Requires:  excalibur-avalon-framework-impl
  Requires:  excalibur-avalon-logkit
  Requires:  jakarta-commons-beanutils
***************
*** 156,160 ****
  Requires:  jndi >= 0:1.2.1
  Requires:  log4j
- #Requires:  village
  Requires:  texen
  Requires:  xerces-j2
--- 155,158 ----
***************
*** 179,184 ****
  Summary:        Javadoc for %{name}-runtime
  Group:          Development/Documentation
- #Requires(post):   /bin/rm,/bin/ln
- #Requires(postun): /bin/rm
  
  %description    runtime-javadoc
--- 177,180 ----
***************
*** 202,207 ****
  Summary:        Javadoc for %{name}-gen
  Group:          Development/Documentation
- #Requires(post):   /bin/rm,/bin/ln
- #Requires(postun): /bin/rm
  
  %description    gen-javadoc
--- 198,201 ----
***************
*** 241,246 ****
  Summary:        Javadoc for %{name}-village
  Group:          Development/Documentation
- #Requires(post):   /bin/rm,/bin/ln
- #Requires(postun): /bin/rm
  Provides:       village-javadoc = %{epoch}:%{version}-%{release}
  Obsoletes:      village-javadoc < 0:3.3
--- 235,238 ----
***************
*** 284,289 ****
  Summary:        Javadoc for %{name}-maven2-plugin
  Group:          Development/Documentation
- #Requires(post):   /bin/rm,/bin/ln
- #Requires(postun): /bin/rm
  
  %description    maven2-plugin-javadoc
--- 276,279 ----
***************
*** 338,342 ****
  
  %build
- #export JAVA_HOME=%{_jvmdir}/java-1.5.0
  mkdir external_repo
  ln -s %{_javadir} external_repo/JPP
--- 328,331 ----
***************
*** 351,354 ****
--- 340,344 ----
          -Dmaven2.jpp.depmap.file=%{SOURCE1} \
          -Dgpg.skip=true \
+         -Dmaven.test.failure.ignore=true \
          install javadoc:javadoc 
  
***************
*** 522,543 ****
  rm -rf $RPM_BUILD_ROOT
  
- #%post runtime-javadoc
- #rm -f %{_javadocdir}/%{name}
- #ln -s %{name}-%{version} %{_javadocdir}/%{name}
- 
- #%postun runtime-javadoc
- #if [ "$1" = "0" ]; then
- #    rm -f %{_javadocdir}/%{name}
- #fi
- 
- #%post gen-javadoc
- #rm -f %{_javadocdir}/%{name}-gen
- #ln -s %{name}-gen-%{version} %{_javadocdir}/%{name}-gen
- 
- #%postun gen-javadoc
- #if [ "$1" = "0" ]; then
- #    rm -f %{_javadocdir}/%{name}-gen
- #fi
- 
  %post 
  %update_maven_depmap
--- 512,515 ----
***************
*** 678,682 ****
  
  %changelog
! * Thu Aug 14 2008 Ralph Apel <r.apel at r-apel.de> - 0:3.3-1.jpp5
  - 3.3
  
--- 650,657 ----
  
  %changelog
! * Wed Jan 21 2009 Ralph Apel <r.apel at r-apel.de> - 0:3.3-2.jpp5
! - BR saxon, saxon-scripts
! 
! * Wed Aug 13 2008 Ralph Apel <r.apel at r-apel.de> - 0:3.3-1.jpp5
  - 3.3
  

Index: pom-maven2jpp-mapdeps.xsl
===================================================================
RCS file: /home/projects/jpackage/cvs/rpms/free/db-torque/pom-maven2jpp-mapdeps.xsl,v
retrieving revision 1.2
retrieving revision 1.2.4.1
diff -C 2 -d -r1.2 -r1.2.4.1
*** pom-maven2jpp-mapdeps.xsl	4 Nov 2005 21:27:56 -0000	1.2
--- pom-maven2jpp-mapdeps.xsl	1 Feb 2009 16:54:06 -0000	1.2.4.1
***************
*** 48,64 ****
    <xsl:param name="artifact"/>
    <xsl:variable name="this" select="."/>
-   <xsl:element name="dependency">
     <xsl:choose>
      <xsl:when test="document($map)//dependency/maven[./artifactId/text() = $artifact]">
       <xsl:for-each select="document($map)//dependency/maven[./artifactId/text() = $artifact][1]">
!       <xsl:copy-of select="../jpp/*"/>
!       <xsl:copy-of select="$this/properties"/>
       </xsl:for-each>
      </xsl:when>
      <xsl:otherwise>
!      <xsl:copy-of select="./*"/>
      </xsl:otherwise>
     </xsl:choose>
-   </xsl:element>
    <xsl:if test="document($map)//dependency/maven[./artifactId/text() = $artifact]">
     <xsl:for-each select="document($map)//dependency/maven[./artifactId/text() = $artifact][1]">
--- 48,68 ----
    <xsl:param name="artifact"/>
    <xsl:variable name="this" select="."/>
     <xsl:choose>
      <xsl:when test="document($map)//dependency/maven[./artifactId/text() = $artifact]">
       <xsl:for-each select="document($map)//dependency/maven[./artifactId/text() = $artifact][1]">
!       <xsl:if test="../jpp">
!        <xsl:element name="dependency">
!         <xsl:copy-of select="../jpp/*"/>
!         <xsl:copy-of select="$this/properties"/>
!        </xsl:element>
!       </xsl:if>
       </xsl:for-each>
      </xsl:when>
      <xsl:otherwise>
!      <xsl:element name="dependency">
!       <xsl:copy-of select="./*"/>
!      </xsl:element>
      </xsl:otherwise>
     </xsl:choose>
    <xsl:if test="document($map)//dependency/maven[./artifactId/text() = $artifact]">
     <xsl:for-each select="document($map)//dependency/maven[./artifactId/text() = $artifact][1]">




More information about the JPackage-commits mailing list