[eclipse-ptp] Add patch to fix up some javax deps
Orion Poplawski
orion at fedoraproject.org
Thu Apr 11 13:42:21 UTC 2013
commit e641f25e198ec88fdee1739b222de2e114cfeedf
Author: Orion Poplawski <orion at nwra.com>
Date: Thu Apr 11 07:42:19 2013 -0600
Add patch to fix up some javax deps
eclipse-ptp-deps.patch | 17 +++++++++++++++++
eclipse-ptp.spec | 3 +++
2 files changed, 20 insertions(+), 0 deletions(-)
---
diff --git a/eclipse-ptp-deps.patch b/eclipse-ptp-deps.patch
new file mode 100644
index 0000000..3b8921c
--- /dev/null
+++ b/eclipse-ptp-deps.patch
@@ -0,0 +1,17 @@
+diff -up eclipse-ptp-7.0.0/org.eclipse.ptp-3ef93135125e9616e863d879fe188f338f01d9a7/releng/org.eclipse.ptp.rcp.sysmon-feature/feature.xml.deps eclipse-ptp-7.0.0/org.eclipse.ptp-3ef93135125e9616e863d879fe188f338f01d9a7/releng/org.eclipse.ptp.rcp.sysmon-feature/feature.xml
+--- eclipse-ptp-7.0.0/org.eclipse.ptp-3ef93135125e9616e863d879fe188f338f01d9a7/releng/org.eclipse.ptp.rcp.sysmon-feature/feature.xml.deps 2013-04-08 14:06:09.000000000 -0600
++++ eclipse-ptp-7.0.0/org.eclipse.ptp-3ef93135125e9616e863d879fe188f338f01d9a7/releng/org.eclipse.ptp.rcp.sysmon-feature/feature.xml 2013-04-11 07:40:10.091146294 -0600
+@@ -312,13 +312,6 @@
+ unpack="false"/>
+
+ <plugin
+- id="javax.annotation"
+- download-size="0"
+- install-size="0"
+- version="0.0.0"
+- unpack="false"/>
+-
+- <plugin
+ id="javax.inject"
+ download-size="0"
+ install-size="0"
diff --git a/eclipse-ptp.spec b/eclipse-ptp.spec
index 26352bb..7538d99 100644
--- a/eclipse-ptp.spec
+++ b/eclipse-ptp.spec
@@ -35,6 +35,8 @@ Source3: finddeps.sh
Patch0: eclipse-ptp-notrax.patch
# Remove rdt.remotetools from ptp feature
Patch1: eclipse-ptp-noremote.patch
+# Fix up some javax deps
+Patch2: eclipse-ptp-deps.patch
# Remove some unneeded dependencies
BuildRequires: java-devel >= 1.5.0
@@ -306,6 +308,7 @@ sed -i -e "/tycho-version/s/>.*</>${tychover}</" */pom.xml
pushd org.eclipse.ptp-%{ptp_git_tag}
%patch0 -p1 -b .notrax
%patch1 -p2 -b .noremote
+%patch2 -p2 -b .deps
# Copy into place for %doc
cp releng/org.eclipse.ptp-feature/epl-v10.html ..
popd
More information about the scm-commits
mailing list