This commit is contained in:
parent
c1dcc53f8f
commit
4ec0bb0075
10
pentaho-libxml-1.1.3-doclint.patch
Normal file
10
pentaho-libxml-1.1.3-doclint.patch
Normal file
@ -0,0 +1,10 @@
|
|||||||
|
--- pentaho-libxml-1.1.3/common_build.xml 2017-09-10 08:45:02.793392955 +0200
|
||||||
|
+++ pentaho-libxml-1.1.3/common_build.xml 2017-09-10 08:47:20.864235634 +0200
|
||||||
|
@@ -1352,6 +1352,7 @@
|
||||||
|
nodeprecatedlist="false"
|
||||||
|
nodeprecated="false"
|
||||||
|
packagenames="${javadoc.packagenames}"
|
||||||
|
+ additionalparam="-Xdoclint:none"
|
||||||
|
sourcepath="${src.dir}"
|
||||||
|
doctitle="${impl.title} documentation">
|
||||||
|
<link href="http://java.sun.com/j2se/${javac.source}.0/docs/api/" />
|
13
pentaho-libxml-1.1.3-sourcetarget.patch
Normal file
13
pentaho-libxml-1.1.3-sourcetarget.patch
Normal file
@ -0,0 +1,13 @@
|
|||||||
|
--- pentaho-libxml-1.1.3/common_build.xml 2017-09-10 08:45:02.793392955 +0200
|
||||||
|
+++ pentaho-libxml-1.1.3/common_build.xml 2017-09-10 08:46:25.295087266 +0200
|
||||||
|
@@ -136,8 +136,8 @@
|
||||||
|
<property name="javac.deprecation"
|
||||||
|
value="true"
|
||||||
|
description="Indicates whether source should be compiled with deprecation information" />
|
||||||
|
- <property name="javac.source" value="1.5" description="Provide source compatibility with specified release" />
|
||||||
|
- <property name="javac.target" value="1.5" description="Generate class files for specific VM version" />
|
||||||
|
+ <property name="javac.source" value="1.6" description="Provide source compatibility with specified release" />
|
||||||
|
+ <property name="javac.target" value="1.6" description="Generate class files for specific VM version" />
|
||||||
|
|
||||||
|
<!-- Build Cache properties -->
|
||||||
|
<property name="build.cache.dir"
|
@ -1,3 +1,13 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Sun Sep 10 06:49:53 UTC 2017 - fstrba@suse.com
|
||||||
|
|
||||||
|
- Added patches:
|
||||||
|
* pentaho-libxml-1.1.3-doclint.patch
|
||||||
|
+ Don't bail out on doclint errors
|
||||||
|
* pentaho-libxml-1.1.3-sourcetarget.patch
|
||||||
|
+ Specify java source and target 1.6 in order to allow building
|
||||||
|
with jdk9
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Tue Jul 1 13:48:34 UTC 2014 - tchvatal@suse.com
|
Tue Jul 1 13:48:34 UTC 2014 - tchvatal@suse.com
|
||||||
|
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
#
|
#
|
||||||
# spec file for package pentaho-libxml
|
# spec file for package pentaho-libxml
|
||||||
#
|
#
|
||||||
# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||||
#
|
#
|
||||||
# All modifications and additions to the file contributed by third parties
|
# All modifications and additions to the file contributed by third parties
|
||||||
# remain the property of their copyright owners, unless otherwise agreed
|
# remain the property of their copyright owners, unless otherwise agreed
|
||||||
@ -30,6 +30,8 @@ Url: http://reporting.pentaho.org/
|
|||||||
Source: %{origname}-%{version}-jarsdeleted.zip
|
Source: %{origname}-%{version}-jarsdeleted.zip
|
||||||
#PATCH-FIX-UPSTREAM, fix some properties for build
|
#PATCH-FIX-UPSTREAM, fix some properties for build
|
||||||
Patch0: libxml-1.1.2-build.patch
|
Patch0: libxml-1.1.2-build.patch
|
||||||
|
Patch1: pentaho-libxml-1.1.3-sourcetarget.patch
|
||||||
|
Patch2: pentaho-libxml-1.1.3-doclint.patch
|
||||||
BuildRequires: ant
|
BuildRequires: ant
|
||||||
BuildRequires: ant-contrib
|
BuildRequires: ant-contrib
|
||||||
BuildRequires: java-devel
|
BuildRequires: java-devel
|
||||||
@ -58,6 +60,8 @@ Javadoc for %{name}.
|
|||||||
%prep
|
%prep
|
||||||
%setup -q -c
|
%setup -q -c
|
||||||
%patch0 -p1 -b .build
|
%patch0 -p1 -b .build
|
||||||
|
%patch1 -p1
|
||||||
|
%patch2 -p1
|
||||||
find . -name "*.jar" -exec rm -f {} \;
|
find . -name "*.jar" -exec rm -f {} \;
|
||||||
mkdir -p lib
|
mkdir -p lib
|
||||||
build-jar-repository -s -p lib commons-logging-api libbase libloader
|
build-jar-repository -s -p lib commons-logging-api libbase libloader
|
||||||
|
Loading…
Reference in New Issue
Block a user