[Jpackage-commits] dist/xom/devel .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 xom-1.1.pom, NONE, 1.1 xom.spec, 1.1, 1.2

jpackage jpackage at ryu.zarb.org
Wed May 28 22:22:57 CEST 2008


Update of /home/projects/jpackage/cvs/dist/xom/devel
In directory ryu.zarb.org:/tmp/cvs-serv26894/devel

Modified Files:
	.cvsignore sources xom.spec 
Added Files:
	xom-1.1.pom 
Log Message:
Import from JPP 5.0

Index: .cvsignore
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/xom/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -C 2 -d -r1.2 -r1.3
*** .cvsignore	28 May 2008 20:22:17 -0000	1.2
--- .cvsignore	28 May 2008 20:22:55 -0000	1.3
***************
*** 1 ****
! xom-1.0.tar.gz
--- 1,2 ----
! jaxen-1.1.1-src.tar.gz
! xom-1.1-src.tar.gz

Index: sources
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/xom/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -C 2 -d -r1.2 -r1.3
*** sources	28 May 2008 20:22:17 -0000	1.2
--- sources	28 May 2008 20:22:55 -0000	1.3
***************
*** 1 ****
! af472e90685eef0ac1e731eb84a49763  xom-1.0.tar.gz
--- 1,2 ----
! b598ae6b7e765a92e13667b0a80392f4  jaxen-1.1.1-src.tar.gz
! e5ae82568d7b1faeb950140c34fbbcb1  xom-1.1-src.tar.gz

