Attachment 907884 Details for Bug 1106747 – Patch for rawhide

[patch] Patch for rawhide

h2-1106747.patch (text/plain), 3.55 KB, created by Yaakov Selkowitz on 2014-06-11 23:13:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yaakov Selkowitz

Created: 2014-06-11 23:13:10 UTC

Size: 3.55 KB

patch

obsolete

>diff --git a/fix-build.patch b/fix-build.patch
>index fa9a514..bbc908a 100644
>--- a/fix-build.patch
>+++ b/fix-build.patch
>@@ -1,6 +1,6 @@
> --- Build.java.sav	2012-07-13 17:04:34.000000000 +0300
> +++ Build.java	2012-07-23 11:47:00.693965953 +0300
>-@@ -150,12 +150,12 @@ public class Build extends BuildBase {
>+@@ -150,12 +150,11 @@ public class Build extends BuildBase {
>          switchSource(debugInfo);
>          clean();
>          mkdir("temp");
>@@ -11,10 +11,29 @@
> -                File.pathSeparator + "ext/slf4j-api-1.6.0.jar" +
> -                File.pathSeparator + "ext/org.osgi.core-1.2.0.jar" +
> +        		File.pathSeparator + "/usr/share/java/servlet.jar" +
>-+        		File.pathSeparator + "/usr/share/java/lucene.jar" +
>-+        		File.pathSeparator + "/usr/share/java/lucene-contrib/lucene-analysis.jar" +
>++        		File.pathSeparator + "/usr/share/java/lucene3/lucene-core-3.jar" +
> +        		File.pathSeparator + "/usr/share/java/slf4j/api.jar" +
> +        		File.pathSeparator + "/usr/share/java/felix/org.osgi.core.jar" +
>                  File.pathSeparator + System.getProperty("java.home") + "/../lib/tools.jar";
>          FileList files;
>          if (clientOnly) {
>+@@ -480,7 +479,7 @@
>+         mkdir("docs/javadoc");
>+         javadoc("-sourcepath", "src/main", "org.h2.jdbc", "org.h2.jdbcx",
>+                 "org.h2.tools", "org.h2.api", "org.h2.constant", "org.h2.fulltext",
>+-                "-classpath", "ext/" + getLuceneJar(),
>++                "-classpath", "/usr/share/java/lucene3/lucene-core-3.jar",
>+                 "-docletpath", "bin" + File.pathSeparator + "temp",
>+                 "-doclet", "org.h2.build.doclet.Doclet");
>+         copy("docs/javadoc", files("src/docsrc/javadoc"), "src/docsrc/javadoc");
>+--- BuildBase.java	2012-07-13 17:04:34.000000000 -0500
>++++ BuildBase.java	2014-06-11 16:49:31.563655060 -0500
>+@@ -133,7 +133,7 @@ public class BuildBase {
>+                 throw new RuntimeException("Unsupported pattern, may only start or end with *:" + pattern);
>+             }
>+             // normalize / and \
>+-            pattern = replaceAll(pattern, "/", File.separator);
>++            pattern = BuildBase.replaceAll(pattern, "/", File.separator);
>+             FileList list = new FileList();
>+             for (File f : this) {
>+                 String path = f.getPath();
>diff --git a/h2.spec b/h2.spec
>index 50fe443..b424e1c 100644
>--- a/h2.spec
>+++ b/h2.spec
>@@ -1,6 +1,6 @@
> Name:           h2
> Version:        1.3.168
>-Release:        6%{?dist}
>+Release:        7%{?dist}
> Summary:        Java SQL database
> 
> Group:          Development/Libraries
>@@ -12,8 +12,7 @@ Patch1:         fix-build.patch
> BuildArch: noarch
> BuildRequires: java-devel >= 1:1.5.0
> BuildRequires:  ant
>-BuildRequires:  lucene >= 2.4
>-BuildRequires:  lucene-contrib
>+BuildRequires:  lucene3
> BuildRequires:  slf4j >= 1.5
> BuildRequires:  felix-osgi-core >= 1.2
> BuildRequires:  servlet3
>@@ -64,10 +63,7 @@ mkdir -p $RPM_BUILD_ROOT%{_mavenpomdir}
> cp -rp %SOURCE1 $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
> %add_maven_depmap JPP-%{name}.pom %{name}.jar
> 
>-%files
>-%{_javadir}/*
>-%{_mavenpomdir}/*
>-%{_mavendepmapfragdir}/*
>+%files -f .mfiles
> %doc src/docsrc/html/license.html
> 
> %files javadoc
>@@ -75,6 +71,9 @@ cp -rp %SOURCE1 $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
> %doc src/docsrc/html/license.html
> 
> %changelog
>+* Wed Jun 11 2014 Yaakov Selkowitz <yselkowi@redhat.com> - 1.3.168-7
>+- Fix FTBFS (#1106747)
>+
> * Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.3.168-6
> - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
>

Actions: View | Diff

Attachments on bug 1106747: 905191 | 905192 | 905193 | 907884