[Jpackage-commits] rpms/free/jakarta-commons-jxpath commons-jxpath-1.2.pom, NONE, 1.1 jakarta-commons-jxpath-1.2-jvm15.patch, NONE, 1.1 jakarta-commons-jxpath.spec, 1.3, 1.4

jpackage jpackage at ryu.zarb.org
Thu Feb 5 08:50:14 CET 2009


Update of /home/projects/jpackage/cvs/rpms/free/jakarta-commons-jxpath
In directory ryu.zarb.org:/tmp/tmEpQIuO4B/rpms/free/jakarta-commons-jxpath

Modified Files:
	jakarta-commons-jxpath.spec 
Added Files:
	commons-jxpath-1.2.pom jakarta-commons-jxpath-1.2-jvm15.patch 
Log Message:
1.2-4.jpp6

Index: jakarta-commons-jxpath.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/rpms/free/jakarta-commons-jxpath/jakarta-commons-jxpath.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -C 2 -d -r1.3 -r1.4
*** jakarta-commons-jxpath.spec	3 Oct 2008 17:42:00 -0000	1.3
--- jakarta-commons-jxpath.spec	5 Feb 2009 07:50:12 -0000	1.4
***************
*** 1,3 ****
! # Copyright (c) 2000-2008, JPackage Project
  # All rights reserved.
  #
--- 1,3 ----
! # Copyright (c) 2000-2005, JPackage Project
  # All rights reserved.
  #
***************
*** 33,67 ****
  
  Name:           jakarta-%{base_name}
! Version:        1.3
! Release:        1%{?dist}
  Epoch:          0
  Summary:        Simple XPath interpreter
  Group:          Development/Libraries/Java
! License:        ASL 2.0
  URL:            http://jakarta.apache.org/commons/jxpath/
! Source0:        http://archive.apache.org/dist/commons/jxpath/source/commons-jxpath-1.3-src.tar.gz
! Requires:       jakarta-commons-beanutils
! Requires:       jakarta-commons-collections >= 0:2.1.1
! Requires:       jakarta-commons-logging
! Requires:       jdom >= 0:1.0
! Requires:       jsp_2_0_api
! Requires:       servlet_2_4_api
! Requires:       xerces-j2
! Requires:       xml-commons-jaxp-1.3-apis
! BuildRequires:  ant >= 0:1.6
! BuildRequires:  ant-junit >= 0:1.6
! BuildRequires:  jakarta-commons-beanutils
! BuildRequires:  jakarta-commons-collections >= 0:2.1.1
! BuildRequires:  jakarta-commons-logging
! BuildRequires:  jdom >= 0:1.0
  BuildRequires:  jpackage-utils >= 0:1.5
! BuildRequires:  jsp_2_0_api
! BuildRequires:  junit
! BuildRequires:  mockrunner
! BuildRequires:  servlet_2_4_api
  BuildRequires:  xerces-j2
! BuildRequires:  xml-commons-jaxp-1.3-apis
! BuildArch:      noarch
! BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
  
  %description
--- 33,73 ----
  
  Name:           jakarta-%{base_name}
! Version:        1.2
! Release:        4%{?dist}
  Epoch:          0
  Summary:        Simple XPath interpreter
+ 
  Group:          Development/Libraries/Java
! License:        Apache Software License
  URL:            http://jakarta.apache.org/commons/jxpath/
! Source0:        commons-jxpath-1.2-src.zip
! Source1:        http://repo1.maven.org/maven2/commons-jxpath/commons-jxpath/1.2/commons-jxpath-1.2.pom
! 
! Patch0:         %{name}-%{version}-jvm15.patch
! 
! BuildArch:      noarch
  BuildRequires:  jpackage-utils >= 0:1.5
! BuildRequires:  ant >= 0:1.6, ant-junit >= 0:1.6, junit
! BuildRequires:  xml-commons-apis
  BuildRequires:  xerces-j2
! BuildRequires:  servletapi5
! BuildRequires:  jdom >= 0:1.0
! BuildRequires:  jakarta-commons-beanutils
! BuildRequires:  jakarta-commons-logging
! BuildRequires:  jakarta-commons-collections >= 0:2.1.1
! BuildRequires:  tomcat5-jsp-2.0-api
! Requires:       xml-commons-apis
! Requires:       xerces-j2
! Requires:       servletapi5
! Requires:       jdom >= 0:1.0
! Requires:       jakarta-commons-beanutils
! Requires:       jakarta-commons-logging
! Requires:       jakarta-commons-collections >= 0:2.1.1
! Requires:       tomcat5-jsp-2.0-api
! 
! Requires(post):   jpackage-utils >= 1.7.2
! Requires(postun): jpackage-utils >= 1.7.2
! 
! BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
  
  %description
