commit 92416cabc02d28343ef6f4212c9ddd3737a9f0b3
Author: Krzysztof Daniel <kdaniel at redhat.com>
Date: Fri Jul 12 17:31:24 2013 +0200
RHBZ#964415 && RHBZ 984047
eclipse-fedorapackager-compilation-fix.patch | 20 ++++++++++++++++++++
eclipse-fedorapackager.spec | 12 ++++++++++--
2 files changed, 30 insertions(+), 2 deletions(-)
---
diff --git a/eclipse-fedorapackager-compilation-fix.patch b/eclipse-fedorapackager-compilation-fix.patch
new file mode 100644
index 0000000..3d61783
--- /dev/null
+++ b/eclipse-fedorapackager-compilation-fix.patch
@@ -0,0 +1,20 @@
+--- org.fedoraproject.eclipse.packager.rpm/src/org/fedoraproject/eclipse/packager/rpm/api/SRPMImportCommand.java.bak 2012-08-20 16:25:51.000000000 +0200
++++ org.fedoraproject.eclipse.packager.rpm/src/org/fedoraproject/eclipse/packager/rpm/api/SRPMImportCommand.java 2013-07-12 17:50:39.829108301 +0200
+@@ -128,13 +128,13 @@
+ Set<String> skippedUploads = new HashSet<String>();
+ // install rpm to the project folder
+ SRPMImportOperation sio;
+- try {
++// try {
+ sio = new SRPMImportOperation(project, new File(srpm),
+ RPMProjectLayout.FLAT);
+ sio.run(new NullProgressMonitor());
+- } catch (InvocationTargetException e) {
+- throw new SRPMImportCommandException(e.getMessage(), e);
+- }
++// } catch (InvocationTargetException e) {
++// throw new SRPMImportCommandException(e.getMessage(), e);
++// }
+ if (!sio.getStatus().isOK()) {
+ Throwable e = sio.getStatus().getException();
+ if (e != null) {
diff --git a/eclipse-fedorapackager.spec b/eclipse-fedorapackager.spec
index 3e930f5..2a199ed 100644
--- a/eclipse-fedorapackager.spec
+++ b/eclipse-fedorapackager.spec
@@ -2,7 +2,7 @@
Name: eclipse-fedorapackager
Version: 0.4.1
-Release: 6%{?dist}
+Release: 7%{?dist}
Summary: Fedora Packager for Eclipse
Group: Development/Tools
@@ -11,7 +11,7 @@ URL: https://fedorahosted.org/eclipse-fedorapackager
Source0: https://fedorahosted.org/released/eclipse-fedorapackager/%{name}-%{version}.tar.xz
Patch1: removeCBI.patch
-
+Patch2: eclipse-fedorapackager-compilation-fix.patch
BuildArch: noarch
BuildRequires: java-devel
@@ -35,6 +35,7 @@ BuildRequires: httpcomponents-client >= 4.1.1-3
BuildRequires: xmlrpc-client >= 3.1.3
BuildRequires: xmlrpc-common >= 3.1.3
BuildRequires: ws-commons-util >= 1.0.1-21
+BuildRequires: jakarta-commons-httpclient
# Since 1.1 egit has the remote tracking fix
BuildRequires: eclipse-egit >= 1.1.0
BuildRequires: maven-local
@@ -60,6 +61,7 @@ Requires: apache-commons-codec
Requires: xmlrpc-client >= 3.1.3
Requires: xmlrpc-common >= 3.1.3
Requires: ws-commons-util >= 1.0.1-21
+Requires: jakarta-commons-httpclient
# Since 1.1 egit has the remote tracking fix
Requires: eclipse-egit >= 1.1.0
# Make fedora-packager a dependency, since we refer to some
@@ -74,6 +76,7 @@ such as Koji, Bodhi and Git.
%prep
%setup -q -n eclipse-fedorapackager-%{version}
%patch1 -p1
+%patch2
mkdir orbit
pushd orbit
%{__ln_s} %{_javadir}/xmlrpc-client.jar
@@ -110,6 +113,7 @@ done
%{__ln_s} %{_javadir}/ws-commons-util.jar
%{__ln_s} %{_javadir}/not-yet-commons-ssl.jar
%{__ln_s} %{_javadir}/commons-codec.jar
+%{__ln_s} %{_javadir}/jakarta-commons-httpclient.jar
popd
%files
@@ -117,6 +121,10 @@ popd
%doc org.fedoraproject.eclipse.packager-feature/*.html
%changelog
+* Fri Jul 12 2013 Krzysztof Daniel <kdaniel at redhat.com> 0.4.1-7
+- RHBZ#964415
+- RHBZ#984047
+
* Fri Feb 22 2013 Roland Grunberg <rgrunber at redhat.com> - 0.4.1-6
- Replace 'junit4' with 'junit'.