From 775254ff615514c8016cced07fd3bee20e28e03d754d8d1ed4934289ea6a4e67 Mon Sep 17 00:00:00 2001 From: Michal Vyskocil Date: Tue, 8 Jan 2013 13:11:16 +0000 Subject: [PATCH 1/2] D xerces-j2-bootstrap OBS-URL: https://build.opensuse.org/package/show/Java:packages/xerces-j2?expand=0&rev=19 --- xerces-j2-bootstrap.changes | 49 --------- xerces-j2-bootstrap.spec | 193 ------------------------------------ xerces-j2.spec | 17 +--- 3 files changed, 3 insertions(+), 256 deletions(-) delete mode 100644 xerces-j2-bootstrap.changes delete mode 100644 xerces-j2-bootstrap.spec diff --git a/xerces-j2-bootstrap.changes b/xerces-j2-bootstrap.changes deleted file mode 100644 index c9b5bfd..0000000 --- a/xerces-j2-bootstrap.changes +++ /dev/null @@ -1,49 +0,0 @@ -------------------------------------------------------------------- -Tue May 15 09:07:20 UTC 2012 - mvyskocil@suse.cz - -- ignore openjdk7 as well - -------------------------------------------------------------------- -Mon Mar 14 13:05:09 UTC 2011 - mvyskocil@suse.cz - -- build ignore openjdk - -------------------------------------------------------------------- -Thu Sep 2 12:36:17 UTC 2010 - mvyskocil@suse.cz - -- ignore antlr(-java) to reduce build cycles - -------------------------------------------------------------------- -Mon Aug 17 11:46:39 UTC 2009 - mvyskocil@suse.cz - -- fixed bnc#530717: VUL-0: xerces-j2: XML parsing vulnerability - -------------------------------------------------------------------- -Mon Jan 28 16:59:12 CET 2008 - ro@suse.de - -- explicitly buildreq antlr-bootstrap - -------------------------------------------------------------------- -Thu Jan 24 11:23:25 CET 2008 - skh@suse.de - -- fix build with gcj - -------------------------------------------------------------------- -Wed May 2 11:54:35 CEST 2007 - dbornkessel@suse.de - -- added unzip to BuildRequires - -------------------------------------------------------------------- -Wed Nov 15 14:19:05 CET 2006 - dbornkessel@suse.de - - -- Changed - PreReq: /usr/sbin/update-alternatives - to - PreReq: update-alternatives - -------------------------------------------------------------------- -Fri Sep 22 16:39:28 CEST 2006 - dbornkessel@suse.de - -- first version - diff --git a/xerces-j2-bootstrap.spec b/xerces-j2-bootstrap.spec deleted file mode 100644 index 5aea5bc..0000000 --- a/xerces-j2-bootstrap.spec +++ /dev/null @@ -1,193 +0,0 @@ -# -# spec file for package xerces-j2-bootstrap -# -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. -# -# All modifications and additions to the file contributed by third parties -# remain the property of their copyright owners, unless otherwise agreed -# upon. The license for this file, and modifications and additions to the -# file, is the same license as for the pristine package itself (unless the -# license for the pristine package is not an Open Source License, in which -# case the license is the MIT License). An "Open Source License" is a -# license that conforms to the Open Source Definition (Version 1.9) -# published by the Open Source Initiative. - -# Please submit bugfixes or comments via http://bugs.opensuse.org/ -# - -# norootforbuild - - -Name: xerces-j2-bootstrap -Url: http://xml.apache.org/xerces2-j/ -BuildRequires: antlr-bootstrap -BuildRequires: fastjar -BuildRequires: java-1_5_0-gcj-compat-devel -#!BuildIgnore: java-1_6_0-openjdk java-1_6_0-openjdk-devel -#!BuildIgnore: java-1_7_0-openjdk java-1_7_0-openjdk-devel -BuildRequires: unzip -BuildRequires: xml-commons-apis-bootstrap -BuildRequires: xml-commons-resolver-bootstrap -BuildRequires: xml-commons-which-bootstrap -BuildRequires: zip -#!BuildIgnore: antlr antlr-java -%if %{?!suse_version:1}0 -%if %{?!mandriva_release:1}0 -BuildRequires: chkconfig -%endif -%else -BuildRequires: update-alternatives -%endif -%define xerces_version_cvs 2_8_1 -%define real_name xerces-j2 -Summary: Java XML parser -Group: Development/Libraries/Java -Version: 2.8.1 -Release: 247 -Requires: xml-commons-which-bootstrap -Requires: xml-commons-apis-bootstrap -Requires: xml-commons-resolver-bootstrap -License: Apache-2.0 -Group: Development/Libraries/Java -AutoReqProv: on -Source0: Xerces-J-src.%{version}.tar.bz2 -Patch0: xerces-j2-gcj-switch-constants-bug.patch -Patch1: xerces-build.patch -#PATCH-FIX-UPSTREAM bnc#530717 -#http://svn.apache.org/viewvc?view=rev&revision=787352 -Patch3: xerces-j2-parsing.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-build -#BuildArchitectures: noarch -#ExclusiveArch: %ix86 -BuildArch: noarch -Provides: xerces-j2 - -%description -Welcome to the future! Xerces2 is the next generation of high -performance, fully compliant XML parsers in the Apache Xerces family. -This new version of Xerces introduces the Xerces Native Interface -(XNI), a complete framework for building parser components and -configurations that is extremely modular and easy to program. - -The Apache Xerces2 parser is the reference implementation of XNI but -other parser components, configurations, and parsers can be written -using the Xerces Native Interface. For complete design and -implementation documents, refer to the XNI Manual. - -Xerces 2 is a fully conforming XML Schema processor. For more -information, refer to the XML Schema page. - -Xerces 2 also provides a partial implementation of Document Object -Model Level 3 Core, Load and Save and Abstract Schemas [deprecated] -Working Drafts. For more information, refer to the DOM Level 3 -Implementation page. - - - -%prep -#<<< package descriptions end -#>>> %prep -%setup -n xerces-%{xerces_version_cvs} -%patch0 -%patch1 -%patch3 -p1 -b .parsing -#<<< -#>>> %build - -%build -#>>> some useful functions ... used throughout bootstrap packages -# variables: -TARGET_DIR=`pwd` -CLASSPATH_ORIG="$CLASSPATH" -LIB_GCJ="`ls %{_javadir}/libgcj-*.jar`" -export GC_MAXIMUM_HEAP_SIZE="134217728" -#>>> delete binary file and files not needed -function delBinaryFiles() { - set +x - echo deleting binary files ... - for file in `find . -name "*.class" -o -name "*.jar" -o -name "*DELETED-BY-PACKAGER*"` - do - rm -rf $file - done - set -x -} -#<<< -#>>> make a string with all jar files found in target folder that can be used for a classpath string -# string is saved in JAR_CLASSPATH -function mkTargetClasspath() { - set +x - JAR_CLASSPATH="" - for file in `find %{_javadir} -name "*.jar"` - do - JAR_CLASSPATH=$file:$JAR_CLASSPATH - done - set -x -} -#<<< -#>>> compiles all *.java file in the current directory tree -# uses mkTargetClasspath for CLASSPATH variable -# uses LIB_GCJ for CLASSPATH -function compileFiles() { - mkTargetClasspath - set +x - COMPILE_CLASSPATH_PATH=.:${JAR_CLASSPATH} - echo using: $COMPILER_COMMAND $$file - echo with classpath: $COMPILE_CLASSPATH_PATH - export CLASSPATH=$COMPILE_CLASSPATH_PATH - for file in `find . -name "*.java"` - do - echo -e "$COMPILER_COMMAND $file ... \c" - $COMPILER_COMMAND $file - # check for errors - if [ $? != 0 ] - then - echo ERROR - exit 1; - fi - echo done - done - set -x -} -#<<< -#>>> make jar archive -# PARAM#1: name of jar archive (without .jar suffix) -# uses $TARGET_DIR to move created jar to -function mkJar() { - find -name "version.txt" -or -name "*.class" -or -name "*.properties" -or -name "*.rsc" -or -name "*manifest*" |\ - xargs /usr/bin/fastjar -m manifest.* -cf ${1}.jar ; - mv ${1}.jar $TARGET_DIR -} -#<<< -COMPILER_COMMAND="javac -C " -#<<< end functions -delBinaryFiles -#>>> xerces-j2 -pushd src -compileFiles -mkJar %{name} -delBinaryFiles -popd -#<<< xerces end -#<<< -#>>> %install - -%install -#>>> ant -export NO_BRP_CHECK_BYTECODE_VERSION=true -mkdir -p $RPM_BUILD_ROOT%{_javadir} -cp %{name}.jar $RPM_BUILD_ROOT/%{_javadir}/ -#<<< -#<<< install end - -%clean -rm -rf $RPM_BUILD_ROOT -#>>> files - -%files -%defattr(-,root,root) -#%dir %{_javadir} -%{_javadir}/%{name}.jar -#<<< -# vim:fdm=marker:foldmarker=#>>>,#<<<:foldcolumn=6: - -%changelog diff --git a/xerces-j2.spec b/xerces-j2.spec index 11d4457..538f317 100644 --- a/xerces-j2.spec +++ b/xerces-j2.spec @@ -1,7 +1,7 @@ # # spec file for package xerces-j2 # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,8 +15,6 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: xerces-j2 %define name xerces-j2 @@ -25,11 +23,11 @@ Name: xerces-j2 %define release 3jpp %define section free Version: 2.8.1 -Release: 250 +Release: 0 Summary: Java XML parser License: Apache-2.0 -Url: http://xml.apache.org/xerces2-j/ Group: Development/Libraries/Java +Url: http://xml.apache.org/xerces2-j/ Source0: Xerces-J-src.%{version}.tar.bz2 Source1: %{name}-version.sh Source2: %{name}-constants.sh @@ -76,7 +74,6 @@ Implementation page. %package javadoc-impl -License: Apache-2.0 Summary: Javadoc for xerces-j2 implementation Group: Development/Libraries/Java PreReq: coreutils @@ -107,7 +104,6 @@ implementation. %package javadoc-apis -License: Apache-2.0 Summary: Javadoc for xerces-j2 apis Group: Development/Libraries/Java PreReq: coreutils @@ -137,7 +133,6 @@ This package contains the javadoc documentation for the Xerces2 APIs. %package javadoc-dom3 -License: Apache-2.0 Summary: Javadoc for xerces-j2 DOM3 Group: Development/Libraries/Java PreReq: coreutils @@ -167,7 +162,6 @@ This package contains the javadoc documentation for Xerces2 DOM3. %package javadoc-xni -License: Apache-2.0 Summary: Javadoc for xerces-j2 XNI Group: Development/Libraries/Java PreReq: coreutils @@ -197,7 +191,6 @@ This package contains the javadoc documentation for Xerces2 XNI. %package javadoc-other -License: Apache-2.0 Summary: Javadoc for other xerces-j2 components Group: Development/Libraries/Java PreReq: coreutils @@ -228,7 +221,6 @@ Xerces2. %package demo -License: Apache-2.0 Summary: Demonstration and sample files for xerces-j2 Group: Development/Libraries/Java Requires: %{name} = %{version} @@ -258,7 +250,6 @@ This package contains demonstration and sample files for Xerces2. %package scripts -License: Apache-2.0 Summary: Additional utility scripts for xerces-j2 Group: Development/Libraries/Java Requires: %{name} = %{version} @@ -289,7 +280,6 @@ This package contains additional utility scripts for Xerces2. %package xml-resolver -License: Apache-2.0 Summary: Resolver subproject of xml-commons Group: Development/Libraries/Java Requires: jpackage-utils >= 1.5 @@ -307,7 +297,6 @@ This package contains the resolver subproject of xml-commons. %package xml-apis -License: Apache-2.0 Summary: APIs subproject of xml-commons Group: Development/Libraries/Java Requires: jpackage-utils >= 1.5 From 68740466d67caa291a52b04ebac3ea83541782d46bc37d700ea2905eb5dd7f11 Mon Sep 17 00:00:00 2001 From: Michal Vyskocil Date: Fri, 11 Jan 2013 14:44:56 +0000 Subject: [PATCH 2/2] OBS-URL: https://build.opensuse.org/package/show/Java:packages/xerces-j2?expand=0&rev=20 --- xerces-j2.changes | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/xerces-j2.changes b/xerces-j2.changes index 99c4d29..627733a 100644 --- a/xerces-j2.changes +++ b/xerces-j2.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Jan 11 14:52:38 UTC 2013 - mvyskocil@suse.com + +- removed the -boostrap package + ------------------------------------------------------------------- Fri Sep 16 11:31:42 UTC 2011 - andrea.turrini@gmail.com