[eclipse-fedorapackager] - First attempt to build Fedora Packager for Eclipse 0.2

jerboaa jerboaa at fedoraproject.org
Mon Aug 15 22:04:02 UTC 2011


commit eddfb7e95dfef04e22addce40888b9e0b807d8a1
Author: Severin Gehwolf <sgehwolf at redhat.com>
Date:   Thu Jun 30 15:54:57 2011 -0400

    - First attempt to build Fedora Packager for Eclipse 0.2

 .gitignore                  |    1 +
 eclipse-fedorapackager.spec |   63 ++++++++++++++++++++++--------------------
 sources                     |    2 +-
 3 files changed, 35 insertions(+), 31 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ea79135..341535f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
+eclipse-fedorapackager
 eclipse-fedorapackager.tar.xz
diff --git a/eclipse-fedorapackager.spec b/eclipse-fedorapackager.spec
index bb971eb..d74d9b2 100644
--- a/eclipse-fedorapackager.spec
+++ b/eclipse-fedorapackager.spec
@@ -2,30 +2,29 @@
 %global install_loc    %{_datadir}/eclipse/dropins/packager
 
 Name:           eclipse-fedorapackager
-Version:        0.1.12
-Release:        1%{?dist}
-Summary:        Fedora Packager Tools
+Version:        0.2.0
+Release:        0.1.20110630git%{?dist}
+Summary:        Fedora Packager for Eclipse
 
 Group:          Development/Tools
 License:        EPL
 URL:            http://fedorahosted.org/eclipse-fedorapackager
-# Tar file generated from Git repository (tag 0.1.12)
+# Tar file generated from Git repository (tag 0.2.0-pre)
 # by:
-#   bash get-eclipse-fedorapackager-sources.sh 0.1.12
+#   bash get-eclipse-fedorapackager-sources.sh 0.2.0-pre
 Source0:        %{name}.tar.xz
 Source1:        get-eclipse-fedorapackager-sources.sh
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch: noarch
 
 BuildRequires: java-devel
 BuildRequires: eclipse-pde >= 1:3.4.0
 BuildRequires: not-yet-commons-ssl
-BuildRequires: json >= 3-3
+BuildRequires: google-gson
 BuildRequires: eclipse-changelog
 BuildRequires: eclipse-rpm-editor
 BuildRequires: jakarta-commons-codec
-BuildRequires: jakarta-commons-httpclient >= 3.1
+BuildRequires: httpcomponents-client >= 4.0
 BuildRequires: xmlrpc3-client
 BuildRequires: xmlrpc3-common
 BuildRequires: ws-commons-util
@@ -33,11 +32,11 @@ BuildRequires: ws-commons-util
 # API changes.
 BuildRequires: eclipse-egit >= 0.10.0
 Requires: eclipse-platform >= 3.4.0
-Requires: json >= 3-3
+Requires: google-gson
 Requires: not-yet-commons-ssl
 Requires: eclipse-rpm-editor
 Requires: eclipse-changelog
-Requires: jakarta-commons-httpclient >= 3.1
+Requires: httpcomponents-client >= 4.0
 Requires: jakarta-commons-codec
 Requires: xmlrpc3-client
 Requires: xmlrpc3-common
@@ -47,21 +46,22 @@ Requires: ws-commons-util
 Requires: eclipse-egit >= 0.10.0
 
 %description
-Eclipse Fedora Packager is an Eclipse plug-in, which helps
+Fedora Packager for Eclipse is an Eclipse plug-in, which helps
 Fedora contributors to interact with Fedora infrastructure
 such as Koji, Bodhi and Git.
 
 %prep
 %setup -q -n eclipse-fedorapackager
-rm -fr org.apache*
-rm -fr org.json*
 mkdir orbit
 pushd orbit
-ln -s %{_javadir}/xmlrpc3-client.jar
-ln -s %{_javadir}/xmlrpc3-common.jar
-ln -s %{_javadir}/json.jar org.json.jar
-ln -s %{_javadir}/ws-commons-util.jar
-ln -s %{_javadir}/not-yet-commons-ssl.jar commons-ssl.jar
+%{__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
+  %{__ln_s} $i
+done
+%{__ln_s} %{_javadir}/ws-commons-util.jar
+%{__ln_s} %{_javadir}/not-yet-commons-ssl.jar
 popd
 
 %build
@@ -79,18 +79,18 @@ install -d -m 755 %{buildroot}%{install_loc}
 
 # Remove old and create new symlinks to Import-Packages 
 # in %%{_datadir}/eclipse/dropins/packager
-pushd $RPM_BUILD_ROOT%{install_loc}/eclipse/plugins
-rm -rf xmlrpc3-client.jar xmlrpc3-common.jar org.json.jar \
+pushd %{buildroot}%{install_loc}/eclipse/plugins
+%{__rm} -rf xmlrpc3-client.jar xmlrpc3-common.jar org.json.jar \
        ws-commons-util.jar commons-ssl.jar
-ln -s %{_javadir}/xmlrpc3-client.jar
-ln -s %{_javadir}/xmlrpc3-common.jar
-ln -s %{_javadir}/json.jar org.json.jar
-ln -s %{_javadir}/ws-commons-util.jar
-ln -s %{_javadir}/not-yet-commons-ssl.jar commons-ssl.jar
-popd 
-
-%clean
-%{__rm} -rf %{buildroot}
+%{__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
+  %{__ln_s} $i
+done
+%{__ln_s} %{_javadir}/ws-commons-util.jar
+%{__ln_s} %{_javadir}/not-yet-commons-ssl.jar commons-ssl.jar
+popd
 
 %files
 %defattr(-,root,root,-)
@@ -98,6 +98,9 @@ popd
 %doc org.fedoraproject.eclipse.packager-feature/*.html
 
 %changelog
+* Thu Jun 30 2011 Severin Gehwolf <sgehwolf at redhat.com> 0.2.0-0.1.20110630git
+- First attempt to build Fedora Packager for Eclipse 0.2
+
 * Wed Feb 9 2011 Severin Gehwolf <sgehwolf at redhat.com> 0.1.12-1
 - Update to upstream 0.1.12: Fix Koji SSL login mechanism,
   which changed server side.
@@ -106,7 +109,7 @@ popd
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
 * Wed Jan 26 2011 Severin Gehwolf <sgehwolf at redhat.com> 0.1.11-2
-- Changed %description.
+- Changed %%description.
 
 * Wed Jan 26 2011 Severin Gehwolf <sgehwolf at redhat.com> 0.1.11-1
 - Update to upstream 0.1.11
diff --git a/sources b/sources
index 6d43b89..562c115 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3b8f83a1b379703e2a47e0f37b79c17c  eclipse-fedorapackager.tar.xz
+ebcd115a99de00dfcf3ebc2f39ba9a64  eclipse-fedorapackager.tar.xz


More information about the scm-commits mailing list