--- NEW FILE: xom-1.1.pom ---
<project>
  <modelVersion>4.0.0</modelVersion>
  <groupId>xom</groupId>
  <artifactId>xom</artifactId>
  <name>xom</name>
  <version>1.1</version>
  <url>http://www.xom.nu</url>
  <ciManagement>
    <notifiers>
      <notifier>
        <configuration>
          <address>elharo at metalab.unc.edu</address>
        </configuration>
      </notifier>
    </notifiers>
  </ciManagement>
  <inceptionYear>2002</inceptionYear>
  <mailingLists>
    <mailingList>
      <name>XOM Interest Mailing List</name>
      <archive>http://lists.ibiblio.org/pipermail/xom-interest/</archive>
    </mailingList>
  </mailingLists>
  <developers>
    <developer>
      <id>elharo</id>
      <name>Elliotte Rusty Harold</name>
      <email>elharo at metalab.unc.edu</email>
      <organization>Cafe au Lait</organization>
    </developer>
  </developers>
  <build>
    <sourceDirectory>src</sourceDirectory>
    <testSourceDirectory>src</testSourceDirectory>
    <plugins>
      <plugin>
        <artifactId>surefire</artifactId>
        <configuration>
          <includes>
            <include>**/*Test.java</include>
          </includes>
        </configuration>
      </plugin>
    </plugins>
  </build>
  <dependencies>
    <dependency>
      <groupId>xerces</groupId>
      <artifactId>xmlParserAPIs</artifactId>
      <version>2.6.2</version>
    </dependency>
    <dependency>
      <groupId>xerces</groupId>
      <artifactId>xercesImpl</artifactId>
      <version>2.6.2</version>
    </dependency>
    <dependency>
      <groupId>xalan</groupId>
      <artifactId>xalan</artifactId>
      <version>2.7.0</version>
    </dependency>
    <dependency>
      <groupId>jaxen</groupId>
      <artifactId>jaxen</artifactId>
      <version>1.1-beta-8</version>
    </dependency>
  </dependencies>
</project>
Index: xom.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/xom/devel/xom.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** xom.spec	28 May 2008 20:22:17 -0000	1.1
--- xom.spec	28 May 2008 20:22:55 -0000	1.2
***************
*** 1,3 ****
! # Copyright (c) 2000-2005, JPackage Project
  # All rights reserved.
  #
--- 1,3 ----
! # Copyright (c) 2000-2008, JPackage Project
  # All rights reserved.
  #
***************
*** 29,66 ****
  #
  
  %define section free
  
  Summary:        XML Pull Parser
  Name:           xom
! Version:        1.0
! Release:        3jpp
  Epoch:          0
  License:        LGPL
  URL:            http://www.xom.nu
  Group:          Text Processing/Markup/XML
! Source0:        http://www.cafeconleche.org/XOM/xom-1.0.tar.gz
! BuildRequires:  jpackage-utils >= 0:1.6
! BuildRequires:  ant >= 0:1.6
  BuildRequires:  ant-junit
- #BuildRequires:  clover10
  BuildRequires:  junit
- BuildRequires:  dom4j
  BuildRequires:  xalan-j2
  BuildRequires:  xerces-j2
  BuildRequires:  icu4j
! BuildRequires:  xml-commons-apis
  
  BuildRequires:  tagsoup
  BuildRequires:  saxon
  BuildRequires:  classpathx-jaxp
! BuildRequires:  xml-commons-resolver
! BuildRequires:  servlet
! 
  Requires:  xalan-j2
  Requires:  xerces-j2
  Requires:  icu4j
! Requires:  xml-commons-apis
  BuildArch:      noarch
  BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
  
  %description
--- 29,86 ----
  #
  
+ %define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
+ 
+ %define bootstrap %{?_with_bootstrap:1}%{!?_with_bootstrap:%{?_without_bootstrap:0}%{!?_without_bootstrap:%{?_bootstrap:%{_bootstrap}}%{!?_bootstrap:0}}}
+ 
  %define section free
  
  Summary:        XML Pull Parser
  Name:           xom
! Version:        1.1
! Release:        1jpp
  Epoch:          0
  License:        LGPL
  URL:            http://www.xom.nu
  Group:          Text Processing/Markup/XML
! Vendor: %{?_vendorinfo:%{_vendorinfo}}%{!?_vendorinfo:%{_vendor}}
! Distribution: %{?_distribution:%{_distribution}}%{!?_distribution:%{_vendor}}
! Source0:        http://www.cafeconleche.org/XOM/xom-1.1-src.tar.gz
! Source1:        http://repo1.maven.org/maven2/xom/xom/1.1/xom-1.1.pom
! Source2:        jaxen-1.1.1-src.tar.gz
! BuildRequires:  jpackage-utils >= 0:1.7.4
! BuildRequires:  java-devel = 0:1.5.0
! BuildRequires:  ant >= 0:1.6.5
  BuildRequires:  ant-junit
  BuildRequires:  junit
  BuildRequires:  xalan-j2
  BuildRequires:  xerces-j2
  BuildRequires:  icu4j
! BuildRequires:  xml-commons-jaxp-1.3-apis
  
+ %if ! %{bootstrap}
  BuildRequires:  tagsoup
  BuildRequires:  saxon
  BuildRequires:  classpathx-jaxp
! BuildRequires:  xml-commons-resolver11
! BuildRequires:  servlet_2_4_api
! %endif
! Requires:  java >= 0:1.5.0
  Requires:  xalan-j2
  Requires:  xerces-j2
  Requires:  icu4j
! Requires:  xml-commons-jaxp-1.3-apis
! %if ! %{gcj_support}
  BuildArch:      noarch
+ %endif
  BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+ Requires(post):    jpackage-utils >= 0:1.7.4
+ Requires(postun):  jpackage-utils >= 0:1.7.4
+ 
+ %if %{gcj_support}
+ BuildRequires:    gnu-crypto
+ BuildRequires:    java-gcj-compat-devel
+ Requires(post):   java-gcj-compat
+ Requires(postun): java-gcj-compat
+ %endif
  
  %description
***************
*** 76,83 ****
--- 96,106 ----
  Summary:        Javadoc for %{name}
  Group:          Development/Documentation
+ Requires(post):   /bin/rm,/bin/ln
+ Requires(postun): /bin/rm
  
  %description javadoc
  %{summary}.
  
+ %if ! %{bootstrap}
  %package demo
  Summary:        Samples for %{name}
***************
*** 87,125 ****
  %description demo
  %{summary}.
  
  %prep
  %setup -q -n XOM
  # remove all binary libs
! find . -name "*.jar" -exec rm -f {} \;
! #for j in $(find . -name "*.jar"); do
! #    mv $j $j.no
! #done
  
  %build
! #export CLASSPATH=$(build-classpath clover10)
! pushd lib
! ln -sf $(build-classpath junit) junit.jar
! ln -sf $(build-classpath xerces-j2) xercesImpl.jar
! ln -sf $(build-classpath xalan-j2) xalan.jar
! ln -sf $(build-classpath icu4j) normalizer.jar
! ln -sf $(build-classpath xml-commons-apis) xmlParserAPIs.jar
! popd
! mkdir lib2
! pushd lib2
! ln -sf $(build-classpath tagsoup) tagsoup-1.0rc1.jar
! ln -sf $(build-classpath saxon) saxon.jar
! ln -sf $(build-classpath classpathx-jaxp/gnujaxp) gnujaxp.jar
! ln -sf $(build-classpath xml-commons-resolver) resolver.jar
! DOM4J_PRESENT=$(build-classpath dom4j)
! if [ -n "$DOM4J_PRESENT" ]; then
! ln -sf $(build-classpath dom4j) dom4j-1.5.1.jar
! fi
! ln -sf $(build-classpath servlet) servlet.jar
! popd
! 
! export OPT_JAR_LIST="ant/ant-trax ant/ant-junit junit"
  export CLASSPATH=$(build-classpath xalan-j2-serializer)
! #ant jar samples betterdoc test
! ant -Dbuild.sysclasspath=first jar samples betterdoc test
  
  %install
--- 110,147 ----
  %description demo
  %{summary}.
+ %endif
  
  %prep
  %setup -q -n XOM
  # remove all binary libs
! #find . -name "*.jar" -exec rm -f {} \;
! for j in $(find . -name "*.jar"); do
!     mv $j $j.no
! done
! gzip -dc %{SOURCE2} | tar xf -
! mkdir build
! mv jaxen-1.1.1 build/jaxen
  
  %build
! export JAVA_HOME=%{_jvmdir}/java-1.5.0
  export CLASSPATH=$(build-classpath xalan-j2-serializer)
! 
! ant -Dbuild.sysclasspath=first \
!     -Dxml-apis.jar=$(build-classpath xml-commons-jaxp-1.3-apis) \
!     -Dparser.jar=$(build-classpath xerces-j2) \
!     -Dxslt.jar=$(build-classpath xalan-j2) \
!     -Dserializer.jar=$(build-classpath xalan-j2-serializer) \
!     -Dtagsoup.jar=$(build-classpath tagsoup) \
!     -Djunit.jar=$(build-classpath junit) \
!     -Dsaxon6.jar=$(build-classpath saxon) \
!     -Dsaxon7.jar=$(build-classpath saxon7) \
!     -Dgnujaxp.jar=$(build-classpath classpathx-jaxp) \
!     -Dresolver.jar=$(build-classpath xml-commons-resolver11) \
!     -Ddom4j.jar=$(build-classpath dom4j) \
!     -Dservlet.jar=$(build-classpath servlet_2_4_api) \
!     jar javadoc \
! %if ! %{bootstrap}
!     samples betterdoc test
! %endif
  
  %install
***************
*** 132,139 ****
    $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
  (cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}.jar; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
  
  # javadoc
  install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
! cp -pr apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
  ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
  
--- 154,167 ----
    $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
  (cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}.jar; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
+ %add_to_maven_depmap %{name} %{name} %{version} JPP %{name}
+ 
+ # poms
+ install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
+ install -pm 644 %{SOURCE1} \
+     $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}.pom
  
  # javadoc
  install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
! cp -pr build/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
  ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
  
***************
*** 146,153 ****
--- 174,188 ----
  install -m 644 *.txt $RPM_BUILD_ROOT%{_datadir}/doc/%{name}-%{version}
  
+ %if ! %{bootstrap}
  # demo
  install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}
  install -m 644 build/xom-samples.jar $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}
  install -m 644 xom.graffle $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}
+ %endif
+ 
+ %if %{gcj_support}
+ export CLASSPATH=$(build-classpath gnu-crypto)
+ %{_bindir}/aot-compile-rpm
+ %endif
  
  %clean
***************
*** 163,166 ****
--- 198,219 ----
  fi
  
+ %post
+ %update_maven_depmap
+ %if %{gcj_support}
+ if [ -x %{_bindir}/rebuild-gcj-db ]
+ then
+   %{_bindir}/rebuild-gcj-db
+ fi
+ %endif
+ 
+ %postun
+ %update_maven_depmap
+ %if %{gcj_support}
+ if [ -x %{_bindir}/rebuild-gcj-db ]
+ then
+   %{_bindir}/rebuild-gcj-db
+ fi
+ %endif
+ 
  %files
  %defattr(0644,root,root,0755)
***************
*** 170,176 ****
--- 223,236 ----
  %{_datadir}/doc/%{name}-%{version}/Todo.txt
  %{_datadir}/doc/%{name}-%{version}/lgpl.txt
+ %if ! %{bootstrap}
  %{_datadir}/%{name}-%{version}/xom.graffle
+ %endif
  %{_javadir}/%{name}.jar
  %{_javadir}/%{name}-%{version}.jar
+ %{_datadir}/maven2/poms/*
+ %{_mavendepmapfragdir}
+ %if %{gcj_support}
+ %attr(-,root,root) %{_libdir}/gcj/%{name}
+ %endif
  
  %files javadoc
***************
*** 179,198 ****
  %ghost %{_javadocdir}/%{name}
  
  %files demo
  %defattr(0644,root,root,0755)
  %{_datadir}/%{name}-%{version}/xom-samples.jar
  
  %changelog
! * Wed Mar 05 2008 Fernando Nasser <fnasser at redhat.com> - 0:1.0-3jpp
!   From Ralph Apel <r.apel at r-apel.de>:
! - export OPT_JAR_LIST
! - Add xalan-j2-serializer to classpath to vaoid total failure of
!   nu.xom.tests.XSLTransformTest
  
! * Mon Mar 12 2007 Fernando Nasser <fnasser at redhat.com> - 0:1.0-2jpp.ep1.1
! - Add missing BR for dom4j and ant-junit
  
! * Tue Feb 28 2006 Fernando Nasser <fnasser at redhat.com> - 0:1.0-2jpp_1rh
! - First Red Hat release
  - Remove dependency on clover10 (non-free)
  
--- 239,261 ----
  %ghost %{_javadocdir}/%{name}
  
+ %if ! %{bootstrap}
  %files demo
  %defattr(0644,root,root,0755)
  %{_datadir}/%{name}-%{version}/xom-samples.jar
+ %endif
  
  %changelog
! * Thu Jan 31 2008 Ralph Apel <r.apel at r-apel.de> - 0:1.1-1jpp
! - 1.1
! - Add pom and depmap frags
  
! * Wed May 09 2007 Ralph Apel <r.apel at r-apel.de> - 0:1.0-5jpp
! - Make Vendor, Distribution based on macro
  
! * Mon Feb 12 2007 Ralph Apel <r.apel at r-apel.de> - 0:1.0-4jpp
! - Add option to build core on bootstrap
! - Add gcj_support option
! 
! * Tue Feb 28 2006 Fernando Nasser <fnasser at redhat.com> - 0:1.0-3jpp
  - Remove dependency on clover10 (non-free)
  




More information about the JPackage-commits mailing list