[eclipse-fedorapackager/f17: 6/7] Build with Tycho. Update to 0.4.0.

Tue Aug 7 20:51:00 UTC 2012

commit c3b9206b89e7425064d3d373d73e06f9323828c3
Author: Andrew Robinson <arobinso at redhat.com>
Date:   Tue Aug 7 16:35:58 2012 -0400

    Build with Tycho. Update to 0.4.0.

 .gitignore                  |    1 +
 eclipse-fedorapackager.spec |   43 +++++++++++++++++++++----------------------
 removeCBI.patch             |   19 +++++++++++++++++++
 sources                     |    2 +-
 4 files changed, 42 insertions(+), 23 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index 1e8f4e9..51bd113 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@ eclipse-fedorapackager-0.2.3.tar.xz
 eclipse-fedorapackager-0.3.0.tar.xz
 eclipse-fedorapackager-0.3.1.tar.xz
 eclipse-fedorapackager-0.3.2.tar.xz
+eclipse-fedorapackager-0.4.0.tar.xz
diff --git a/eclipse-fedorapackager.spec b/eclipse-fedorapackager.spec
index ed5fd94..7a6d2cc 100644
--- a/eclipse-fedorapackager.spec
+++ b/eclipse-fedorapackager.spec
@@ -1,8 +1,8 @@
 %global install_loc    %{_datadir}/eclipse/dropins/packager
 
 Name:           eclipse-fedorapackager
-Version:        0.3.2
-Release:        5%{?dist}
+Version:        0.4.0
+Release:        1%{?dist}
 Summary:        Fedora Packager for Eclipse
 
 Group:          Development/Tools
@@ -10,6 +10,8 @@ License:        EPL
 URL:            https://fedorahosted.org/eclipse-fedorapackager
 Source0:        https://fedorahosted.org/released/eclipse-fedorapackager/%{name}-%{version}.tar.xz
 
+Patch1: removeCBI.patch
+
 BuildArch: noarch
 
 BuildRequires: java-devel
@@ -17,7 +19,7 @@ BuildRequires: java-devel
 # problem, but FP for Eclipse itself doesn't really have any Indigo
 # deps.
 BuildRequires: eclipse-pde >= 1:3.7.0
-BuildRequires: not-yet-commons-ssl >= 0.3.11-6
+BuildRequires: not-yet-commons-ssl >= 0.3.11-8
 BuildRequires: google-gson
 BuildRequires: eclipse-changelog
 # Local project creation and import SRPM feature
@@ -34,13 +36,18 @@ BuildRequires: xmlrpc3-common >= 3.1.3-9
 BuildRequires: ws-commons-util >= 1.0.1-21
 # Since 1.1 egit has the remote tracking fix
 BuildRequires: eclipse-egit >= 1.1.0
+BuildRequires: maven
+BuildRequires: tycho
+BuildRequires: tycho-extras
+BuildRequires: easymock2
+BuildRequires: maven-clean-plugin
 # We really need Indigo for 0.2 and up, due to a .spec file editor
 # problem, but FP for Eclipse itself doesn't really have any Indigo
 # deps.
 Requires: eclipse-platform >= 3.7.0
 Requires: google-gson
-Requires: not-yet-commons-ssl >= 0.3.11-6
-# 0.9.0 not needed for API but has issues with some compatible eEclipse
+Requires: not-yet-commons-ssl >= 0.3.11-8
+# 0.9.0 not needed for API but has issues with some compatible Eclipse
 Requires: eclipse-rpm-editor >= 0.10.0
 Requires: eclipse-rpmstubby >= 0.10.0
 Requires: eclipse-changelog
@@ -64,6 +71,7 @@ such as Koji, Bodhi and Git.
 
 %prep
 %setup -q -n eclipse-fedorapackager-%{version}
+%patch1 -p1
 mkdir orbit
 pushd orbit
 %{__ln_s} %{_javadir}/xmlrpc3-client.jar
@@ -77,30 +85,17 @@ done
 popd
 
 %build
-%{_bindir}/eclipse-pdebuild \
-                -f org.fedoraproject.eclipse.packager.feature \
-                -o `pwd`/orbit \
-                -d "rpm-editor rpmstubby changelog jgit egit"
+mvn-rpmbuild clean install -Dmaven.test.skip=true
 
 %install
 install -d -m 755 %{buildroot}%{install_loc}
-
-%{__unzip} -q -d %{buildroot}%{install_loc} \
-     build/rpmBuild/org.fedoraproject.eclipse.packager.feature.zip
+mkdir -p %{buildroot}%{install_loc}/eclipse
+mv org.fedoraproject.eclipse.packager-p2-repo/target/repository/features %{buildroot}%{install_loc}/eclipse/features
+mv org.fedoraproject.eclipse.packager-p2-repo/target/repository/plugins %{buildroot}%{install_loc}/eclipse/plugins
 
 # Remove old and create new symlinks to Import-Packages 
 # in %%{_datadir}/eclipse/dropins/packager
 pushd %{buildroot}%{install_loc}/eclipse/plugins
-%{__rm} org.apache.xmlrpc.common_*.jar
-%{__rm} org.apache.xmlrpc_*.jar
-%{__rm} org.apache.ws.commons.util_*.jar
-%{__rm} org.apache.commons.ssl_*.jar
-%{__rm} com.google.gson_*.jar
-%{__rm} org.apache.httpcomponents.httpclient_*.jar
-%{__rm} org.apache.httpcomponents.httpcore-nio_*.jar
-%{__rm} org.apache.httpcomponents.httpcore_*.jar
-%{__rm} org.apache.httpcomponents.httpmime_*.jar
-%{__rm} org.apache.commons.codec_*.jar
 # Link to system libs
 %{__ln_s} %{_javadir}/xmlrpc3-client.jar
 %{__ln_s} %{_javadir}/xmlrpc3-common.jar
@@ -118,6 +113,10 @@ popd
 %doc org.fedoraproject.eclipse.packager-feature/*.html
 
 %changelog
+* Fri Aug 03 2012 Andrew Robinson <arobinso at redhat.com> 0.4.0-1
+- Update to 0.4.0.
+- Build with Tycho
+
 * Wed Jul 18 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.2-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
diff --git a/removeCBI.patch b/removeCBI.patch
new file mode 100644
index 0000000..e783d54
--- /dev/null
+++ b/removeCBI.patch
@@ -0,0 +1,19 @@
+diff --git a/pom.xml b/pom.xml
+index 3d07f6f..e49d7bc 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -13,13 +13,7 @@
+ <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+   <modelVersion>4.0.0</modelVersion>
+-  
+-  <parent>
+-    <groupId>org.eclipse</groupId>
+-    <artifactId>eclipse-parent</artifactId>
+-    <version>3</version>
+-  </parent>
+-  
++    
+   <prerequisites>
+     <maven>3.0</maven>
+   </prerequisites>
diff --git a/sources b/sources
index 0751ec0..bd25822 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0a890be1b9c5f8324822b404259926b2  eclipse-fedorapackager-0.3.2.tar.xz
+3a8e490ffa65f6cd49b7638e92727e51  eclipse-fedorapackager-0.4.0.tar.xz
