From 9e940b96d3b6812b2c48d279380ba778653441ae Mon Sep 17 00:00:00 2001
From: Roland Grunberg <rgrunber@redhat.com>
Date: Sep 17 2014 19:34:24 +0000
Subject: Update to latest Java packaging guidelines.


---

diff --git a/eclipse-packagekit.spec b/eclipse-packagekit.spec
index 7113b72..69abea5 100644
--- a/eclipse-packagekit.spec
+++ b/eclipse-packagekit.spec
@@ -3,7 +3,7 @@
 
 Name:           eclipse-packagekit
 Version:        0.1.0
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        PackageKit integration tools for Eclipse (Incubation)
 
 Group:          Development/Tools
@@ -12,8 +12,8 @@ URL:            https://fedorahosted.org/eclipse-packagekit/
 Source0:        https://git.fedorahosted.org/cgit/eclipse-packagekit.git/snapshot/eclipse-packagekit-%{version}.tar.bz2
 BuildArch:     noarch
 BuildRequires: dbus-java
-BuildRequires: eclipse-cdt
-BuildRequires: feclipse-maven-plugin
+BuildRequires: maven-local
+BuildRequires: tycho
 Requires: eclipse-platform >= 3.4.0
 Requires: dbus-java
 
@@ -24,27 +24,27 @@ plugins integration code.
 %prep
 %setup -q
 
+# We do not need cdt.{core,utils}
+sed -i -e '/org.eclipse.cdt.utils/ d' -e '/org.eclipse.cdt.core/ d' org.eclipse.linuxtools.packagekit.autotools/META-INF/MANIFEST.MF
+sed -i 's/.*org.eclipse.core.resources.*/Import-Package: org.eclipse.core.resources,/' org.eclipse.linuxtools.packagekit.autotools/META-INF/MANIFEST.MF
+
 %build
-mvn-rpmbuild clean verify -DskipTychoVersionCheck
+# Skip javadoc generation for now (wasn't done before either)
+# It also deletes 'eclipse-repository' modules
+# See http://eclip.se/399756
+%mvn_build -j
 
 %install
-install -d -m 755 %{buildroot}%{install_loc}
-
-mvn-rpmbuild org.fedoraproject:feclipse-maven-plugin:install \
-    -DsourceRepo=org.eclipse.linuxtools.packagekit.repo/target/org.eclipse.linuxtools.packagekit.repo-%{version}-SNAPSHOT.zip \
-    -DtargetLocation=%{buildroot}%{install_loc}/eclipse -DskipTychoVersionCheck
-pushd %{buildroot}%{install_loc}/eclipse/plugins
-ln -s %{_javadir}/dbus-java/dbus.jar dbus.jar
-ln -s %{_jnidir}/unix.jar unix.jar
-ln -s %{_jnidir}/hexdump.jar hexdump.jar
-popd
-
-%files
-%{install_loc}
+%mvn_install
+
+%files -f .mfiles
 %doc org.eclipse.linuxtools.packagekit.feature/license.html
 %doc org.eclipse.linuxtools.packagekit.feature/epl-v10.html
 
 %changelog
+* Wed Sep 17 2014 Roland Grunberg <rgrunber@redhat.com> - 0.1.0-8
+- Update to latest Java packaging guidelines.
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.1.0-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild