Hello community, here is the log from the commit of package ecj for openSUSE:Factory checked in at 2014-09-05 09:34:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ecj (Old) and /work/SRC/openSUSE:Factory/.ecj.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ecj" Changes: -------- --- /work/SRC/openSUSE:Factory/ecj/ecj.changes 2013-09-11 13:39:07.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ecj.new/ecj.changes 2014-09-05 09:34:10.000000000 +0200 @@ -1,0 +2,11 @@ +Wed Sep 3 14:38:14 UTC 2014 - [email protected] + +- Spec-cleaner +- BuildIgnore java-devel pkgs to avoid conflicts + +------------------------------------------------------------------- +Wed Sep 3 05:42:52 UTC 2014 - [email protected] + +- on 13.2 and Factory build against bootstrap java + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ecj.spec ++++++ --- /var/tmp/diff_new_pack.1CNTyW/_old 2014-09-05 09:34:11.000000000 +0200 +++ /var/tmp/diff_new_pack.1CNTyW/_new 2014-09-05 09:34:11.000000000 +0200 @@ -1,7 +1,7 @@ # # 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 # remain the property of their copyright owners, unless otherwise agreed @@ -23,7 +23,6 @@ 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 @@ -43,24 +42,26 @@ # 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 -BuildRequires: java-devel >= 1.6.0 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 @@ -91,21 +92,21 @@ 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 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
