[Jpackage-commits] dist/xalan-j2/JPP-6 xalan-j2-XALANJ-2376.patch, 1.1, 1.2 xalan-j2.spec, 1.8, 1.9

jpackage-guest jpackage-guest at ryu.zarb.org
Wed Jul 29 08:22:12 CEST 2009


Update of /home/projects/jpackage/cvs/dist/xalan-j2/JPP-6
In directory ryu.zarb.org:/tmp/cvs-serv17299

Modified Files:
	xalan-j2-XALANJ-2376.patch xalan-j2.spec 
Log Message:
2.7.1

Index: xalan-j2-XALANJ-2376.patch
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/xalan-j2/JPP-6/xalan-j2-XALANJ-2376.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** xalan-j2-XALANJ-2376.patch	3 Jun 2008 16:29:07 -0000	1.1
--- xalan-j2-XALANJ-2376.patch	29 Jul 2009 06:22:10 -0000	1.2
***************
*** 1,11 ****
! --- src/org/apache/xalan/processor/TransformerFactoryImpl.java.org	2007-04-10 18:03:35.000000000 +0200
! +++ src/org/apache/xalan/processor/TransformerFactoryImpl.java	2007-04-10 17:42:58.000000000 +0200
! @@ -999,7 +999,7 @@
!    }
!  
!    /** The error listener.   */
! -  private ErrorListener m_errorListener = new org.apache.xml.utils.DefaultErrorHandler(false);
! +  private ErrorListener m_errorListener = new org.apache.xml.utils.DefaultErrorHandler(true);
!  
!    /**
!     * Get the error listener in effect for the TransformerFactory.
--- 1,11 ----
! --- src/org/apache/xalan/processor/TransformerFactoryImpl.java.orig	2009-07-29 12:45:51.000000000 +0800
! +++ src/org/apache/xalan/processor/TransformerFactoryImpl.java	2009-07-29 12:46:44.000000000 +0800
! @@ -1001,7 +1001,7 @@
!    }
!  
!    /** The error listener.   */
! -  private ErrorListener m_errorListener = new org.apache.xml.utils.DefaultErrorHandler(false);
! +  private ErrorListener m_errorListener = new org.apache.xml.utils.DefaultErrorHandler(true);
!  
!    /**
!     * Get the error listener in effect for the TransformerFactory.

Index: xalan-j2.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/xalan-j2/JPP-6/xalan-j2.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -C 2 -d -r1.8 -r1.9
*** xalan-j2.spec	29 Jul 2009 02:47:06 -0000	1.8
--- xalan-j2.spec	29 Jul 2009 06:22:10 -0000	1.9
***************
*** 60,66 ****
  Source0:        http://www.apache.org/dist/xml/xalan-j/xalan-j_%{cvs_version}-src.tar.gz
  Source1:        xalan-j2-2.7.0-component-info.xml
! Patch0:         %{name}-noxsltcdeps.patch
! Patch1:         %{name}-manifest.patch
! Patch2:         %{name}-crosslink.patch
  # Fix the XALANJ-2376:
  #TransformerFactory.newTransformer(source) returns null instead throwing
--- 60,66 ----
  Source0:        http://www.apache.org/dist/xml/xalan-j/xalan-j_%{cvs_version}-src.tar.gz
  Source1:        xalan-j2-2.7.0-component-info.xml
! #Patch0:         %{name}-noxsltcdeps.patch
! #Patch1:         %{name}-manifest.patch
! #Patch2:         %{name}-crosslink.patch
  # Fix the XALANJ-2376:
  #TransformerFactory.newTransformer(source) returns null instead throwing
***************
*** 68,72 ****
  #return null.
  Patch3:         %{name}-XALANJ-2376.patch
! Patch4:         %{name}-XALANJ-2321-AVT.patch
  URL:            http://xalan.apache.org/
  Group:          Text Processing/Markup/XML
--- 68,72 ----
  #return null.
  Patch3:         %{name}-XALANJ-2376.patch
! #Patch4:         %{name}-XALANJ-2321-AVT.patch
  URL:            http://xalan.apache.org/
  Group:          Text Processing/Markup/XML
***************
*** 157,165 ****
  %prep
  %setup -q -n xalan-j_%{cvs_version}
! %patch0 -p0
! %patch1 -p0
! %patch2 -p0
  %patch3 -p0
! %patch4 -p0
  # Remove all binary libs, except ones needed to build docs and N/A elsewhere.
  for j in $(find . -name "*.jar"); do
--- 157,166 ----
  %prep
  %setup -q -n xalan-j_%{cvs_version}
! #%patch0 -p0
! #%patch1 -p0
! #%patch2 -p0
  %patch3 -p0
! # has been merged into 2.7.1 sources
! #%patch4 -p0
  # Remove all binary libs, except ones needed to build docs and N/A elsewhere.
  for j in $(find . -name "*.jar"); do
***************
*** 262,270 ****
  install -d -m 755 $RPM_BUILD_ROOT%{repodirsrc}
  install -p -m 644 %{SOURCE0} $RPM_BUILD_ROOT%{repodirsrc}
! install -p -m 644 %{PATCH0} $RPM_BUILD_ROOT%{repodirsrc}
! install -p -m 644 %{PATCH1} $RPM_BUILD_ROOT%{repodirsrc}
! install -p -m 644 %{PATCH2} $RPM_BUILD_ROOT%{repodirsrc}
  install -p -m 644 %{PATCH3} $RPM_BUILD_ROOT%{repodirsrc}
! install -p -m 644 %{PATCH4} $RPM_BUILD_ROOT%{repodirsrc}
  cp -p $RPM_BUILD_ROOT%{_javadir}/serializer.jar $RPM_BUILD_ROOT%{repodirlib}/serializer.jar
  cp -p $RPM_BUILD_ROOT%{_javadir}/xalan.jar $RPM_BUILD_ROOT%{repodirlib}/xalan.jar
--- 263,271 ----
  install -d -m 755 $RPM_BUILD_ROOT%{repodirsrc}
  install -p -m 644 %{SOURCE0} $RPM_BUILD_ROOT%{repodirsrc}
! #install -p -m 644 %{PATCH0} $RPM_BUILD_ROOT%{repodirsrc}
! #install -p -m 644 %{PATCH1} $RPM_BUILD_ROOT%{repodirsrc}
! #install -p -m 644 %{PATCH2} $RPM_BUILD_ROOT%{repodirsrc}
  install -p -m 644 %{PATCH3} $RPM_BUILD_ROOT%{repodirsrc}
! #install -p -m 644 %{PATCH4} $RPM_BUILD_ROOT%{repodirsrc}
  cp -p $RPM_BUILD_ROOT%{_javadir}/serializer.jar $RPM_BUILD_ROOT%{repodirlib}/serializer.jar
  cp -p $RPM_BUILD_ROOT%{_javadir}/xalan.jar $RPM_BUILD_ROOT%{repodirlib}/xalan.jar
***************
*** 351,355 ****
  %files
  %defattr(0644,root,root,0755)
! %doc KEYS licenses/xalan.LICENSE.txt licenses/xalan.NOTICE.txt licenses/serializer.LICENSE.txt licenses/serializer.NOTICE.txt
  %{_javadir}/%{name}-%{version}.jar
  %{_javadir}/%{name}.jar
--- 352,356 ----
  %files
  %defattr(0644,root,root,0755)
! %doc KEYS LICENSE.txt NOTICE.txt readme.html
  %{_javadir}/%{name}-%{version}.jar
  %{_javadir}/%{name}.jar




More information about the JPackage-commits mailing list