Accepting request 671652 from Java:packages

BuildIgnore own provides to avoid unresolved cycles

OBS-URL: https://build.opensuse.org/request/show/671652
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xerces-j2?expand=0&rev=41
This commit is contained in:
Stephan Kulow 2019-02-06 14:46:52 +00:00 committed by Git OBS Bridge
commit 863cf0d7fd
3 changed files with 42 additions and 10 deletions

17
xerces-j2-manifest.patch Normal file
View File

@ -0,0 +1,17 @@
--- src/manifest.xerces 2018-04-21 06:02:09.000000000 +0200
+++ src/manifest.xerces 2018-11-18 18:43:12.785381090 +0100
@@ -1,5 +1,14 @@
Manifest-Version: 1.0
Created-By: @java.version@ (@java.vendor@)
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-SymbolicName: org.apache.xerces
+Bundle-ManifestVersion: 2
+Bundle-Name: @impl.name@
+Bundle-Localization: plugin
+Bundle-Version: @impl.version@
+Bundle-Vendor: Apache Software Foundation
+Require-Bundle: system.bundle,javax.xml;visibility:=reexport, org.apache.xml.resolver;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,org.apache.xml.serializer;bundle-version="[2.7.1,3.0.0)"
+Export-Package: META-INF.services;version="@impl.version@",org.apache.html.dom;version="@impl.version@",org.apache.wml;version="@impl.version@",org.apache.wml.dom;version="@impl.version@",org.apache.xerces.dom;version="@impl.version@",org.apache.xerces.dom.events;version="@impl.version@",org.apache.xerces.dom3.as;version="@impl.version@",org.apache.xerces.impl;version="@impl.version@",org.apache.xerces.impl.dtd;version="@impl.version@",org.apache.xerces.impl.dtd.models;version="@impl.version@",org.apache.xerces.impl.dv;version="@impl.version@",org.apache.xerces.impl.dv.dtd;version="@impl.version@",org.apache.xerces.impl.dv.util;version="@impl.version@",org.apache.xerces.impl.dv.xs;version="@impl.version@",org.apache.xerces.impl.io;version="@impl.version@",org.apache.xerces.impl.msg;version="@impl.version@",org.apache.xerces.impl.validation;version="@impl.version@",org.apache.xerces.impl.xpath;version="@impl.version@",org.apache.xerces.impl.xpath.regex;version="@impl.version@",org.apache.xerces.impl.xs;version="@impl.version@",org.apache.xerces.impl.xs.identity;version="@impl.version@",org.apache.xerces.impl.xs.models;version="@impl.version@",org.apache.xerces.impl.xs.opti;version="@impl.version@",org.apache.xerces.impl.xs.traversers;version="@impl.version@",org.apache.xerces.impl.xs.util;version="@impl.version@",org.apache.xerces.jaxp;version="@impl.version@",org.apache.xerces.jaxp.datatype;version="@impl.version@",org.apache.xerces.jaxp.validation;version="@impl.version@",org.apache.xerces.parsers;version="@impl.version@",org.apache.xerces.stax;version="@impl.version@",org.apache.xerces.stax.events;version="@impl.version@",org.apache.xerces.util;version="@impl.version@",org.apache.xerces.xinclude;version="@impl.version@",org.apache.xerces.xni;version="@impl.version@",org.apache.xerces.xni.grammars;version="@impl.version@",org.apache.xerces.xni.parser;version="@impl.version@",org.apache.xerces.xpointer;version="@impl.version@",org.apache.xerces.xs;version="@impl.version@",org.apache.xerces.xs.datatypes;version="@impl.version@",org.apache.xml.serialize;version="@impl.version@",org.w3c.dom.html;version="@impl.version@"
Name: org/apache/xerces/impl/
Comment: @impl.name@

