[Jpackage-commits] dist/dom4j/JPP-5 dom4j-1.6.1-bug1618750.patch, NONE, 1.1 dom4j-1.6.1-component-info.xml, NONE, 1.1 dom4j-1.6.1-endorsed-dir.patch, NONE, 1.1 dom4j.spec, 1.1, 1.2

jpackage jpackage at ryu.zarb.org
Fri May 30 21:47:47 CEST 2008


Update of /home/projects/jpackage/cvs/dist/dom4j/JPP-5
In directory ryu.zarb.org:/tmp/cvs-serv27323

Modified Files:
	dom4j.spec 
Added Files:
	dom4j-1.6.1-bug1618750.patch dom4j-1.6.1-component-info.xml 
	dom4j-1.6.1-endorsed-dir.patch 
Log Message:
Re-sync with devel

--- NEW FILE: dom4j-1.6.1-endorsed-dir.patch ---
diff -ubr --exclude CVS dom4j-1.6.1/build.xml dom4j/build.xml
--- dom4j-1.6.1/build.xml	2005-05-16 09:28:41.000000000 -0400
+++ dom4j-1.6.1/build.xml	2005-05-25 09:35:15.000000000 -0400
@@ -146,6 +146,8 @@
            source="1.3"
            deprecation="${deprecation}"
            classpathref="compile.classpath">
+      <compilerarg compiler="javac1.5" value="-endorseddirs"/>
+      <compilerarg compiler="javac1.5" value="./lib/endorsed"/> 
     </javac>
   </target>
 

