[eclipse-testframework] Re-name nowin32testfragment patch
Andrew Overholt
overholt at fedoraproject.org
Wed Jul 6 16:05:22 UTC 2011
commit e1ef8fb0933a972731e3e6c39ad09745c49a8fa3
Author: Andrew Overholt <overholt at redhat.com>
Date: Wed Jul 6 12:02:59 2011 -0400
Re-name nowin32testfragment patch
eclipse-nowin32testfragment.patch | 18 ------------------
eclipse-testframework-nowin32testfragment.patch | 18 ++++++++++++++++++
eclipse-testframework.spec | 14 ++++++++++++--
3 files changed, 30 insertions(+), 20 deletions(-)
---
diff --git a/eclipse-testframework-nowin32testfragment.patch b/eclipse-testframework-nowin32testfragment.patch
new file mode 100644
index 0000000..07d19d4
--- /dev/null
+++ b/eclipse-testframework-nowin32testfragment.patch
@@ -0,0 +1,18 @@
+--- org.eclipse.test-feature/feature.xml.orig 2011-07-06 11:55:39.556954480 -0400
++++ org.eclipse.test-feature/feature.xml 2011-07-06 11:56:00.311142010 -0400
+@@ -54,6 +54,7 @@
+ version="0.0.0"
+ unpack="false"/>
+
++<!--
+ <plugin
+ id="org.eclipse.test.performance.win32"
+ download-size="0"
+@@ -61,6 +62,7 @@
+ version="0.0.0"
+ fragment="true"
+ unpack="false"/>
++-->
+
+ <plugin
+ id="org.junit"
diff --git a/eclipse-testframework.spec b/eclipse-testframework.spec
index ed4074d..b8ccc66 100644
--- a/eclipse-testframework.spec
+++ b/eclipse-testframework.spec
@@ -6,7 +6,7 @@
Name: eclipse-testframework
Version: 3.7.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Eclipse Test Framework
Group: Development/Tools
@@ -16,10 +16,14 @@ URL: http://eclipse.org
Source0: %{name}-fetched-src-%{tag}.tar.bz2
Source1: %{name}-fetch-src.sh
# Remove win32 fragment from test feature
-Patch0: eclipse-nowin32testfragment.patch
+Patch0: %{name}-nowin32testfragment.patch
# Some fixes for library.xml
# FIXME: submit parts of this upstream to make tests pwd-agnostic
Patch1: %{name}-libraryXml.patch
+# Fedora doesn't ship the shared license feature
+Patch2: %{name}-nosharedlicense.patch
+# Fedora doesn't have a .source bundle for easymock
+Patch3: %{name}-noeasymocksource.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -37,6 +41,8 @@ Eclipse Test Framework. Used in conjunction with Eclipse JUnit tests.
%setup -q -n %{name}-fetched-src-%{tag}
%patch0
%patch1
+%patch2
+%patch3
sed -i "s:/usr/lib/eclipse:%{_libdir}/%{name}:" org.eclipse.test/library.xml
mkdir orbitDeps
@@ -71,6 +77,10 @@ popd
%changelog
* Wed Jul 6 2011 Andrew Overholt <overholt at redhat.com> 3.7.0-1
+- Add patch to ignore easymock .source bundle.
+- Add patch to avoid shared license feature we don't have in Fedora.
+
+* Wed Jul 6 2011 Andrew Overholt <overholt at redhat.com> 3.7.0-1
- Update to 3.7.
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.6.1-2
More information about the scm-commits
mailing list