Hello community, here is the log from the commit of package derby for openSUSE:Factory checked in at 2015-08-01 14:17:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/derby (Old) and /work/SRC/openSUSE:Factory/.derby.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "derby" Changes: -------- --- /work/SRC/openSUSE:Factory/derby/derby.changes 2014-07-21 22:34:14.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.derby.new/derby.changes 2015-08-01 14:17:16.000000000 +0200 @@ -1,0 +2,19 @@ +Wed Jul 29 09:34:36 UTC 2015 - [email protected] + +- Version bump to 10.11.1.1: + * No upstream changelog visible +- Apply patches taken from fedora: + * derby-lucene.patch + * derby-javacc5.patch + +------------------------------------------------------------------- +Wed Jul 29 09:31:48 UTC 2015 - [email protected] + +- Previous change still didnt fix i386 build -> revert + +------------------------------------------------------------------- +Tue Jul 28 07:55:10 UTC 2015 - [email protected] + +- Add constraints on memory to ensure build always succeeds + +------------------------------------------------------------------- Old: ---- db-derby-10.10.2.0-src.tar.gz New: ---- db-derby-10.11.1.1-src.tar.gz derby-javacc5.patch derby-lucene.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ derby.spec ++++++ --- /var/tmp/diff_new_pack.bzFnmW/_old 2015-08-01 14:17:17.000000000 +0200 +++ /var/tmp/diff_new_pack.bzFnmW/_new 2015-08-01 14:17:17.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package derby # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: derby -Version: 10.10.2.0 +Version: 10.11.1.1 Release: 0 Summary: Embeddable Database Engine Written in Java License: Apache-2.0 @@ -26,6 +26,10 @@ Source0: http://www.apache.org/dist/db/derby/db-derby-%{version}/db-derby-%{version}-src.tar.gz Source1: %{name}.service Source2: %{name}-script +# https://issues.apache.org/jira/browse/DERBY-5125 +Patch1: derby-javacc5.patch +# For compatibility with lucene >= 4.10 +Patch2: derby-lucene.patch BuildRequires: ant BuildRequires: dos2unix BuildRequires: fdupes @@ -33,6 +37,8 @@ BuildRequires: javacc BuildRequires: javapackages-tools BuildRequires: junit +BuildRequires: lucene +BuildRequires: lucene-contrib BuildRequires: servlet3 BuildRequires: systemd BuildRequires: xalan-j2 @@ -67,18 +73,31 @@ find -name '*.jar' -delete find -name '*.class' -delete +rm java/engine/org/apache/derby/impl/sql/compile/Token.java +%patch1 -p0 +%patch2 -p0 + +# Don't use Class-Path in manifests sed -i -e '/Class-Path/d' build.xml +# Don't download online packagelists +sed -e 's/initjars,set-doclint,install_packagelists/initjars,set-doclint/' \ + -e '/<link offline/,+1d' \ + -i build.xml + dos2unix LICENSE NOTICE README %build # tools/ant/properties/extrapath.properties ln -sf $(build-classpath javacc) tools/java/javacc.jar -ln -sf $(build-classpath servlet25) tools/java/geronimo-spec-servlet-2.4-rc4.jar +ln -sf $(build-classpath servletapi3) tools/java/geronimo-spec-servlet-2.4-rc4.jar ln -sf $(build-classpath xalan-j2) tools/java/xalan.jar ln -sf $(build-classpath xalan-j2-serializer) tools/java/serializer.jar ln -sf $(build-classpath oro) tools/java/jakarta-oro-2.0.8.jar ln -sf $(build-classpath junit) tools/java/junit.jar +ln -sf $(build-classpath lucene/lucene-core) tools/java/lucene-core.jar +ln -sf $(build-classpath lucene/lucene-analyzers) tools/java/lucene-analyzers-common.jar +ln -sf $(build-classpath lucene/xml-query-parser) tools/java/lucene-queryparser.jar export CLASSPATH="$(build-classpath xerces-j2-xml-apis)" ant buildsource buildjars javadoc @@ -118,7 +137,7 @@ getent passwd derby >/dev/null || \ useradd -r -g derby -d %{_localstatedir}/lib/derby -s /sbin/nologin \ -c "Apache Derby service account" derby -exit 0 +%service_add_pre %{name}.service %post %service_add_post %{name}.service ++++++ db-derby-10.10.2.0-src.tar.gz -> db-derby-10.11.1.1-src.tar.gz ++++++ /work/SRC/openSUSE:Factory/derby/db-derby-10.10.2.0-src.tar.gz /work/SRC/openSUSE:Factory/.derby.new/db-derby-10.11.1.1-src.tar.gz differ: char 16, line 1 ++++++ derby-javacc5.patch ++++++ --- java/engine/org/apache/derby/impl/sql/compile/sqlgrammar.jj.orig 2015-06-18 17:00:53.946356696 +0100 +++ java/engine/org/apache/derby/impl/sql/compile/sqlgrammar.jj 2015-06-18 17:01:24.982950034 +0100 @@ -12,6 +12,7 @@ CACHE_TOKENS = true; UNICODE_INPUT = true; JDK_VERSION = "1.5"; + TOKEN_EXTENDS = "org.apache.derby.impl.sql.compile.TokenBase"; } PARSER_BEGIN(SQLParser) --- java/engine/org/apache/derby/impl/sql/compile/TokenBase.java.orig 2014-06-09 14:54:14.096762143 +0100 +++ java/engine/org/apache/derby/impl/sql/compile/TokenBase.java 2014-06-09 14:54:58.672044878 +0100 @@ -0,0 +1,35 @@ +/* + +Derby - Class org.apache.derby.impl.sql.compile.Token + +Licensed to the Apache Software Foundation (ASF) under one or more +contributor license agreements. See the NOTICE file distributed with +this work for additional information regarding copyright ownership. +The ASF licenses this file to you under the Apache License, Version 2.0 +(the "License"); you may not use this file except in compliance with +the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. + +*/ + +package org.apache.derby.impl.sql.compile; + +/** + * Base class for the Token class generated by JavaCC. + */ +abstract class TokenBase { + /** + * beginOffset and endOffset are useful for siphoning substrings out of + * the Statement so that we can recompile the substrings at upgrade time. + * For instance, VIEW definitions and the Restrictions on Published Tables + * need to be recompiled at upgrade time. + */ + int beginOffset, endOffset; +} --- java/engine/org/apache/derby/impl/sql/build.xml.orig 2014-06-09 14:54:14.096762143 +0100 +++ java/engine/org/apache/derby/impl/sql/build.xml 2014-06-09 14:54:58.672044878 +0100 @@ -57,11 +57,10 @@ Token.java TokenMgrError.java - 3 of those files are checked into the codeline: + 2 of those files are checked into the codeline: CharStream.java ParseException.java - Token.java We don't want generated code to clash with the checked-in versions. So we delete the conflicting classes here. @@ -70,7 +69,6 @@ <fileset dir="${generated.src.dir}/${derby.dir}/impl/sql/compile"> <include name="CharStream.java"/> <include name="ParseException.java"/> - <include name="Token.java"/> </fileset> </delete> ++++++ derby-lucene.patch ++++++ Index: java/optional/org/apache/derby/optional/api/LuceneUtils.java =================================================================== --- java/optional/org/apache/derby/optional/api/LuceneUtils.java.orig +++ java/optional/org/apache/derby/optional/api/LuceneUtils.java @@ -108,21 +108,7 @@ public abstract class LuceneUtils @SuppressWarnings("deprecation") public static Version currentVersion() { - Version retval = null; - - // the current version is the highest one - for ( Version current : Version.values() ) - { - if ( current == Version.LUCENE_CURRENT ) { continue; } - - if ( retval == null ) { retval = current; } - else - { - if ( current.onOrAfter( retval ) ) { retval = current; } - } - } - - return retval; + return Version.LATEST; } /** Index: build.xml =================================================================== --- build.xml.orig +++ build.xml @@ -48,7 +48,7 @@ <target name="buildsource" - depends="checkCompilerLevel,init,prebuild,setCompilerProperties,jdbc4stubs,felixStubs,engine,storeless,tools,drda,client,optional,build,versioninfo,localeinfo,binscripts" + depends="checkCompilerLevel,init,prebuild,setCompilerProperties,jdbc4stubs,felixStubs,engine,storeless,tools,drda,client,build,versioninfo,localeinfo,binscripts" description="Compile the product source (does not build the tests)." /> <target @@ -1399,7 +1399,7 @@ <target name="buildjars" - depends="initjars,derbyjar,derbytoolsjar,derbynetjar,derbyclientjar,derbyoptionaltoolsjar,derbyrunjar,derbywar,derbylocalejars,derbytestingjar" + depends="initjars,derbyjar,derbytoolsjar,derbynetjar,derbyclientjar,derbyrunjar,derbywar,derbylocalejars,derbytestingjar" description="Build all of the Derby jar files." />