***************
*** 70,102 ****
  JavaBeans, Maps, Servlet contexts, DOM etc, including mixtures thereof.
  
! %package javadoc
  Summary:        Javadoc for %{name}
  Group:          Development/Documentation
  
! %description javadoc
  Javadoc for %{name}
  
- 
  %prep
! %setup -q -n %{base_name}-%{version}-src
! #touch build.properties
! #echo jaxp.jaxp.jar = $(find-jar xml-commons-jaxp-1.3-apis) >> build.properties 
! #echo jaxp.xslt.jar = $(find-jar xml-commons-jaxp-1.3-apis) >> build.properties 
! #echo jdom.jar = $(find-jar jdom) >> build.properties 
! #echo servlet.jar = $(find-jar servlet_2_4_api) >> build.properties 
! #echo junit.jar = $(find-jar junit) >> build.properties 
! #echo commons-beanutils.jar = $(find-jar commons-beanutils) >> build.properties 
! #echo commons-collections.jar = $(find-jar commons-collections) >> build.properties 
! #echo commons-logging.jar = $(find-jar commons-logging) >> build.properties 
  
  %build
  export OPT_JAR_LIST="ant/ant-junit junit"
! export CLASSPATH=$(build-classpath xerces-j2 servlet_2_4_api xml-commons-jaxp-1.3-apis jdom commons-beanutils commons-logging commons-collections jsp_2_0_api mockrunner/mockrunner)
! CLASSPATH=${CLASSPATH}:`pwd`/target/classes:`pwd`/target/test-classes
! ant -Dbuild.sysclasspath=only jar javadoc
  
  %install
  rm -rf $RPM_BUILD_ROOT
- 
  install -Dpm 644 target/%{base_name}.jar \
    $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
--- 76,108 ----
  JavaBeans, Maps, Servlet contexts, DOM etc, including mixtures thereof.
  
! %package        javadoc
  Summary:        Javadoc for %{name}
  Group:          Development/Documentation
  
! %description    javadoc
  Javadoc for %{name}
  
  %prep
! %setup -q -n %{base_name}-%{version}
! 
! %patch0
  
  %build
  export OPT_JAR_LIST="ant/ant-junit junit"
! export CLASSPATH=$(build-classpath \
! xerces-j2 \
! tomcat5-jsp-2.0-api \
! servletapi5 \
! xml-commons-apis \
! jdom \
! commons-beanutils \
! commons-logging \
! commons-collections)
! CLASSPATH=$CLASSPATH:target/classes:target/test-classes
! ant -Dbuild.sysclasspath=only test jar javadoc
! 
  
  %install
  rm -rf $RPM_BUILD_ROOT
  install -Dpm 644 target/%{base_name}.jar \
    $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
***************
*** 106,137 ****
  ln -s %{base_name}-%{version}.jar \
    $RPM_BUILD_ROOT%{_javadir}/%{base_name}.jar
