From 119092d1b41d60d60e528b0bed43652d77acfc43 Mon Sep 17 00:00:00 2001
From: Severin Gehwolf <sgehwolf@redhat.com>
Date: Aug 15 2011 20:53:19 +0000
Subject: First working version of local Fedora Packager for Eclipse 0.2 build.


---

diff --git a/.gitignore b/.gitignore
index 341535f..5c846cd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 eclipse-fedorapackager
 eclipse-fedorapackager.tar.xz
+remove_me.tar
diff --git a/eclipse-fedorapackager.spec b/eclipse-fedorapackager.spec
index d74d9b2..b12c299 100644
--- a/eclipse-fedorapackager.spec
+++ b/eclipse-fedorapackager.spec
@@ -3,7 +3,7 @@
 
 Name:           eclipse-fedorapackager
 Version:        0.2.0
-Release:        0.1.20110630git%{?dist}
+Release:        0.1.20110815git%{?dist}
 Summary:        Fedora Packager for Eclipse
 
 Group:          Development/Tools
@@ -18,25 +18,34 @@ Source1:        get-eclipse-fedorapackager-sources.sh
 BuildArch: noarch
 
 BuildRequires: java-devel
-BuildRequires: eclipse-pde >= 1:3.4.0
+BuildRequires: eclipse-pde >= 1:3.5.0
 BuildRequires: not-yet-commons-ssl
 BuildRequires: google-gson
 BuildRequires: eclipse-changelog
-BuildRequires: eclipse-rpm-editor
+# Local project creation and import SRPM feature
+# require those versions of eclipse-rpm-editor and
+# eclipse-rpmstubby
+BuildRequires: eclipse-rpm-editor >= 0.9.0-0.1.20110815git2168cacb
+BuildRequires: eclipse-rpmstubby >= 0.9.0-0.1.20110815git2168cacb
 BuildRequires: jakarta-commons-codec
-BuildRequires: httpcomponents-client >= 4.0
+# Earlier httpcomponents-client versions didn't have sane
+# OSGi metadata
+BuildRequires: httpcomponents-client >= 4.1.1-3
 BuildRequires: xmlrpc3-client
 BuildRequires: xmlrpc3-common
 BuildRequires: ws-commons-util
 # Note: As of 0.1.10 we require >= 0.10.0 due to
 # API changes.
 BuildRequires: eclipse-egit >= 0.10.0
-Requires: eclipse-platform >= 3.4.0
+Requires: eclipse-platform >= 3.5.0
 Requires: google-gson
 Requires: not-yet-commons-ssl
-Requires: eclipse-rpm-editor
+Requires: eclipse-rpm-editor >= 0.9.0-0.1.20110815git2168cacb
+Requires: eclipse-rpmstubby >= 0.9.0-0.1.20110815git2168cacb
 Requires: eclipse-changelog
-Requires: httpcomponents-client >= 4.0
+# Earlier httpcomponents-client versions didn't have sane
+# OSGi metadata
+Requires: httpcomponents-client >= 4.1.1-3
 Requires: jakarta-commons-codec
 Requires: xmlrpc3-client
 Requires: xmlrpc3-common
@@ -44,6 +53,9 @@ Requires: ws-commons-util
 # Note: As of 0.1.10 we require >= 0.10.0 due to
 # API changes.
 Requires: eclipse-egit >= 0.10.0
+# Make fedora-packager a dependency, since we refer to some
+# things it provides (fedora-cert, fedora-packager-setup, etc.)
+Requires: fedora-packager
 
 %description
 Fedora Packager for Eclipse is an Eclipse plug-in, which helps
@@ -57,7 +69,7 @@ pushd orbit
 %{__ln_s} %{_javadir}/xmlrpc3-client.jar
 %{__ln_s} %{_javadir}/xmlrpc3-common.jar
 %{__ln_s} %{_javadir}/google-gson.jar
-for i in %{_javadir}/httpcomponents/*{core,client}*.jar; do
+for i in %{_javadir}/httpcomponents/http{core,client,mime}*.jar; do
   %{__ln_s} $i
 done
 %{__ln_s} %{_javadir}/ws-commons-util.jar
@@ -68,10 +80,9 @@ popd
 %{eclipse_base}/buildscripts/pdebuild \
                 -f org.fedoraproject.eclipse.packager \
                 -o `pwd`/orbit \
-                -d "rpm-editor changelog jgit egit"
+                -d "rpm-editor rpmstubby changelog jgit egit"
 
 %install
-%{__rm} -rf %{buildroot}
 install -d -m 755 %{buildroot}%{install_loc}
 
 %{__unzip} -q -d %{buildroot}%{install_loc} \
@@ -80,16 +91,24 @@ install -d -m 755 %{buildroot}%{install_loc}
 # Remove old and create new symlinks to Import-Packages 
 # in %%{_datadir}/eclipse/dropins/packager
 pushd %{buildroot}%{install_loc}/eclipse/plugins
-%{__rm} -rf xmlrpc3-client.jar xmlrpc3-common.jar org.json.jar \
-       ws-commons-util.jar commons-ssl.jar
+%{__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
+# Link to system libs
 %{__ln_s} %{_javadir}/xmlrpc3-client.jar
 %{__ln_s} %{_javadir}/xmlrpc3-common.jar
 %{__ln_s} %{_javadir}/google-gson.jar
-for i in %{_javadir}/httpcomponents/*{core,client}*.jar; do
+for i in %{_javadir}/httpcomponents/*{core,client,mime}*.jar; do
   %{__ln_s} $i
 done
 %{__ln_s} %{_javadir}/ws-commons-util.jar
-%{__ln_s} %{_javadir}/not-yet-commons-ssl.jar commons-ssl.jar
+%{__ln_s} %{_javadir}/not-yet-commons-ssl.jar
 popd
 
 %files
@@ -98,8 +117,8 @@ popd
 %doc org.fedoraproject.eclipse.packager-feature/*.html
 
 %changelog
-* Thu Jun 30 2011 Severin Gehwolf <sgehwolf@redhat.com> 0.2.0-0.1.20110630git
-- First attempt to build Fedora Packager for Eclipse 0.2
+* Fri Aug 12 2011 Severin Gehwolf <sgehwolf@redhat.com> 0.2.0-0.1.20110812git
+- First pre-release build of Fedora Packager for Eclipse 0.2
 
 * Wed Feb 9 2011 Severin Gehwolf <sgehwolf@redhat.com> 0.1.12-1
 - Update to upstream 0.1.12: Fix Koji SSL login mechanism,
diff --git a/sources b/sources
index 562c115..ac5eae9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ebcd115a99de00dfcf3ebc2f39ba9a64  eclipse-fedorapackager.tar.xz
+bc59671230ebcb9c5e19a51af77892f3  eclipse-fedorapackager.tar.xz