From 1de46433ddb8d95d56df17b89a4bc295ba14cf8d Mon Sep 17 00:00:00 2001 From: Alexander Kurtakov Date: Aug 18 2009 11:17:08 +0000 Subject: - Use system hamcrest. --- diff --git a/eclipse.spec b/eclipse.spec index 3497394..84d0e87 100644 --- a/eclipse.spec +++ b/eclipse.spec @@ -30,7 +30,7 @@ Epoch: 1 Summary: An open, extensible IDE Name: eclipse Version: %{eclipse_majmin}.%{eclipse_micro} -Release: 0.7%{?dist} +Release: 0.8%{?dist} License: EPL Group: Text Editors/Integrated Development Environments (IDE) URL: http://www.eclipse.org/ @@ -186,6 +186,7 @@ BuildRequires: lucene-contrib >= 2.3.1-3.4 BuildRequires: regexp BuildRequires: junit >= 3.8.1-3jpp BuildRequires: junit4 +BuildRequires: hamcrest >= 0:1.1-9.2 BuildRequires: sat4j >= 2.1.0-1 BuildRequires: objectweb-asm @@ -275,6 +276,7 @@ Provides: eclipse-sdk Requires: %{name}-platform = %{epoch}:%{version}-%{release} Requires: %{name}-jdt = %{epoch}:%{version}-%{release} Requires: objectweb-asm +Requires: hamcrest >= 0:1.1-9.2 # For PDE Build wrapper script Requires: bash Provides: %{name}-pde-runtime = 1:%{version}-%{release} @@ -290,7 +292,7 @@ developing Eclipse plugins. %setup -q -n eclipse-build-R0_3_0 cp %{SOURCE1} . sed --in-place "s///" build.xml -ant -DbuildId=I20090611-1540 applyPatches +ant -DbuildId=I20090611-1540 applyPatches pushd build/eclipse-I20090611-1540-fetched-src #sed --in-place "s/java5.home/java.home/" build.xml @@ -316,7 +318,7 @@ pushd features/org.eclipse.equinox.executable zip -q -9 -r ../../plugins/org.eclipse.platform/launchersrc.zip library popd #-e "s|-breakiterator|;../org.eclipse.equinox.util/@dot\n;../org.eclipse.ecf_3.0.0.v20090302-0803.jar\n-breakiterator|" \ - + # Use our system-installed javadocs, reference only what we built, and # don't like to osgi.org docs (FIXME: maybe we should package them?) sed -i -e "s|http://java.sun.com/j2se/1.4.2/docs/api|%{_datadir}/javadoc/java|" \ @@ -376,7 +378,7 @@ SWT_VERSION=$SWT_MAJ_VER$SWT_MIN_VER swt_frag_ver=$(grep v$SWT_VERSION plugins/org.eclipse.swt.gtk.linux.x86/build.xml | sed "s:.*<.*\"\(.*\)\" />:\1:") swt_frag_ver_s390x=$(grep "version\.suffix\" value=" plugins/org.eclipse.swt.gtk.linux.s390x/build.xml | sed "s:.*<.*\"\(.*\)\" />:\1:") sed --in-place "s|$swt_frag_ver_s390x|$swt_frag_ver|g" plugins/org.eclipse.swt.gtk.linux.s390x/build.xml \ - plugins/org.eclipse.swt.gtk.linux.s390x/META-INF/MANIFEST.MF + plugins/org.eclipse.swt.gtk.linux.s390x/META-INF/MANIFEST.MF # Nasty hack to get suppport for ppc64, sparc{,64} and alpha %ifarch ppc64 @@ -457,7 +459,7 @@ IFS=' done popd IFS=$OLDIFS - + %endif arches=$(grep "antfile=\"build.xml\" dir=\".*gtk\.linux\.*" \ @@ -561,14 +563,14 @@ COMMONSELVERSION=$(ls plugins | grep commons.el_ | \ rm plugins/org.apache.commons.el_$COMMONSELVERSION ln -s %{_javadir}/commons-el.jar \ plugins/org.apache.commons.el_$COMMONSELVERSION - + # link to commons-codec COMMONSCODECVERSION=$(ls plugins | grep commons.codec_ | \ sed 's/org.apache.commons.codec_//') rm plugins/org.apache.commons.codec_$COMMONSCODECVERSION ln -s %{_javadir}/commons-codec.jar \ plugins/org.apache.commons.codec_$COMMONSCODECVERSION - + # link to commons-httpclient COMMONSHTTPVERSION=$(ls plugins | grep commons.httpclient_ | \ sed 's/org.apache.commons.httpclient_//') @@ -576,6 +578,13 @@ rm plugins/org.apache.commons.httpclient_$COMMONSHTTPVERSION ln -s %{_javadir}/commons-httpclient.jar \ plugins/org.apache.commons.httpclient_$COMMONSHTTPVERSION +# link to hamcrest-core +HAMCRESTCOREVERSION=$(ls plugins | grep org.hamcrest.core_ | \ + sed 's/org.hamcrest.core_//') +rm plugins/org.hamcrest.core_$HAMCRESTCOREVERSION +ln -s %{_javadir}/hamcrest/core.jar \ + plugins/org.hamcrest.core_$HAMCRESTCOREVERSION + # link to jasper JASPERVERSION=$(ls plugins | grep org.apache.jasper_ | \ sed 's/org.apache.jasper_//') @@ -595,7 +604,7 @@ SERVLETAPIVERSION=$(ls plugins | grep javax.servlet_2.5 | \ rm plugins/javax.servlet_2.5* ln -s %{_javadir}/tomcat6-servlet-2.5-api.jar \ plugins/javax.servlet_2.5$SERVLETAPIVERSION - + # # link to jsp-api JSPAPIVERSION=$(ls plugins | grep javax.servlet.jsp_ | \ @@ -608,7 +617,7 @@ ln -s %{_javadir}/tomcat5-jsp-2.0-api.jar \ # https://bugs.eclipse.org/bugs/show_bug.cgi?id=170662 rm plugins/org.eclipse.swt/extra_jars/exceptions.jar \ plugins/org.eclipse.osgi/osgi/osgi.cmpn.jar \ - plugins/org.eclipse.osgi/osgi/osgi.core.jar + plugins/org.eclipse.osgi/osgi/osgi.core.jar # FIXME: figure out a way to symlink to something. Alternatively, # patch out of package.org.eclipse.sdk*.xml. @@ -850,7 +859,7 @@ org.eclipse.equinox.p2.director \ -metadataRepository file:$metadataDir \ -artifactRepository file:$metadataDir \ -destination $provisionDir \ --bundlepool $provisionDir +-bundlepool $provisionDir # Stuff in JDT, PDE, SDK for f in about.html about_files \.eclipseproduct epl-v10.html notice.html readme; do @@ -1088,6 +1097,13 @@ rm dropins/sdk/plugins/org.objectweb.asm_$ASMPLUGINVERSION ln -s %{_javadir}/objectweb-asm/asm-all.jar \ dropins/sdk/plugins/org.objectweb.asm_$ASMPLUGINVERSION +# link to hamcrest-core +HAMCRESTCOREVERSION=$(ls dropins/sdk/plugins | grep org.hamcrest.core_ | \ + sed 's/org.hamcrest.core_//') +rm dropins/sdk/plugins/org.hamcrest.core_$HAMCRESTCOREVERSION +ln -s %{_javadir}/hamcrest/core.jar \ + dropins/sdk/plugins/org.hamcrest.core_$HAMCRESTCOREVERSION + ## BEGIN ANT ## ANTDIR=plugins/$(ls plugins | grep org.apache.ant_) rm $ANTDIR/lib/* @@ -1160,14 +1176,14 @@ COMMONSELVERSION=$(ls plugins | grep commons.el_ | \ rm plugins/org.apache.commons.el_$COMMONSELVERSION ln -s %{_javadir}/commons-el.jar \ plugins/org.apache.commons.el_$COMMONSELVERSION - + # link to commons-el COMMONSCODECVERSION=$(ls plugins | grep commons.codec_ | \ sed 's/org.apache.commons.codec_//') rm plugins/org.apache.commons.codec_$COMMONSCODECVERSION ln -s %{_javadir}/commons-codec.jar \ plugins/org.apache.commons.codec_$COMMONSCODECVERSION - + # link to commons-el COMMONSHTTPVERSION=$(ls plugins | grep commons.httpclient_ | \ sed 's/org.apache.commons.httpclient_//') @@ -1452,6 +1468,9 @@ fi #%{_libdir}/%{name}/configuration/org.eclipse.equinox.source %changelog +* Tue Aug 18 2009 Alexander Kurtakov 1:3.5.0-0.8 +- Use system hamcrest. + * Mon Aug 17 2009 Alexander Kurtakov 1:3.5.0-0.7 - Use o.e.equinox.initializer from SOURCE1 instead of separate one. @@ -1509,7 +1528,7 @@ fi - Remove Fedora branding. * Thu May 7 2009 Andrew Overholt 1:3.5.0-0.2.7 -- Update patch to tests' library.xml to allow for easy debugging of tests. +- Update patch to tests' library.xml to allow for easy debugging of tests. * Wed Apr 29 2009 Alexander Kurtakov 1:3.5.0-0.2.6 - Fix initializer run (sed again).