[eclipse] Remove easymock and junit duplications from tests.
Krzysztof Daniel
kdaniel at fedoraproject.org
Thu Feb 28 07:24:27 UTC 2013
commit 432494e63b4923401ac3c24a8dcce3267a81d97c
Author: Krzysztof Daniel <kdaniel at redhat.com>
Date: Thu Feb 28 08:24:14 2013 +0100
Remove easymock and junit duplications from tests.
eclipse.spec | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
---
diff --git a/eclipse.spec b/eclipse.spec
index 99f0d69..2f898f1 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -55,7 +55,7 @@ fi;
Summary: An open, extensible IDE
Name: %{?scl_prefix}eclipse
Version: %{eclipse_version}
-Release: 0.19.git3fd9eca%{?dist}
+Release: 0.20.git3fd9eca%{?dist}
License: EPL
Group: Development/Tools
URL: http://www.eclipse.org/
@@ -730,14 +730,14 @@ rm $RPM_BUILD_ROOT/%{_javadir}/eclipse-testing/eclipse-junit-tests-*.zip
rm $RPM_BUILD_ROOT/%{_javadir}/eclipse-testing/runtests.bat
pushd $RPM_BUILD_ROOT/%{_javadir}/eclipse-testing/plugins
-rm -rf org.easymock_
+f=`ls | grep org.easymock_`
+rm $f
+ln -s /usr/share/java/easymock.jar $f
rm -rf org.hamcrest.core_*
-rm -rf com.junit_*
+rm -rf org.junit_*
rm -rf org.junit4_*
-ln -s /usr/share/java/easymock.jar
popd
-
sed -i -e "s#@libdir@#%{_libdir}#" $RPM_BUILD_ROOT/%{_javadir}/eclipse-testing/runtests.sh
touch $RPM_BUILD_ROOT%{_bindir}/%{pkg_name}-runEclipsePackageTests
@@ -1013,6 +1013,9 @@ echo "pushd %{_javadir}/eclipse-testing;./runtests.sh -os linux -ws gtk -arch %{
%{_libdir}/%{pkg_name}/plugins/org.eclipse.osgi.util_*
%changelog
+* Wed Feb 27 2013 Krzysztof Daniel <kdaniel at redhat.com> 1:4.3.0-0.20.git3fd9eca
+- Remove easymock and junit duplications from tests.
+
* Wed Feb 27 2013 Krzysztof Daniel <kdaniel at redhat.com> 1:4.3.0-0.19.git3fd9eca
- Fix the /usr/lib/java/swt.jar symlink.
More information about the scm-commits
mailing list