View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Tue Feb 5 10:01:22 UTC 2019 - Fridrich Strba <fstrba@suse.com>
- BuildIgnore oneself to avoid unresolved cycle
-------------------------------------------------------------------
Fri Feb 1 10:20:36 UTC 2019 - Fridrich Strba <fstrba@suse.com>
- Added patch:
* xerces-j2-manifest.patch
- add OSGi metadata required by Eclipse
-------------------------------------------------------------------
Tue Dec 11 10:16:51 UTC 2018 - Jan Engelhardt <jengelh@inai.de>
@ -121,7 +133,7 @@ Mon Sep 9 11:06:27 UTC 2013 - tchvatal@suse.com
-------------------------------------------------------------------
Fri Aug 23 12:11:30 UTC 2013 - mvyskocil@suse.com
- drop javadoc packages
- drop javadoc packages
- drop antlr-bootstrap from BR as javadoc is not built
-------------------------------------------------------------------
@ -137,17 +149,17 @@ Fri Sep 16 11:31:42 UTC 2011 - andrea.turrini@gmail.com
-------------------------------------------------------------------
Mon Mar 14 13:05:09 UTC 2011 - mvyskocil@suse.cz
- build ignore openjdk
- build ignore openjdk
-------------------------------------------------------------------
Tue Sep 21 09:15:04 UTC 2010 - mvyskocil@suse.cz
- use antlr-bootstrap for javadoc build
- use antlr-bootstrap for javadoc build
-------------------------------------------------------------------
Mon Sep 13 13:40:54 UTC 2010 - mvyskocil@suse.cz
- remove unecessary xerces-j2-build.patch
- remove unecessary xerces-j2-build.patch
-------------------------------------------------------------------
Thu Sep 2 12:36:13 UTC 2010 - mvyskocil@suse.cz
@ -187,7 +199,7 @@ Wed May 2 11:54:38 CEST 2007 - dbornkessel@suse.de
-------------------------------------------------------------------
Tue Jan 23 17:05:07 CET 2007 - dbornkessel@suse.de
- added dummy methods for not yet supported new dom methods
- added dummy methods for not yet supported new dom methods
-------------------------------------------------------------------
Tue Jan 16 18:29:04 CET 2007 - dbornkessel@suse.de
@ -206,14 +218,14 @@ Wed Nov 15 14:18:46 CET 2006 - dbornkessel@suse.de
-------------------------------------------------------------------
Fri Sep 22 16:39:41 CEST 2006 - dbornkessel@suse.de
- update to 2.8.1
- update to 2.8.1
- added source="1.4" target="1.4" to [x]javac & javadoc ant tasks
-------------------------------------------------------------------
Mon Jan 30 14:12:11 CET 2006 - dbornkessel@suse.de
- changed update alternatives prios
- corrected update-alternatives name for 'xml-commons-resolver'
- corrected update-alternatives name for 'xml-commons-resolver'
-------------------------------------------------------------------
Fri Jan 27 01:36:20 CET 2006 - mls@suse.de
@ -225,12 +237,12 @@ Tue Jan 24 16:42:28 CET 2006 - dbornkessel@suse.de
- added missing jar file (xml-apis & resolver)
- added xml-apis and resolver to alternative system, so they can be
interchanged with xml-commons-apis and commons-resolver
interchanged with xml-commons-apis and commons-resolver
-------------------------------------------------------------------
Wed Jan 18 02:21:51 CET 2006 - dbornkessel@suse.de
- Update to version 2.7.1
- Update to version 2.7.1
-------------------------------------------------------------------
Thu Sep 29 00:35:27 CEST 2005 - dmueller@suse.de

View File

@ -1,7 +1,7 @@
#
# spec file for package xerces-j2
#
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2019 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
@ -35,6 +35,7 @@ Source5: http://repo.maven.apache.org/maven2/xerces/xercesImpl/%{version}
# Also remove the use of the special taglets and xjavac task
Patch0: %{name}-build.patch
Patch1: xerces-2_11_0-jdk7.patch
Patch2: %{name}-manifest.patch
BuildRequires: ant
BuildRequires: apache-parent
BuildRequires: dos2unix
@ -44,6 +45,7 @@ BuildRequires: javapackages-local
BuildRequires: xalan-j2 >= 2.7.1
BuildRequires: xml-commons-apis >= 1.4.01
BuildRequires: xml-commons-resolver >= 1.2
#!BuildIgnore: xerces-j2 osgi(org.apache.xerces)
# Explicit javapackages-tools requires since scripts use
# /usr/share/java-utils/java-functions
Requires: javapackages-tools
@ -89,6 +91,7 @@ find "(" -name "*.class" -o -name "*.jar" ")" -delete
find -type f -exec dos2unix {} \;
%patch0 -p1
%patch1 -p1
%patch2
%build
mkdir -p tools