Minor fixes to specfile and build process.
- Minor specfile cleanup.
- Merge Jetty 9 & Jetty 9.1 patches
- Remove BuildRequires on eclipse-{egit,jgit}
This commit is contained in:
Roland Grunberg
parent
82a8cbb92b
commit
f37f7b91d7
@ -1,29 +0,0 @@
|
||||
From 12bc35c1dc35b7bf25874b4476bc672b940c8714 Mon Sep 17 00:00:00 2001
|
||||
From: Michael Simacek <msimacek@redhat.com>
|
||||
Date: Thu, 28 Nov 2013 13:51:05 +0100
|
||||
Subject: [PATCH] Update to Jetty 9.1.0
|
||||
|
||||
---
|
||||
.../org/eclipse/equinox/http/jetty/internal/EquinoxStdErrLog.java | 6 ++++++
|
||||
1 file changed, 6 insertions(+)
|
||||
|
||||
diff --git rt.equinox.bundles/bundles/org.eclipse.equinox.http.jetty8/src/org/eclipse/equinox/http/jetty/internal/EquinoxStdErrLog.java b/rt.equinox.bundles/bundles/org.eclipse.equinox.http.jetty8/src/org/eclipse/equinox/http/jetty/internal/EquinoxStdErrLog.java
|
||||
index 8ce6825..4cc4b94 100644
|
||||
--- rt.equinox.bundles/bundles/org.eclipse.equinox.http.jetty8/src/org/eclipse/equinox/http/jetty/internal/EquinoxStdErrLog.java
|
||||
+++ rt.equinox.bundles/bundles/org.eclipse.equinox.http.jetty8/src/org/eclipse/equinox/http/jetty/internal/EquinoxStdErrLog.java
|
||||
@@ -169,6 +169,12 @@ public class EquinoxStdErrLog implements Logger {
|
||||
realLogger.debug(thrown);
|
||||
}
|
||||
|
||||
+ public void debug(String msg, long value) {
|
||||
+ if (threshold > DEBUG)
|
||||
+ return;
|
||||
+ realLogger.debug(msg, value);
|
||||
+ }
|
||||
+
|
||||
public void ignore(Throwable ignored) {
|
||||
// Just post this to debug
|
||||
debug(ignored);
|
||||
--
|
||||
1.8.3.1
|
||||
|
||||
@ -629,4 +629,33 @@ index c9224bd..4435b86 100755
|
||||
- }
|
||||
if (sessionInactiveInterval != null)
|
||||
sessionManager.setMaxInactiveInterval(sessionInactiveInterval.intValue());
|
||||
|
||||
|
||||
From 12bc35c1dc35b7bf25874b4476bc672b940c8714 Mon Sep 17 00:00:00 2001
|
||||
From: Michael Simacek <msimacek@redhat.com>
|
||||
Date: Thu, 28 Nov 2013 13:51:05 +0100
|
||||
Subject: [PATCH] Update to Jetty 9.1.0
|
||||
|
||||
---
|
||||
.../org/eclipse/equinox/http/jetty/internal/EquinoxStdErrLog.java | 6 ++++++
|
||||
1 file changed, 6 insertions(+)
|
||||
|
||||
diff --git rt.equinox.bundles/bundles/org.eclipse.equinox.http.jetty8/src/org/eclipse/equinox/http/jetty/internal/EquinoxStdErrLog.java b/rt.equinox.bundles/bundles/org.eclipse.equinox.http.jetty8/src/org/eclipse/equinox/http/jetty/internal/EquinoxStdErrLog.java
|
||||
index 8ce6825..4cc4b94 100644
|
||||
--- rt.equinox.bundles/bundles/org.eclipse.equinox.http.jetty8/src/org/eclipse/equinox/http/jetty/internal/EquinoxStdErrLog.java
|
||||
+++ rt.equinox.bundles/bundles/org.eclipse.equinox.http.jetty8/src/org/eclipse/equinox/http/jetty/internal/EquinoxStdErrLog.java
|
||||
@@ -169,6 +169,12 @@ public class EquinoxStdErrLog implements Logger {
|
||||
realLogger.debug(thrown);
|
||||
}
|
||||
|
||||
+ public void debug(String msg, long value) {
|
||||
+ if (threshold > DEBUG)
|
||||
+ return;
|
||||
+ realLogger.debug(msg, value);
|
||||
+ }
|
||||
+
|
||||
public void ignore(Throwable ignored) {
|
||||
// Just post this to debug
|
||||
debug(ignored);
|
||||
--
|
||||
1.8.3.1
|
||||
|
||||
|
||||
28
eclipse.spec
28
eclipse.spec
@ -9,7 +9,7 @@ Epoch: 1
|
||||
%global eclipse_majmin %{eclipse_major}.%{eclipse_minor}
|
||||
%global eclipse_micro 1
|
||||
%global initialize 1
|
||||
%global eb_commit 79dfa1abc0ba06375b42d0015c7f0ceb3759eb5b
|
||||
%global eb_commit bab4b82a63ce57704cfe70c84f414b6dab8a97dc
|
||||
%global eclipse_tag R4_3_1
|
||||
%global eclipse_version %{eclipse_majmin}.%{eclipse_micro}
|
||||
%global installation_loc %{_libdir}/%{pkg_name}
|
||||
@ -49,7 +49,7 @@ fi;
|
||||
Summary: An open, extensible IDE
|
||||
Name: %{?scl_prefix}eclipse
|
||||
Version: %{eclipse_version}
|
||||
Release: 14%{?dist}
|
||||
Release: 15%{?dist}
|
||||
License: EPL
|
||||
Group: Development/Tools
|
||||
URL: http://www.eclipse.org/
|
||||
@ -123,8 +123,6 @@ Patch20: %{pkg_name}-bug-408505.patch
|
||||
|
||||
Patch21: %{pkg_name}-bug-386377.patch
|
||||
|
||||
Patch22: %{pkg_name}-jetty-9.1.patch
|
||||
|
||||
BuildRequires: ant >= 1.8.3
|
||||
BuildRequires: rsync
|
||||
BuildRequires: make, gcc
|
||||
@ -189,8 +187,6 @@ BuildRequires: mvn(org.apache.maven.plugins:maven-install-plugin)
|
||||
BuildRequires: maven-deploy-plugin
|
||||
BuildRequires: httpcomponents-core
|
||||
BuildRequires: httpcomponents-client
|
||||
BuildRequires: eclipse-egit
|
||||
BuildRequires: eclipse-jgit
|
||||
BuildRequires: eclipse-pde
|
||||
|
||||
%description
|
||||
@ -199,7 +195,6 @@ environments (IDEs), server-side applications, desktop applications, and
|
||||
everything in between.
|
||||
|
||||
%package swt
|
||||
Version: %{eclipse_version}
|
||||
Summary: SWT Library for GTK+
|
||||
Group: Development/Tools
|
||||
# %%{_libdir}/java directory owned by jpackage-utils
|
||||
@ -214,7 +209,6 @@ Requires: webkitgtk3
|
||||
SWT Library for GTK+.
|
||||
|
||||
%package equinox-osgi
|
||||
Version: %{eclipse_version}
|
||||
Summary: Eclipse OSGi - Equinox
|
||||
Requires: java >= 1:1.7.0
|
||||
Requires: jpackage-utils
|
||||
@ -224,7 +218,6 @@ Provides: osgi(system.bundle) = %{epoch}:%{eclipse_version}
|
||||
Eclipse OSGi - Equinox
|
||||
|
||||
%package platform
|
||||
Version: %{eclipse_version}
|
||||
Summary: Eclipse platform common files
|
||||
Group: Development/Tools
|
||||
Requires: ant-antlr ant-apache-bcel ant-apache-log4j ant-apache-oro ant-apache-regexp ant-apache-resolver ant-commons-logging ant-apache-bsf ant-commons-net
|
||||
@ -271,7 +264,6 @@ The Eclipse Platform is the base of all IDE plugins. This does not include the
|
||||
Java Development Tools or the Plugin Development Environment.
|
||||
|
||||
%package jdt
|
||||
Version: %{eclipse_version}
|
||||
Summary: Eclipse Java Development Tools
|
||||
Group: Development/Tools
|
||||
Requires: %{name}-platform = %{epoch}:%{eclipse_version}-%{release}
|
||||
@ -283,7 +275,6 @@ Eclipse Java Development Tools. This package is required to use Eclipse for
|
||||
developing software written in the Java programming language.
|
||||
|
||||
%package pde
|
||||
Version: %{eclipse_version}
|
||||
Summary: Eclipse Plugin Development Environment
|
||||
Group: Development/Tools
|
||||
Provides: %{name} = %{epoch}:%{eclipse_version}-%{release}
|
||||
@ -299,7 +290,6 @@ Eclipse Plugin Development Environment. This package is required for
|
||||
developing Eclipse plugins.
|
||||
|
||||
%package tests
|
||||
Version: %{eclipse_version}
|
||||
Summary: Eclipse Tests
|
||||
Group: Development/Tools
|
||||
Requires: %{name}-pde = %{epoch}:%{eclipse_version}-%{release}
|
||||
@ -338,7 +328,6 @@ tar --strip-components=1 -xf %{SOURCE1}
|
||||
pushd rt.equinox.framework
|
||||
%patch21 -p1
|
||||
popd
|
||||
%{!?scl:%patch22}
|
||||
|
||||
#Disable as many things as possible to make the build faster. We care only for Eclipse.
|
||||
%pom_disable_module platform.sdk eclipse.platform.releng.tychoeclipsebuilder
|
||||
@ -460,19 +449,15 @@ export JAVA_HOME=%{java_home}
|
||||
|
||||
pushd eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.linux.%{eclipse_arch}
|
||||
xmvn -o clean verify \
|
||||
-Dmaven.test.skip=true -Dnative=gtk.linux.%{eclipse_arch} -DskipTychoVersionCheck \
|
||||
-Dmaven.test.skip=true -Dnative=gtk.linux.%{eclipse_arch} \
|
||||
-Dtycho.local.keepTarget -Dmaven.repo.local=../../../.m2
|
||||
popd
|
||||
|
||||
export GTK_VERSION=3.0
|
||||
xmvn -o clean verify -P update-branding-plugins \
|
||||
-Dmaven.test.skip=true -Dnative=gtk.linux.%{eclipse_arch} -DskipTychoVersionCheck \
|
||||
-Dmaven.test.skip=true -Dnative=gtk.linux.%{eclipse_arch} \
|
||||
-Dtycho.local.keepTarget -DbuildId=`echo "%{release}" | tr -d "."`
|
||||
|
||||
# XMvn may places jars differently from mvn-rpmbuild
|
||||
sed -i 's/glassfish-jsp-api\.jar/glassfish-jsp-api\/javax\.servlet\.jsp-api\.jar/' dependencies/./replace_platform_plugins_with_symlinks.sh
|
||||
sed -i 's/felix\/org\.apache\.felix\.gogo\.runtime\.jar/felix\/felix-gogo-runtime\.jar/' dependencies/./replace_platform_plugins_with_symlinks.sh
|
||||
|
||||
#symlink necessary plugins (that are provided by other packages)
|
||||
dependencies/./replace_platform_plugins_with_symlinks.sh \
|
||||
eclipse.platform.releng.tychoeclipsebuilder/platform/target/products/org.fedoraproject.eclipse.platform/linux/gtk/%{eclipse_arch}/eclipse %{_javadir}
|
||||
@ -1003,6 +988,11 @@ fi
|
||||
%{_libdir}/%{pkg_name}/plugins/org.eclipse.osgi.util_*
|
||||
|
||||
%changelog
|
||||
* Mon Dec 16 2013 Roland Grunberg <rgrunber@redhat.com> - 1:4.3.1-15
|
||||
- Minor specfile cleanup.
|
||||
- Merge Jetty 9 & Jetty 9.1 patches.
|
||||
- Remove BuildRequires on eclipse-{egit,jgit}.
|
||||
|
||||
* Fri Dec 13 2013 Alexander Kurtakov <akurtako@redhat.com> 1:4.3.1-14
|
||||
- Reenable API generation.
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user