! install -dm 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
! cp -pr dist/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
! ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
! ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{base_name}-%{version}
! ln -s %{base_name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{base_name}
  
  %clean
  rm -rf $RPM_BUILD_ROOT
  
  %files
! %defattr(0644,root,root,0755)
  %doc LICENSE.txt
! %{_javadir}/%{name}-%{version}.jar
! %{_javadir}/%{name}.jar
! %{_javadir}/%{base_name}-%{version}.jar
! %{_javadir}/%{base_name}.jar
  
  %files javadoc
! %defattr(0644,root,root,0755)
! %{_javadocdir}/%{name}-%{version}
! %{_javadocdir}/%{name}
! %{_javadocdir}/%{base_name}-%{version}
! %{_javadocdir}/%{base_name}
  
  %changelog
! * Fri Oct 03 2008 David Walluck <dwalluck at redhat.com> 0:1.3-1
! - 1.3
! - add javadoc symlinks
  
  * Wed Jun 07 2006 Fernando Nasser <fnasser at redhat.com> - 0:1.2-2jpp
--- 112,154 ----
  ln -s %{base_name}-%{version}.jar \
    $RPM_BUILD_ROOT%{_javadir}/%{base_name}.jar
! 
! install -dm 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
! cp -pr dist/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
! 
! # Install pom
! install -dm 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
! cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/maven2/poms
! %add_to_maven_depmap commons-jxpath commons-jxpath %{version} JPP %{name} 
  
  %clean
  rm -rf $RPM_BUILD_ROOT
  
+ %post
+ %update_maven_depmap
+ 
+ %postun
+ %update_maven_depmap
+ 
  %files
! %defattr(-,root,root,-)
! %{_datadir}/maven2
! %{_mavendepmapfragdir}
  %doc LICENSE.txt
! %{_javadir}/*.jar
  
  %files javadoc
! %defattr(-,root,root,-)
! %doc %{_javadocdir}/%{name}
  
  %changelog
! * Thu Feb 05 2009 Yong Yang <yyang at redhat.com> - 0:1.2-4
! - Fix release tag
! 
! * Thu Jan 08 2009 Yong Yang <yyang at redhat.com> - 0:1.2-3jpp.1
! - Import from dbhole's maven 2.0.8 packages, initial building
! 
! * Wed Apr 09 2008 Deepak Bhole <dbhole at redhat.com> - 0:1.2-2jpp.1
! - Import from JPackage
! - Added pom file
  
  * Wed Jun 07 2006 Fernando Nasser <fnasser at redhat.com> - 0:1.2-2jpp

--- NEW FILE: commons-jxpath-1.2.pom ---
<project>
  <modelVersion>4.0.0</modelVersion>
  <groupId>commons-jxpath</groupId>
  <artifactId>commons-jxpath</artifactId>
  <name>JXPath</name>
  <version>1.2</version>
  <description>A package of Java utility methods for accessing and modifying object properties</description>
  <url>http://jakarta.apache.org/commons/${pom.artifactId.substring(8)}/</url>
  <issueManagement>
    <url>http://issues.apache.org/bugzilla/</url>
  </issueManagement>
  <ciManagement>
    <notifiers>
      <notifier>
        <configuration>
          <address>commons-dev at jakarta.apache.org</address>
        </configuration>
      </notifier>
    </notifiers>
  </ciManagement>
  <inceptionYear>2001</inceptionYear>
  <mailingLists>
    <mailingList>
      <name>Commons Dev List</name>
      <subscribe>commons-dev-subscribe at jakarta.apache.org</subscribe>
      <unsubscribe>commons-dev-unsubscribe at jakarta.apache.org</unsubscribe>
      <archive>http://nagoya.apache.org/eyebrowse/SummarizeList?listName=commons-dev@jakarta.apache.org</archive>
    </mailingList>
    <mailingList>
      <name>Commons User List</name>
      <subscribe>commons-user-subscribe at jakarta.apache.org</subscribe>
      <unsubscribe>commons-user-unsubscribe at jakarta.apache.org</unsubscribe>
      <archive>http://nagoya.apache.org/eyebrowse/SummarizeList?listName=commons-user@jakarta.apache.org</archive>
    </mailingList>
  </mailingLists>
  <developers>
    <developer>
      <id>dmitri</id>
      <name>Dmitri Plotnikov</name>
      <email>dmitri at apache.org</email>
      <organization></organization>
    </developer>
    <developer>
      <id>craigmcc</id>
      <name>Craig McClanahan</name>
      <email>Craig.McClanahan at eng.sun.com</email>
      <organization>Sun Microsystems</organization>
    </developer>
  </developers>
  <licenses>
    <license>
      <name>The Apache Software License, Version 2.0</name>
      <url>/LICENSE.txt</url>
    </license>
  </licenses>
  <scm>
    <connection>scm:cvs:pserver:anoncvs at cvs.apache.org:/home/cvspublic:jakarta-commons/${pom.artifactId.substring(8)}</connection>
    <url>http://cvs.apache.org/viewcvs/jakarta-commons/${pom.artifactId.substring(8)}/</url>
  </scm>
  <organization>
    <name>The Apache Software Foundation</name>
    <url>http://jakarta.apache.org</url>
  </organization>
  <build>
    <sourceDirectory>src/java</sourceDirectory>
    <testSourceDirectory>src/test</testSourceDirectory>
    <testResources>
      <testResource>
        <directory>${pom.build.unitTestSourceDirectory}</directory>
        <includes>
          <include>**/*.xml</include>
        </includes>
      </testResource>
    </testResources>
    <plugins>
      <plugin>
        <artifactId>maven-surefire-plugin</artifactId>
        <configuration>
          <includes>
            <include>**/*Test.java</include>
          </includes>
        </configuration>
      </plugin>
    </plugins>
  </build>
  <dependencies>
    <dependency>
      <groupId>xerces</groupId>
      <artifactId>xerces</artifactId>
      <version>1.2.3</version>
    </dependency>
    <dependency>
      <groupId>servletapi</groupId>
      <artifactId>servletapi</artifactId>
      <version>2.2</version>
    </dependency>
    <dependency>
      <groupId>junit</groupId>
      <artifactId>junit</artifactId>
      <version>3.8</version>
    </dependency>
    <dependency>
      <groupId>ant</groupId>
      <artifactId>ant-optional</artifactId>
      <version>1.5.1</version>
    </dependency>
    <dependency>
      <groupId>xml-apis</groupId>
      <artifactId>xml-apis</artifactId>
      <version>2.0.2</version>
    </dependency>
    <dependency>
      <groupId>jdom</groupId>
      <artifactId>jdom</artifactId>
      <version>b9</version>
    </dependency>
    <dependency>
      <groupId>commons-beanutils</groupId>
      <artifactId>commons-beanutils</artifactId>
      <version>1.4</version>
    </dependency>
    <dependency>
      <groupId>commons-logging</groupId>
      <artifactId>commons-logging</artifactId>
      <version>1.0</version>
    </dependency>
    <dependency>
      <groupId>commons-collections</groupId>
      <artifactId>commons-collections</artifactId>
      <version>2.0</version>
    </dependency>
  </dependencies>
  <distributionManagement>
    <repository>
      <id>default</id>
      <name>Default Repository</name>
      <url>file:///www/jakarta.apache.org/builds/jakarta-commons/${pom.artifactId.substring(8)}/</url>
    </repository>
    <site>
      <id>default</id>
      <name>Default Site</name>
      <url>scp://jakarta.apache.org//www/jakarta.apache.org/commons/${pom.artifactId.substring(8)}/</url>
    </site>
  </distributionManagement>
</project>
--- NEW FILE: jakarta-commons-jxpath-1.2-jvm15.patch ---
diff -up ./build.xml.sav ./build.xml
--- ./build.xml.sav	2008-04-09 15:05:46.000000000 -0400
+++ ./build.xml	2008-04-09 15:11:41.000000000 -0400
@@ -22,6 +22,8 @@
   </property>
   <property name="final.name" value="commons-jxpath">
   </property>
+  <property name="source.version" value="1.4"/>
+  <property name="target.version" value="1.4"/>
   <target name="init" description="o Initializes some properties">
     <mkdir dir="${libdir}">
     </mkdir>
@@ -33,7 +35,7 @@
   <target name="compile" description="o Compile the code" depends="get-deps">
     <mkdir dir="${classesdir}">
     </mkdir>
-    <javac destdir="${classesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html">
+    <javac source="${source.version}" target="${target.version}" destdir="${classesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html">
       <src>
         <pathelement location="${basedir}/src/java">
         </pathelement>
@@ -107,7 +109,7 @@
   <target name="compile-tests" depends="compile">
     <mkdir dir="${testclassesdir}">
     </mkdir>
-    <javac destdir="${testclassesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html">
+    <javac source="${source.version}" target="${target.version}" destdir="${testclassesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html">
       <src>
         <pathelement location="${basedir}/src/test">
         </pathelement>
@@ -139,7 +141,7 @@
     </property>
     <property name="title" value="JXPath 1.2 API">
     </property>
-    <javadoc use="true" private="true" destdir="${javadocdir}" author="true" version="true" sourcepath="src/java" packagenames="*">
+    <javadoc source="${source.version}" use="true" private="true" destdir="${javadocdir}" author="true" version="true" sourcepath="src/java" packagenames="*">
       <classpath>
         <fileset dir="${libdir}">
           <include name="*.jar">
@@ -182,4 +184,4 @@
     <unjar dest="${maven.home}" src="${user.home}/maven-install-latest.jar">
     </unjar>
   </target>
-</project>
\ No newline at end of file
+</project>




More information about the JPackage-commits mailing list