rpm/ecj
SHA256
1
0
Fork 0
forked from pool/ecj
Code Pull Requests Activity

Accepting request 247426 from Java:packages

Browse Source 
- Spec-cleaner
- BuildIgnore java-devel pkgs to avoid conflicts

- on 13.2 and Factory build against bootstrap java

OBS-URL: https://build.opensuse.org/request/show/247426
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ecj?expand=0&rev=19
This commit is contained in:
Stephan Kulow 2014-09-05 07:34:07 +00:00 committed by Git OBS Bridge
commit 244b8e2959
2 changed files with 30 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ecj.changes
View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Wed Sep 3 14:38:14 UTC 2014 - tchvatal@suse.com
- Spec-cleaner
- BuildIgnore java-devel pkgs to avoid conflicts
-------------------------------------------------------------------
Wed Sep 3 05:42:52 UTC 2014 - coolo@suse.com
- on 13.2 and Factory build against bootstrap java
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Sep 9 11:05:39 UTC 2013 - tchvatal@suse.com Mon Sep 9 11:05:39 UTC 2013 - tchvatal@suse.com

37
ecj.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package ecj # spec file for package ecj
# #
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2014 SUSE LINUX Products 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
@ -23,7 +23,6 @@ Summary: Eclipse Compiler for Java
License: EPL-1.0 License: EPL-1.0
Group: Development/Languages/Java Group: Development/Languages/Java
Url: http://eclipse.org Url: http://eclipse.org
Conflicts: ecj-bootstrap
Source0: %{name}src-%{version}.jar Source0: %{name}src-%{version}.jar
Source1: ecj.sh.in Source1: ecj.sh.in
# Use ECJ for GCJ # Use ECJ for GCJ
@ -31,7 +30,7 @@ Source1: ecj.sh.in
# export -D 2009-09-28 eclipse-gcj # export -D 2009-09-28 eclipse-gcj
# tar cjf ecj-gcj.tar.bz2 eclipse-gcj # tar cjf ecj-gcj.tar.bz2 eclipse-gcj
Source2: %{name}-gcj.tar.bz2 Source2: %{name}-gcj.tar.bz2
#Patched from http://repo2.maven.org/maven2/org/eclipse/jdt/core/3.3.0-v_771/core-3.3.0-v_771.pom #Patched from http://repo2.maven.org/maven2/org/eclipse/jdt/core/3.3.0-v_771/core-3.3.0-v_771.pom
# No dependencies are needed for ecj, dependencies are for using of jdt.core which makes no sense outside of eclipse # No dependencies are needed for ecj, dependencies are for using of jdt.core which makes no sense outside of eclipse
Source3: core-3.3.0-v_771.pom Source3: core-3.3.0-v_771.pom
# Always generate debug info when building RPMs (Andrew Haley) # Always generate debug info when building RPMs (Andrew Haley)
@ -43,24 +42,26 @@ Patch3: eclipse-gcj-compat4.2.1.patch
# build.xml fails to include a necessary .props file in the built ecj.jar # build.xml fails to include a necessary .props file in the built ecj.jar
Patch4: %{name}-include-props.patch Patch4: %{name}-include-props.patch
Patch5: eclipse-gcj-nodummysymbol.patch Patch5: eclipse-gcj-nodummysymbol.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
BuildRequires: ant BuildRequires: ant
BuildRequires: java-devel >= 1.6.0
BuildRequires: javapackages-tools BuildRequires: javapackages-tools
BuildRequires: sed BuildRequires: sed
BuildRequires: unzip BuildRequires: unzip
Requires: java >= 1.6.0 Requires: java >= 1.6.0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
Conflicts: ecj-bootstrap
%if 0%{?suse_version} < 1320
BuildRequires: java-devel >= 1.6.0
%else
#!BuildIgnore: java-1_6_0-openjdk java-1_6_0-openjdk-devel
#!BuildIgnore: java-1_7_0-openjdk java-1_7_0-openjdk-devel
BuildRequires: java-1_7_0-openjdk-bootstrap-devel
%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
the JDT Core batch compiler. the JDT Core batch compiler.
%prep %prep
%setup -q -c %setup -q -c
%patch0 -p1 %patch0 -p1
@ -91,21 +92,21 @@ rm -f org/eclipse/jdt/core/JDTCompilerAdapter.java
ant ant
%install %install
mkdir -p $RPM_BUILD_ROOT%{_javadir} mkdir -p %{buildroot}%{_javadir}
cp -a *.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar cp -a *.jar %{buildroot}%{_javadir}/%{name}.jar
pushd $RPM_BUILD_ROOT%{_javadir} pushd %{buildroot}%{_javadir}
ln -s %{name}.jar eclipse-%{name}.jar ln -s %{name}.jar eclipse-%{name}.jar
ln -s %{name}.jar jdtcore.jar ln -s %{name}.jar jdtcore.jar
popd popd
# Install the ecj wrapper script # Install the ecj wrapper script
install -p -D -m0755 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/ecj install -p -D -m0755 %{SOURCE1} %{buildroot}%{_bindir}/ecj
sed --in-place "s:@JAVADIR@:%{_javadir}:" $RPM_BUILD_ROOT%{_bindir}/ecj sed --in-place "s:@JAVADIR@:%{_javadir}:" %{buildroot}%{_bindir}/ecj
# poms # poms
install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir} install -d -m 755 %{buildroot}%{_mavenpomdir}
install -pm 644 pom.xml \ install -pm 644 pom.xml \
$RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
%add_maven_depmap -a "org.eclipse.tycho:org.eclipse.jdt.core" JPP-%{name}.pom %{name}.jar %add_maven_depmap -a "org.eclipse.tycho:org.eclipse.jdt.core" JPP-%{name}.pom %{name}.jar