Accepting request 527188 from Java:packages

Don't build with java-1_7_0-openjdk-bootstrap

OBS-URL: https://build.opensuse.org/request/show/527188
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ecj?expand=0&rev=23
This commit is contained in:
Dominique Leuenberger 2017-09-21 10:26:59 +00:00 committed by Git OBS Bridge
commit 1052628955
2 changed files with 8 additions and 12 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon Sep 18 23:02:42 UTC 2017 - fstrba@suse.com
- Don't build against the java-bootstrap package; it is gone
------------------------------------------------------------------- -------------------------------------------------------------------
Fri May 19 12:04:39 UTC 2017 - tchvatal@suse.com Fri May 19 12:04:39 UTC 2017 - tchvatal@suse.com

View File

@ -22,7 +22,7 @@ Version: 4.4.0
Release: 0 Release: 0
Summary: Eclipse Compiler for Java Summary: Eclipse Compiler for Java
License: EPL-1.0 License: EPL-1.0
Group: Development/Languages Group: Development/Languages/Java
Url: http://www.eclipse.org Url: http://www.eclipse.org
Source0: http://download.eclipse.org/eclipse/downloads/drops4/%{qualifier}/%{name}src-4.4.jar Source0: http://download.eclipse.org/eclipse/downloads/drops4/%{qualifier}/%{name}src-4.4.jar
Source1: ecj.sh.in Source1: ecj.sh.in
@ -46,6 +46,7 @@ Patch2: eclipse-gcj-compat4.2.1.patch
Patch3: eclipse-gcj-nodummysymbol.patch Patch3: eclipse-gcj-nodummysymbol.patch
BuildRequires: ant BuildRequires: ant
BuildRequires: gzip BuildRequires: gzip
BuildRequires: java-devel >= 1.6.0
BuildRequires: javapackages-local BuildRequires: javapackages-local
BuildRequires: javapackages-tools BuildRequires: javapackages-tools
BuildRequires: unzip BuildRequires: unzip
@ -53,15 +54,6 @@ Conflicts: ecj-bootstrap
Provides: eclipse-ecj = %{version}-%{release} Provides: eclipse-ecj = %{version}-%{release}
Obsoletes: eclipse-ecj < 3.4.2-4 Obsoletes: eclipse-ecj < 3.4.2-4
BuildArch: noarch BuildArch: noarch
%if 0%{?suse_version} > 1315 || 0%{?is_opensuse} == 1
#!BuildIgnore: java-1_6_0-openjdk java-1_6_0-openjdk-devel
#!BuildIgnore: java-1_7_0-openjdk java-1_7_0-openjdk-devel
#!BuildIgnore: java-1_8_0-openjdk java-1_8_0-openjdk-devel
#!BuildIgnore: java-9-openjdk java-9-openjdk-devel
BuildRequires: java-1_7_0-openjdk-bootstrap-devel
%else
BuildRequires: java-devel >= 1.7.0
%endif
%description %description
ECJ is the Java bytecode compiler of the Eclipse Platform. It is also known as ECJ is the Java bytecode compiler of the Eclipse Platform. It is also known as
@ -131,13 +123,12 @@ install -pm 644 pom.xml \
%add_maven_depmap -a "org.eclipse.tycho:org.eclipse.jdt.core,org.eclipse.jdt:core,org.eclipse.jdt:org.eclipse.jdt.core" JPP-%{name}.pom %{name}.jar %add_maven_depmap -a "org.eclipse.tycho:org.eclipse.jdt.core,org.eclipse.jdt:core,org.eclipse.jdt:org.eclipse.jdt.core" JPP-%{name}.pom %{name}.jar
%files -f .mfiles %files -f .mfiles
%defattr(-,root,root)
%doc about.html %doc about.html
%{_mavenpomdir}/JPP-%{name}.pom %{_mavenpomdir}/JPP-%{name}.pom
%{_bindir}/%{name} %{_bindir}/%{name}
%{_javadir}/%{name}.jar %{_javadir}/%{name}.jar
%{_javadir}/eclipse-%{name}.jar %{_javadir}/eclipse-%{name}.jar
%{_javadir}/jdtcore.jar %{_javadir}/jdtcore.jar
%{_mandir}/man1/ecj.1.gz %{_mandir}/man1/ecj.1%{ext_man}
%changelog %changelog