From e8fcec636843d58a52ffc5b12e0f9ec6c7e15200 Mon Sep 17 00:00:00 2001
From: Alexander Kurtakov <akurtako@redhat.com>
Date: Mon, 16 Jan 2012 12:20:05 +0200
Subject: [PATCH] Patch pom file to better represent ecj and not jdt.core .

- Guidelines fixes.
---
 core-3.3.0-v_771.pom | 28 ----------------------------
 ecj.spec             | 42 ++++++++++++++++++------------------------
 2 files changed, 18 insertions(+), 52 deletions(-)

diff --git a/core-3.3.0-v_771.pom b/core-3.3.0-v_771.pom
index 21ea74b..69f33ec 100644
--- a/core-3.3.0-v_771.pom
+++ b/core-3.3.0-v_771.pom
@@ -10,32 +10,4 @@
       <url>http://www.eclipse.org/org/documents/epl-v10.html</url>
     </license>
   </licenses>
-  <dependencies>
-    <dependency>
-      <groupId>org.eclipse.core</groupId>
-      <artifactId>resources</artifactId>
-      <version>[3.2.0,4.0.0)</version>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.core</groupId>
-      <artifactId>runtime</artifactId>
-      <version>[3.3.0,4.0.0)</version>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.core</groupId>
-      <artifactId>filesystem</artifactId>
-      <version>[1.0.0,2.0.0)</version>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse</groupId>
-      <artifactId>text</artifactId>
-      <version>[3.1.0,4.0.0)</version>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.team</groupId>
-      <artifactId>core</artifactId>
-      <version>[3.1.0,4.0.0)</version>
-      <optional>true</optional>
-    </dependency>
-  </dependencies>
 </project>
\ No newline at end of file
diff --git a/ecj.spec b/ecj.spec
index b14a084..09aca10 100644
--- a/ecj.spec
+++ b/ecj.spec
@@ -1,6 +1,6 @@
 Epoch: 1
 
-%define qualifier 200902111700
+%global qualifier 200902111700
 
 %define with_gcjbootstrap %{!?_with_gcjbootstrap:0}%{?_with_gcjbootstrap:1}
 %define without_gcjbootstrap %{?_with_gcjbootstrap:0}%{!?_with_gcjbootstrap:1}
@@ -8,12 +8,10 @@ Epoch: 1
 Summary: Eclipse Compiler for Java
 Name: ecj
 Version: 3.4.2
-Release: 10%{?dist}
+Release: 11%{?dist}
 URL: http://www.eclipse.org
 License: EPL
 Group: Development/Languages
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
 Source0: http://download.eclipse.org/eclipse/downloads/drops/R-%{version}-%{qualifier}/%{name}src-%{version}.zip
 Source1: ecj.sh.in
 # Use ECJ for GCJ
@@ -21,7 +19,9 @@ Source1: ecj.sh.in
 # export -r eclipse_r34_1 eclipse-gcj
 # tar cjf ecj-gcj.tar.bz2 eclipse-gcj
 Source2: %{name}-gcj.tar.bz2
-Source3: 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)
 Patch0: %{name}-rpmdebuginfo.patch
 Patch1: %{name}-defaultto1.5.patch
@@ -81,15 +81,11 @@ rm -f org/eclipse/jdt/core/JDTCompilerAdapter.java
 %endif
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
 mkdir -p $RPM_BUILD_ROOT%{_javadir}
-cp -a *.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
+cp -a *.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
 pushd $RPM_BUILD_ROOT%{_javadir}
-ln -s %{name}-%{version}.jar %{name}.jar
-ln -s %{name}-%{version}.jar eclipse-%{name}-%{version}.jar
-ln -s eclipse-%{name}-%{version}.jar eclipse-%{name}.jar
-ln -s %{name}-%{version}.jar jdtcore.jar
+ln -s %{name}.jar eclipse-%{name}.jar
+ln -s %{name}.jar jdtcore.jar
 popd
 
 # Install the ecj wrapper script
@@ -99,41 +95,39 @@ sed --in-place "s:@JAVADIR@:%{_javadir}:" $RPM_BUILD_ROOT%{_bindir}/ecj
 aot-compile-rpm
 
 # poms
-install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
+install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
 install -pm 644 pom.xml \
-    $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}.pom
+    $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
 
-%add_to_maven_depmap org.eclipse.jdt core %{version} JPP %{name}
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+%add_maven_depmap JPP-%{name}.pom %{name}.jar
 
 %post
 if [ -x %{_bindir}/rebuild-gcj-db ]
 then
   %{_bindir}/rebuild-gcj-db
 fi
-%update_maven_depmap
 
 %postun
 if [ -x %{_bindir}/rebuild-gcj-db ]
 then
   %{_bindir}/rebuild-gcj-db
 fi
-%update_maven_depmap
 
 %files
-%defattr(-,root,root,-)
 %doc about.html
-%{_datadir}/maven2/poms/JPP-%{name}.pom
+%{_mavenpomdir}/JPP-%{name}.pom
 %{_mavendepmapfragdir}/%{name}
 %{_bindir}/%{name}
-%{_javadir}/%{name}*.jar
-%{_javadir}/eclipse-%{name}*.jar
+%{_javadir}/%{name}.jar
+%{_javadir}/eclipse-%{name}.jar
 %{_javadir}/jdtcore.jar
 %{_libdir}/gcj/%{name}
 
 %changelog
+* Mon Jan 16 2012 Alexander Kurtakov <akurtako@redhat.com> 1:3.4.2-11
+- Patch pom file to better represent ecj and not jdt.core .
+- Guidelines fixes.
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:3.4.2-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild