Accepting request 523339 from LibreOffice:Factory
1 OBS-URL: https://build.opensuse.org/request/show/523339 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/pentaho-libxml?expand=0&rev=4
This commit is contained in:
commit
8db09529fd
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,17 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Sep 11 16:10:57 UTC 2017 - jengelh@inai.de
|
||||||
|
|
||||||
|
- Edit description for neutrality.
|
||||||
|
Replace find -exec rm by just -delete.
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Sun Sep 10 06:49:53 UTC 2017 - fstrba@suse.com
|
||||||
|
|
||||||
|
- Added patch:
|
||||||
|
* 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
|
||||||
@ -20,7 +20,7 @@
|
|||||||
Name: pentaho-libxml
|
Name: pentaho-libxml
|
||||||
Version: 1.1.3
|
Version: 1.1.3
|
||||||
Release: 0
|
Release: 0
|
||||||
Summary: Namespace aware SAX-Parser utility library
|
Summary: Namespace aware SAX parser utility library
|
||||||
License: LGPL-2.0
|
License: LGPL-2.0
|
||||||
Group: Development/Libraries/Java
|
Group: Development/Libraries/Java
|
||||||
Url: http://reporting.pentaho.org/
|
Url: http://reporting.pentaho.org/
|
||||||
@ -30,6 +30,7 @@ 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
|
||||||
BuildRequires: ant
|
BuildRequires: ant
|
||||||
BuildRequires: ant-contrib
|
BuildRequires: ant-contrib
|
||||||
BuildRequires: java-devel
|
BuildRequires: java-devel
|
||||||
@ -45,8 +46,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
|||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
|
|
||||||
%description
|
%description
|
||||||
Pentaho LibXML is a namespace aware SAX-Parser utility library. It eases the
|
Pentaho LibXML is a namespace aware SAX parser utility library. It
|
||||||
pain of implementing non-trivial SAX input handlers.
|
facilitates implementing non-trivial SAX input handlers.
|
||||||
|
|
||||||
%package javadoc
|
%package javadoc
|
||||||
Summary: Javadoc for %{name}
|
Summary: Javadoc for %{name}
|
||||||
@ -58,7 +59,8 @@ Javadoc for %{name}.
|
|||||||
%prep
|
%prep
|
||||||
%setup -q -c
|
%setup -q -c
|
||||||
%patch0 -p1 -b .build
|
%patch0 -p1 -b .build
|
||||||
find . -name "*.jar" -exec rm -f {} \;
|
%patch1 -p1
|
||||||
|
find . -name "*.jar" -delete
|
||||||
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
|
||||||
cd lib
|
cd lib
|
||||||
|
Loading…
Reference in New Issue
Block a user