[eclipse-pydev/f18: 9/11] Make junit anoptional requirement for org.eclipse.pydev.debug

[swagiaal]

commit 73955d690b4d7ae9fd6da12ada3b8873211226a0
Author: Sami Wagiaalla <swagiaal at redhat.com>
Date:   Wed Apr 24 13:20:41 2013 -0400

    Make junit anoptional requirement for org.eclipse.pydev.debug

 eclipse-pydev.spec              |   39 +++++++++++++++++++++++----------------
 pydev-make-junit-optional.patch |   30 ++++++++++++++++++++++++++++++
 2 files changed, 53 insertions(+), 16 deletions(-)
---
diff --git a/eclipse-pydev.spec b/eclipse-pydev.spec
index e6f1660..030e3d7 100644
--- a/eclipse-pydev.spec
+++ b/eclipse-pydev.spec
@@ -9,7 +9,7 @@ Epoch: 1
 Summary:          Eclipse Python development plug-in
 Name:             eclipse-pydev
 Version:          2.7.3
-Release:          1%{?dist}
+Release:          2%{?dist}
 License:          EPL
 URL:              http://pydev.org
 Group:            Development/Tools
@@ -22,6 +22,7 @@ Patch2:           remove-winregistry.patch
 Patch3:           pydev-remove-jython.patch
 Patch4:           pydev-add-shared_core-to-feature.patch
 Patch5:           pydev-remove-junit-version-limit.patch
+Patch6:           pydev-make-junit-optional.patch
 
 BuildRequires:    java-devel >= 1.5.0
 BuildArch:        noarch
@@ -77,6 +78,7 @@ Mylyn Task-Focused UI extensions for Pydev.
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 #fix mylyn plugin version
 sed --in-place 's:version="0.4.0":version="%{version}.%{qualifier}":' features/org.python.pydev.mylyn.feature/feature.xml
@@ -167,25 +169,25 @@ ln -sf %{_javadir}/junit.jar \
 ln -sf %{_jnidir}/jpathwatch.jar \
        org.python.pydev.core_%{version}.%{qualifier}/lib/jpathwatch-0-94.jar
 
-rm -rf org.python.pydev.debug_%{version}.%{qualifier}/commons-logging-1.1.jar
-ln -sf %{_javadir}/commons-logging.jar \
-       org.python.pydev.debug_%{version}.%{qualifier}/commons-logging-1.1.jar
+file=`find . -name commons-logging-1.1.jar`
+rm -f $file
+ln -sf %{_javadir}/commons-logging.jar $file
 
-rm -rf org.python.pydev.debug_%{version}.%{qualifier}/ws-commons-util-1.0.2.jar
-ln -sf %{_javadir}/ws-commons-util.jar \
-       org.python.pydev.debug_%{version}.%{qualifier}/ws-commons-util-1.0.2.jar
+file=`find . -name ws-commons-util-1.0.2.jar`
+rm -f $file
+ln -sf %{_javadir}/ws-commons-util.jar $file
 
-rm -f org.python.pydev.debug_%{version}.%{qualifier}/xmlrpc-client-3.1.jar
-ln -sf %{_javadir}/xmlrpc-client.jar \
-       org.python.pydev.debug_%{version}.%{qualifier}/xmlrpc-client-3.1.jar
+file=`find . -name xmlrpc-client-3.1.jar`
+rm -f $file
+ln -sf %{_javadir}/xmlrpc-client.jar $file
 
-rm -f org.python.pydev.debug_%{version}.%{qualifier}/xmlrpc-common-3.1.jar
-ln -sf %{_javadir}/xmlrpc-common.jar \
-       org.python.pydev.debug_%{version}.%{qualifier}/xmlrpc-common-3.1.jar
+file=`find . -name xmlrpc-common-3.1.jar`
+rm -f $file
+ln -sf %{_javadir}/xmlrpc-common.jar $file
 
-rm -f org.python.pydev.debug_%{version}.%{qualifier}/xmlrpc-server-3.1.jar
-ln -sf %{_javadir}/xmlrpc-server.jar \
-       org.python.pydev.debug_%{version}.%{qualifier}/xmlrpc-server-3.1.jar
+file=`find . -name xmlrpc-server-3.1.jar`
+rm -f $file
+ln -sf %{_javadir}/xmlrpc-server.jar $file
 
 # Symlink and copy required python libs before deleting Lib dir.
 mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/jython/Lib
@@ -219,6 +221,11 @@ rm -f  %{_datadir}/jython/Lib/optparse.py
 %{install_loc}/pydev-mylyn
 
 %changelog
+* Wed Apr 24 2013 Sami Wagiaalla <swagiaal at redhat.com> 1:2.7.3-2
+- Make junit an optional requirement for org.eclipse.pydev.debug
+- Use 'find' to find and link jars so that we don't have to specify
+  the bundle version.
+
 * Thu Mar 28 2013 Sami Wagiaalla <swagiaal at redhat.com> 1:2.7.3-1
 - Update to release 2.7.3.
 - Add shared_core to feature plugins.
diff --git a/pydev-make-junit-optional.patch b/pydev-make-junit-optional.patch
new file mode 100644
index 0000000..b61bf89
--- /dev/null
+++ b/pydev-make-junit-optional.patch
@@ -0,0 +1,30 @@
+# The version bump should be removed next updated.
+--- a/features/org.python.pydev.feature/feature.xml
++++ b/features/org.python.pydev.feature/feature.xml
+@@ -167,7 +167,7 @@ This Agreement is governed by the laws of the State of New York and the intellec
+          id="org.python.pydev.debug"
+          download-size="1350"
+          install-size="1350"
+-         version="2.7.3.2013031601"/>
++         version="2.7.3.2013031602"/>
+ 
+    <plugin
+          id="org.python.pydev.refactoring"
+--- a/plugins/org.python.pydev.debug/META-INF/MANIFEST.MF
++++ b/plugins/org.python.pydev.debug/META-INF/MANIFEST.MF
+@@ -2,12 +2,12 @@ Manifest-Version: 1.0
+ Bundle-ManifestVersion: 2
+ Bundle-Name: Pydev debug
+ Bundle-SymbolicName: org.python.pydev.debug; singleton:=true
+-Bundle-Version: 2.7.3.2013031601
++Bundle-Version: 2.7.3.2013031602
+ Bundle-ClassPath: pydev-debug.jar
+ Bundle-Activator: org.python.pydev.debug.core.PydevDebugPlugin
+ Bundle-Vendor: Aptana
+ Bundle-Localization: plugin
+-Require-Bundle: org.junit,
++Require-Bundle: org.junit;resolution:=optional,
+  org.eclipse.ui,
+  org.eclipse.ui.ide,
+  org.eclipse.core.runtime,
+