--- NEW FILE: dom4j-1.6.1-bug1618750.patch ---
--- dom4j-1.6.1/src/java/org/dom4j/util/SimpleSingleton.java~	2005-05-16 15:28:30.000000000 +0200
+++ dom4j-1.6.1/src/java/org/dom4j/util/SimpleSingleton.java	2007-07-06 10:09:03.000000000 +0200
@@ -35,8 +35,7 @@
         if (singletonClassName != null) {
             Class clazz = null;
             try {
-                clazz = Thread.currentThread().getContextClassLoader().loadClass(
-                        singletonClassName);
+                clazz = Class.forName(singletonClassName);
                 singletonInstance = clazz.newInstance();
             } catch (Exception ignore) {
                 try {

Index: dom4j.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/dom4j/JPP-5/dom4j.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** dom4j.spec	28 May 2008 18:05:07 -0000	1.1
--- dom4j.spec	30 May 2008 19:47:45 -0000	1.2
***************
*** 33,36 ****
--- 33,47 ----
  %define bootstrap %{?_with_bootstrap:1}%{!?_with_bootstrap:%{?_without_bootstrap:0}%{!?_without_bootstrap:%{?_bootstrap:%{_bootstrap}}%{!?_bootstrap:0}}}
  
+ # If you want repolib package to be built,
+ # issue the following: 'rpmbuild --with repolib'
+ 
+ %define _with_repolib 1
+ 
+ %define with_repolib %{?_with_repolib:1}%{!?_with_repolib:0}
+ %define without_repolib %{!?_with_repolib:1}%{?_with_repolib:0}
+ 
+ %define repodir %{_javadir}/repository.jboss.com/dom4j/1.6.1-brew
+ %define repodirlib %{repodir}/lib
+ %define repodirsrc %{repodir}/src
  %define section free
  
***************
*** 38,61 ****
  Name:           dom4j
  Version:        1.6.1
! Release:        5jpp
  Epoch:          0
  License:        BSD-style
  URL:            http://www.dom4j.org/
  Group:          Text Processing/Markup/XML
- Vendor: %{?_vendorinfo:%{_vendorinfo}}%{!?_vendorinfo:%{_vendor}}
- Distribution: %{?_distribution:%{_distribution}}%{!?_distribution:%{_vendor}}
  Source0:        dom4j-1.6.1.tar.gz
  Source1:        dom4j_rundemo.sh
  Source2:        dom4j-build.xml
  Source3:        http://repo1.maven.org/maven2/dom4j/dom4j/1.6.1/dom4j-1.6.1.pom
  Patch0:         dom4j-1.6.1-build_xml.patch
  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:  jtidy
  BuildRequires:  junitperf
  BuildRequires:  isorelax
  %if %{bootstrap}
  BuildRequires:  jaxen-bootstrap >= 0:1.1-1
--- 49,76 ----
  Name:           dom4j
  Version:        1.6.1
! Release:        6%{?dist}
  Epoch:          0
  License:        BSD-style
  URL:            http://www.dom4j.org/
  Group:          Text Processing/Markup/XML
  Source0:        dom4j-1.6.1.tar.gz
  Source1:        dom4j_rundemo.sh
  Source2:        dom4j-build.xml
  Source3:        http://repo1.maven.org/maven2/dom4j/dom4j/1.6.1/dom4j-1.6.1.pom
+ Source4:	    dom4j-1.6.1-component-info.xml
  Patch0:         dom4j-1.6.1-build_xml.patch
+ Patch1:         dom4j-1.6.1-bug1618750.patch
+ Patch2:         dom4j-1.6.1-endorsed-dir.patch
  BuildRequires:  jpackage-utils >= 0:1.7.4
  BuildRequires:  java-devel = 0:1.5.0
  BuildRequires:  ant >= 0:1.6.5
  BuildRequires:  junit
+ BuildRequires:  ant-junit
+ BuildRequires:  ant-trax
+ BuildRequires:  ant-apache-resolver
  BuildRequires:  jtidy
  BuildRequires:  junitperf
  BuildRequires:  isorelax
+ #BuildRequires:  jaxen-bootstrap >= 0:1.1-0.b7
  %if %{bootstrap}
  BuildRequires:  jaxen-bootstrap >= 0:1.1-1
***************
*** 66,74 ****
  BuildRequires:  relaxngDatatype
  BuildRequires:  bea-stax
  BuildRequires:  stax_1_0_api
  BuildRequires:  ws-jaxme
! BuildRequires:  xalan-j2
  BuildRequires:  xerces-j2
! BuildRequires:  xml-commons-jaxp-1.1-apis
  BuildRequires:  xpp2
  BuildRequires:  xpp3
--- 81,90 ----
  BuildRequires:  relaxngDatatype
  BuildRequires:  bea-stax
+ #BuildRequires:  bea-stax-api
  BuildRequires:  stax_1_0_api
  BuildRequires:  ws-jaxme
! BuildRequires:  xalan-j2 >= 0:2.7
  BuildRequires:  xerces-j2
! BuildRequires:  xml-commons-jaxp-1.2-apis
  BuildRequires:  xpp2
  BuildRequires:  xpp3
***************
*** 88,100 ****
  %endif
  Requires:  bea-stax
  Requires:  stax_1_0_api
  Requires:  ws-jaxme
  Requires:  xalan-j2
! Requires:  xml-commons-jaxp-1.1-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
--- 104,116 ----
  %endif
  Requires:  bea-stax
+ #Requires:  bea-stax-api
  Requires:  stax_1_0_api
  Requires:  ws-jaxme
  Requires:  xalan-j2
! Requires:  xml-commons-jaxp-1.2-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
***************
*** 112,115 ****
--- 128,145 ----
  DOM and SAX and is seamlessly integrated with full XPath support. 
  
+ Note: To use the msv JARV factory (com.sun.msv.verifier.jarv.TheFactoryImpl)
+ make sure isorelax.jar (from the 'isorelax' RPM) is in the ClassPath.
+ 
+ %if %{with_repolib}
+ %package	 repolib
+ Summary:	 Artifacts to be uploaded to a repository library
+ Group:	Development/Libraries/Java
+ 
+ %description	 repolib
+ Artifacts to be uploaded to a repository library.
+ This package is not meant to be installed but so its contents
+ can be extracted through rpm2cpio
+ %endif
+ 
  %package demo
  Summary:        Samples for %{name}
***************
*** 149,157 ****
  # won't succeed in headless environment
  rm src/test/org/dom4j/bean/BeansTest.java
  # fix for deleted jars
  mv build.xml build.xml.orig
  sed -e '/unjar/d' -e 's|,cookbook/\*\*,|,|' build.xml.orig > build.xml
  
! %patch0 -b .sav
  
  %build
--- 179,195 ----
  # won't succeed in headless environment
  rm src/test/org/dom4j/bean/BeansTest.java
+ # FIXME Bug in Xalan 2.6 -- reactivate with Xalan 2.7
+ #rm src/test/org/dom4j/XPathExamplesTest.java
  # fix for deleted jars
  mv build.xml build.xml.orig
  sed -e '/unjar/d' -e 's|,cookbook/\*\*,|,|' build.xml.orig > build.xml
  
! %patch0 -p0 -b .sav
! %patch1 -p1
! #%patch2 -p1
! 
! 
! tag=`echo %{name}-%{version}-%{release} | sed 's|\.|_|g'`
! sed -i "s/@TAG@/$tag/g" %{SOURCE2}
  
  %build
***************
*** 161,165 ****
  ln -sf $(build-classpath relaxngDatatype)
  pushd endorsed
! ln -sf $(build-classpath xml-commons-jaxp-1.1-apis) 
  popd
  ln -sf $(build-classpath jaxme/jaxmeapi) 
--- 199,203 ----
  ln -sf $(build-classpath relaxngDatatype)
  pushd endorsed
! ln -sf $(build-classpath xml-commons-jaxp-1.2-apis) 
  popd
  ln -sf $(build-classpath jaxme/jaxmeapi) 
***************
*** 177,181 ****
  ln -sf $(build-classpath jaxme/jaxmexs) 
  ln -sf $(build-classpath xalan-j2) 
! ln -sf $(build-classpath xalan-j2-serializer)
  ln -sf $(build-classpath jaxme/jaxmejs) 
  ln -sf $(build-classpath jtidy) 
--- 215,219 ----
  ln -sf $(build-classpath jaxme/jaxmexs) 
  ln -sf $(build-classpath xalan-j2) 
! ln -sf $(build-classpath xalan-j2-serializer) 
  ln -sf $(build-classpath jaxme/jaxmejs) 
  ln -sf $(build-classpath jtidy) 
***************
*** 186,189 ****
--- 224,229 ----
  popd
  
+ export OPT_JAR_LIST=
+ export CLASSPATH=
  ant all samples test
  
***************
*** 225,228 ****
--- 265,278 ----
  %endif
  
+ %if %{with_repolib}
+ 	install -d -m 755 $RPM_BUILD_ROOT%{repodir}
+ 	install -d -m 755 $RPM_BUILD_ROOT%{repodirlib}
+ 	install -m 755 %{SOURCE4} $RPM_BUILD_ROOT%{repodir}/component-info.xml
+ 	install -d -m 755 $RPM_BUILD_ROOT%{repodirsrc}
+ 	install -m 755 %{PATCH0} $RPM_BUILD_ROOT%{repodirsrc}
+ 	install -m 755 %{SOURCE0} $RPM_BUILD_ROOT%{repodirsrc}
+ 	cp $RPM_BUILD_ROOT%{_javadir}/dom4j.jar $RPM_BUILD_ROOT%{repodirlib}
+ %endif
+ 
  %clean
  rm -rf $RPM_BUILD_ROOT
***************
*** 280,284 ****
--- 330,352 ----
  %{_datadir}/%{name}-%{version}
  
+ 
+ %if %{with_repolib}
+ %files repolib
+ %defattr(0644,root,root,0755)
+ %{repodir}
+ %endif
+ 
  %changelog
+ * Thu May 29 2008 Permaine Cheung <pcheung at redhat.com> 0:1.6.1-6
+ - First JPP 5 build
+ 
+ * Mon Apr 14 2008 David Walluck <dwalluck at redhat.com> 0:1.6.1-2jpp.ep1.3
+ - patch for jdk 1.5 support by setting java.endorsed.dir
+ - explicitly build with xml-commons-jaxp-1.2-apis
+ - patch for dom4j bug #1618750
+ - add xalan-j2-serializer for build
+ - unset CLASSPATH and OPT_JAR_LIST
+ - remove javadoc scriptlets
+ 
  * Wed Mar 05 2008 Ralph Apel <r.apel at r-apel.de> - 0:1.6.1-5jpp
  - Build with java5 for java5
***************
*** 289,292 ****
--- 357,371 ----
  - Make Vendor, Distribution based on macro
  
+ * Tue Mar 13 2007 Vivek Lakshmanan <vivekl at redhat.com> 0:1.6.1-2jpp.ep1.2
+ - Fix repolib location
+ 
+ * Tue Mar 13 2007 Fernando Nasser <fnasser at redhat.com> 0:1.6.1-2jpp.ep1.1
+ - Rebuild
+ 
+ * Thu Mar 08 2007 Fernando Nasser <fnasser at redhat.com> 0:1.6.1-2jpp.el4ep1.3
+ - Make isorelax (JARV) optional
+ - Reactivate test that used to fail with xalan 2.6 and require xalan-j2 2.7
+ - Disable tested that passed with xalan 2.6 and now fails with xalan 2.7
+ 
  * Wed Feb 21 2007 Ralph Apel <r.apel at r-apel.de> - 0:1.6.1-4jpp
  - Add bootstrap option to build against jaxen-bootstrap
***************
*** 294,300 ****
--- 373,389 ----
    available
  
+ * Mon Feb 19 2007 Vivek Lakshmanan <vivekl at redhat.com> 0:1.6.1-2jpp.el4ep1.2
+ - Add -brew suffix
+ 
+ * Fri Feb 16 2007 Vivek Lakshmanan <vivekl at redhat.com> 0:1.6.1-2jpp.el4ep1.1
+ - Add repolib support
+ 
  * Mon Feb 12 2007 Ralph Apel <r.apel at r-apel.de> - 0:1.6.1-3jpp
  - Add gcj_support option
  
+ * Sun Feb 26 2006 Fernando Nasser <fnasser at redhat.com> 0:1.6.1-2jpp_1rh
+ - Merge with upstream
+ - Remove one of the tests until Xalan is upgraded (bug in 2.6)
+ 
  * Mon Jan 30 2006 Ralph Apel <r.apel at r-apel.de> - 0:1.6.1-2jpp
  - Change STAX dependency to free bea-stax and bea-stax-api
***************
*** 304,307 ****
--- 393,399 ----
  - Now requires xpp3 additionally to xpp2
  
+ * Wed Apr 27 2005 Fernando Nasser <fnasser at redhat.com> 0:1.5-1jpp_1rh
+ - First Red Hat build
+ 
  * Thu Sep 09 2004 Ralph Apel <r.apel at r-apel.de> - 0:1.5-1jpp
  - Upgrade to 1.5

--- NEW FILE: dom4j-1.6.1-component-info.xml ---
<project name="dom4j-component-info">
   <component id="dom4j"
              licenseType="dom4j"
              version="1.6.1-brew"
              projectHome="http://dom4j.org/"
              description="Library for XML, XPath and XSLT on the Java platform"
              scm=":ext:cvs.devel.redhat.com:/cvs/dist/dom4j"
              tag="dom4j-1_6_1-2jpp_ep1_3_el4">
      <!-- Built using JDK 1.4 -->
      <artifact id="dom4j.jar"/>
      <export>
         <include input="dom4j.jar"/>
      </export>
   </component>
</project>




More information about the JPackage-commits mailing list