- Spec-cleaner
- BuildIgnore java-devel pkgs to avoid conflicts OBS-URL: https://build.opensuse.org/package/show/Java:packages/ecj?expand=0&rev=17
This commit is contained in:
parent
17d1c2f8cc
commit
3d8be3debc
@ -1,3 +1,9 @@
|
||||
-------------------------------------------------------------------
|
||||
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
|
||||
|
||||
|
39
ecj.spec
39
ecj.spec
@ -23,7 +23,6 @@ Summary: Eclipse Compiler for Java
|
||||
License: EPL-1.0
|
||||
Group: Development/Languages/Java
|
||||
Url: http://eclipse.org
|
||||
Conflicts: ecj-bootstrap
|
||||
Source0: %{name}src-%{version}.jar
|
||||
Source1: ecj.sh.in
|
||||
# Use ECJ for GCJ
|
||||
@ -31,7 +30,7 @@ Source1: ecj.sh.in
|
||||
# export -D 2009-09-28 eclipse-gcj
|
||||
# tar cjf ecj-gcj.tar.bz2 eclipse-gcj
|
||||
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
|
||||
Source3: core-3.3.0-v_771.pom
|
||||
# Always generate debug info when building RPMs (Andrew Haley)
|
||||
@ -43,28 +42,26 @@ Patch3: eclipse-gcj-compat4.2.1.patch
|
||||
# build.xml fails to include a necessary .props file in the built ecj.jar
|
||||
Patch4: %{name}-include-props.patch
|
||||
Patch5: eclipse-gcj-nodummysymbol.patch
|
||||
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
|
||||
BuildArch: noarch
|
||||
|
||||
BuildRequires: ant
|
||||
%if %suse_version < 1320
|
||||
BuildRequires: java-devel >= 1.6.0
|
||||
%else
|
||||
BuildRequires: java-1_7_0-openjdk-bootstrap-devel
|
||||
%endif
|
||||
BuildRequires: javapackages-tools
|
||||
BuildRequires: sed
|
||||
BuildRequires: unzip
|
||||
|
||||
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
|
||||
ECJ is the Java bytecode compiler of the Eclipse Platform. It is also known as
|
||||
the JDT Core batch compiler.
|
||||
|
||||
|
||||
%prep
|
||||
%setup -q -c
|
||||
%patch0 -p1
|
||||
@ -95,21 +92,21 @@ rm -f org/eclipse/jdt/core/JDTCompilerAdapter.java
|
||||
ant
|
||||
|
||||
%install
|
||||
mkdir -p $RPM_BUILD_ROOT%{_javadir}
|
||||
cp -a *.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
|
||||
pushd $RPM_BUILD_ROOT%{_javadir}
|
||||
mkdir -p %{buildroot}%{_javadir}
|
||||
cp -a *.jar %{buildroot}%{_javadir}/%{name}.jar
|
||||
pushd %{buildroot}%{_javadir}
|
||||
ln -s %{name}.jar eclipse-%{name}.jar
|
||||
ln -s %{name}.jar jdtcore.jar
|
||||
popd
|
||||
|
||||
# Install the ecj wrapper script
|
||||
install -p -D -m0755 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/ecj
|
||||
sed --in-place "s:@JAVADIR@:%{_javadir}:" $RPM_BUILD_ROOT%{_bindir}/ecj
|
||||
install -p -D -m0755 %{SOURCE1} %{buildroot}%{_bindir}/ecj
|
||||
sed --in-place "s:@JAVADIR@:%{_javadir}:" %{buildroot}%{_bindir}/ecj
|
||||
|
||||
# poms
|
||||
install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
|
||||
install -d -m 755 %{buildroot}%{_mavenpomdir}
|
||||
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
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user