rpms/eclipse/devel eclipse.spec,1.578,1.579
Andrew Overholt (overholt)
fedora-extras-commits at redhat.com
Mon Aug 11 19:31:52 UTC 2008
- Previous message (by thread): rpms/nmap/devel nmap.spec,1.46,1.47
- Next message (by thread): rpms/libdrm/devel import.log, NONE, 1.1 .cvsignore, 1.13, 1.14 libdrm-2.4.0-no-bc.patch, 1.1, 1.2 libdrm.spec, 1.46, 1.47 sources, 1.13, 1.14
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: overholt
Update of /cvs/pkgs/rpms/eclipse/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21013
Modified Files:
eclipse.spec
Log Message:
* Mon Aug 11 2008 Andrew Overholt <overholt at redhat.com> 3.4.0-19
- Move jdt and sdk dropins contents to non-eclipse-sub-dir place which
makes dropins reconciler see them as dropins and not extension
locations
- Add versions to jetty, lucene, and jsch Requires
Index: eclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.578
retrieving revision 1.579
diff -u -r1.578 -r1.579
--- eclipse.spec 7 Aug 2008 18:57:23 -0000 1.578
+++ eclipse.spec 11 Aug 2008 19:31:22 -0000 1.579
@@ -1,5 +1,4 @@
# TODO:
-# - get someone to update the splash screen properly
# - update icu4j and jasper to use %%{_libdir}/eclipse and not %%{_datadir}/eclipse after we build 3.4
# - update ecj-rpmdebuginfo patch
# - look at startup script and launcher patches
@@ -14,9 +13,6 @@
%define eclipse_micro 0
%define swtver 3.4.0.v3448f
-# Prevent brp-java-repack-jars from being run.
-%define __jar_repack 0
-
# All arches line up between Eclipse and Linux kernel names except i386 -> x86
%ifarch %{ix86}
%define eclipse_arch x86
@@ -27,7 +23,7 @@
Summary: An open, extensible IDE
Name: eclipse
Version: %{eclipse_majmin}.%{eclipse_micro}
-Release: 18%{?dist}
+Release: 19%{?dist}
License: EPL
Group: Text Editors/Integrated Development Environments (IDE)
URL: http://www.eclipse.org/
@@ -132,6 +128,11 @@
# upstream so remove the signatures in the manifests
Patch37: %{name}-nojarsignatures.patch
+## Back-port patches from 3.4.x stream. These will be in 3.4.1.
+## https://bugs.eclipse.org/bugs/show_bug.cgi?id=242632
+#Patch39: %{name}-profilesync-e.o242632.patch
+#Patch40: %{name}-profilesync-e.o242632-2.patch
+
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: ant
BuildRequires: jpackage-utils >= 0:1.5, make, gcc
@@ -160,14 +161,14 @@
# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=180642
BuildRequires: ant-antlr ant-apache-bcel ant-apache-log4j ant-apache-oro ant-apache-regexp ant-apache-resolver ant-commons-logging
BuildRequires: ant-javamail ant-jdepend ant-junit ant-nodeps ant-swing ant-trax ant-jsch
-BuildRequires: jsch >= 0:0.1.31
+BuildRequires: jsch >= 0:0.1.39
BuildRequires: jakarta-commons-beanutils jakarta-commons-collections jakarta-commons-digester jakarta-commons-dbcp jakarta-commons-fileupload jakarta-commons-launcher jakarta-commons-modeler jakarta-commons-pool
BuildRequires: jakarta-commons-el >= 1.0-8jpp
BuildRequires: jakarta-commons-logging >= 1.0.4-6jpp.3
BuildRequires: mx4j >= 2.1
-BuildRequires: jetty
-BuildRequires: lucene >= 1.9.1
-BuildRequires: lucene-contrib >= 1.9.1
+BuildRequires: jetty >= 5.1.14-1.3
+BuildRequires: lucene >= 2.3.1-3.4
+BuildRequires: lucene-contrib >= 2.3.1-3.4
BuildRequires: regexp
BuildRequires: junit >= 3.8.1-3jpp
BuildRequires: junit4
@@ -236,10 +237,10 @@
Requires: jakarta-commons-logging >= 1.0.4-6jpp.3
Requires: mx4j >= 2.1
Requires: tomcat5-jasper-eclipse >= 5.5.26-1.5
-Requires: jetty
-Requires: jsch >= 0.1.31
-Requires: lucene >= 1.9.1
-Requires: lucene-contrib >= 1.9.1
+Requires: jetty >= 5.1.14-1.3
+Requires: jsch >= 0.1.39
+Requires: lucene >= 2.3.1-3.4
+Requires: lucene-contrib >= 2.3.1-3.4
Requires: regexp
Requires: sat4j
Provides: eclipse-cvs-client = 1:%{version}-%{release}
@@ -356,6 +357,14 @@
%patch36
%patch37
+#pushd plugins/org.eclipse.equinox.p2.reconciler.dropins
+#%patch39
+#popd
+#
+#pushd plugins/org.eclipse.equinox.p2.touchpoint.eclipse
+#%patch40
+#popd
+
# Remove signatures for JARs
find -iname \*.sf | xargs rm
find -iname \*.rsa | xargs rm
@@ -868,14 +877,15 @@
mv $installDir/$f $provisionDir
fi
done
+# FIXME: should add artifacts.xml here
dropins=$provisionDir/dropins
-mkdir -p $dropins/jdt/eclipse $dropins/sdk/eclipse
-mv $jdtDir/features $dropins/jdt/eclipse
-mv $jdtDir/plugins $dropins/jdt/eclipse
+mkdir -p $dropins/jdt $dropins/sdk
+mv $jdtDir/features $dropins/jdt
+mv $jdtDir/plugins $dropins/jdt
mv $jdtMetadata/content.xml $dropins/jdt
-mv $sdkDir/features $dropins/sdk/eclipse
-mv $sdkDir/plugins $dropins/sdk/eclipse
+mv $sdkDir/features $dropins/sdk
+mv $sdkDir/plugins $dropins/sdk
mv $sdkMetadata/content.xml $dropins/sdk
rm -rf $metadataDir $jdtDir $sdkDir $installDir
mv $provisionDir $sdkDir
@@ -1003,10 +1013,10 @@
popd
# Install the eclipse-ecj.jar symlink for java-1.4.2-gcj-compat's "javac"
-JDTCORESUFFIX=$(ls $RPM_BUILD_ROOT%{_libdir}/%{name}/dropins/jdt/eclipse/plugins \
+JDTCORESUFFIX=$(ls $RPM_BUILD_ROOT%{_libdir}/%{name}/dropins/jdt/plugins \
| grep jdt.core_ | sed "s/org.eclipse.jdt.core_//")
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
-ln -s %{_libdir}/%{name}/dropins/jdt/eclipse/plugins/org.eclipse.jdt.core_$JDTCORESUFFIX \
+ln -s %{_libdir}/%{name}/dropins/jdt/plugins/org.eclipse.jdt.core_$JDTCORESUFFIX \
$RPM_BUILD_ROOT%{_javadir}/eclipse-ecj-%{version}.jar
ln -s %{_javadir}/eclipse-ecj-%{version}.jar \
$RPM_BUILD_ROOT%{_javadir}/eclipse-ecj.jar
@@ -1060,11 +1070,11 @@
cp -p copy-platform $RPM_BUILD_ROOT%{_libdir}/%{name}/buildscripts
copyPlatform=$RPM_BUILD_ROOT%{_libdir}/%{name}/buildscripts/copy-platform
pushd $RPM_BUILD_ROOT%{_libdir}/%{name}
-for p in $(ls -d dropins/jdt/eclipse/plugins/*); do
+for p in $(ls -d dropins/jdt/plugins/*); do
plugin=$(basename $p)
echo $p | sed -e"s,^\(.*\),[ ! -e plugins/$plugin ] \&\& ln -s \$eclipse/\1 plugins/$plugin," >> $copyPlatform
done
-for p in $(ls -d dropins/sdk/eclipse/plugins/*); do
+for p in $(ls -d dropins/sdk/plugins/*); do
plugin=$(basename $p)
echo $p | sed -e"s,^\(.*\),[ ! -e plugins/$plugin ] \&\& ln -s \$eclipse/\1 plugins/$plugin," >> $copyPlatform
done
@@ -1073,7 +1083,7 @@
# Install the PDE Build wrapper script.
install -p -D -m0755 %{SOURCE21} \
$RPM_BUILD_ROOT%{_libdir}/%{name}/buildscripts/pdebuild
-PDEBUILDVERSION=$(ls $RPM_BUILD_ROOT%{_libdir}/%{name}/dropins/sdk/eclipse/plugins \
+PDEBUILDVERSION=$(ls $RPM_BUILD_ROOT%{_libdir}/%{name}/dropins/sdk/plugins \
| grep org.eclipse.pde.build_ | \
sed 's/org.eclipse.pde.build_//')
sed -i "s/@PDEBUILDVERSION@/$PDEBUILDVERSION/g" \
@@ -1084,11 +1094,11 @@
ln -s %{_javadir}/org.sat4j.core_* plugins/
ln -s %{_javadir}/org.sat4j.pb_* plugins/
-ASMPLUGINVERSION=$(ls dropins/sdk/eclipse/plugins | grep org.objectweb.asm_ | \
+ASMPLUGINVERSION=$(ls dropins/sdk/plugins | grep org.objectweb.asm_ | \
sed 's/org.objectweb.asm_//')
-rm dropins/sdk/eclipse/plugins/org.objectweb.asm_$ASMPLUGINVERSION
+rm dropins/sdk/plugins/org.objectweb.asm_$ASMPLUGINVERSION
ln -s %{_javadir}/objectweb-asm/asm-all.jar \
- dropins/sdk/eclipse/plugins/org.objectweb.asm_$ASMPLUGINVERSION
+ dropins/sdk/plugins/org.objectweb.asm_$ASMPLUGINVERSION
## BEGIN ANT ##
ANTDIR=plugins/$(ls plugins | grep org.apache.ant_)
@@ -1126,7 +1136,7 @@
rm plugins/org.mortbay.jetty_$JETTYPLUGINVERSION
ln -s %{_javadir}/jetty/jetty.jar plugins/org.mortbay.jetty_$JETTYPLUGINVERSION
-pushd dropins/jdt/eclipse
+pushd dropins/jdt
build-jar-repository -s -p plugins/org.junit_* junit
JUNIT4VERSION=$(ls plugins | grep org.junit4_ | sed 's/org.junit4_//')
@@ -1209,9 +1219,8 @@
%dir %{_libdir}/%{name}
%dir %{_libdir}/%{name}/dropins
%dir %{_libdir}/%{name}/dropins/jdt
-%dir %{_libdir}/%{name}/dropins/jdt/eclipse
-%dir %{_libdir}/%{name}/dropins/jdt/eclipse/plugins
-%{_libdir}/%{name}/dropins/jdt/eclipse/plugins/org.eclipse.jdt.core_*
+%dir %{_libdir}/%{name}/dropins/jdt/plugins
+%{_libdir}/%{name}/dropins/jdt/plugins/org.eclipse.jdt.core_*
%{_javadir}/eclipse-ecj*.jar
%{_javadir}/jdtcore*.jar
%{_javadir}/ecj*.jar
@@ -1420,26 +1429,26 @@
%defattr(-,root,root)
%{_bindir}/efj
%{_libdir}/%{name}/dropins/jdt/content.xml
-%{_libdir}/%{name}/dropins/jdt/eclipse/features
-%{_libdir}/%{name}/dropins/jdt/eclipse/plugins/org.eclipse.jdt_*
-%{_libdir}/%{name}/dropins/jdt/eclipse/plugins/org.eclipse.ant.ui_*
-%{_libdir}/%{name}/dropins/jdt/eclipse/plugins/org.eclipse.jdt.apt.core_*
-%{_libdir}/%{name}/dropins/jdt/eclipse/plugins/org.eclipse.jdt.apt.ui_*
-%{_libdir}/%{name}/dropins/jdt/eclipse/plugins/org.eclipse.jdt.apt.pluggable.core_*
-%{_libdir}/%{name}/dropins/jdt/eclipse/plugins/org.eclipse.jdt.compiler.apt_*
-%{_libdir}/%{name}/dropins/jdt/eclipse/plugins/org.eclipse.jdt.compiler.tool_*
-%{_libdir}/%{name}/dropins/jdt/eclipse/plugins/org.eclipse.jdt.core_*
-%{_libdir}/%{name}/dropins/jdt/eclipse/plugins/org.eclipse.jdt.core.manipulation_*
-%{_libdir}/%{name}/dropins/jdt/eclipse/plugins/org.eclipse.jdt.debug.ui_*
-%{_libdir}/%{name}/dropins/jdt/eclipse/plugins/org.eclipse.jdt.debug_*
-%{_libdir}/%{name}/dropins/jdt/eclipse/plugins/org.eclipse.jdt.junit_*
-%{_libdir}/%{name}/dropins/jdt/eclipse/plugins/org.eclipse.jdt.junit.runtime_*
-%{_libdir}/%{name}/dropins/jdt/eclipse/plugins/org.eclipse.jdt.junit4.runtime_*
-%{_libdir}/%{name}/dropins/jdt/eclipse/plugins/org.eclipse.jdt.launching_*
-%{_libdir}/%{name}/dropins/jdt/eclipse/plugins/org.eclipse.jdt.ui_*
-%{_libdir}/%{name}/dropins/jdt/eclipse/plugins/org.junit_*
-%{_libdir}/%{name}/dropins/jdt/eclipse/plugins/org.junit4_*
-%{_libdir}/%{name}/dropins/jdt/eclipse/plugins/org.eclipse.jdt.doc.user_*
+%{_libdir}/%{name}/dropins/jdt/features
+%{_libdir}/%{name}/dropins/jdt/plugins/org.eclipse.jdt_*
+%{_libdir}/%{name}/dropins/jdt/plugins/org.eclipse.ant.ui_*
+%{_libdir}/%{name}/dropins/jdt/plugins/org.eclipse.jdt.apt.core_*
+%{_libdir}/%{name}/dropins/jdt/plugins/org.eclipse.jdt.apt.ui_*
+%{_libdir}/%{name}/dropins/jdt/plugins/org.eclipse.jdt.apt.pluggable.core_*
+%{_libdir}/%{name}/dropins/jdt/plugins/org.eclipse.jdt.compiler.apt_*
+%{_libdir}/%{name}/dropins/jdt/plugins/org.eclipse.jdt.compiler.tool_*
+%{_libdir}/%{name}/dropins/jdt/plugins/org.eclipse.jdt.core_*
+%{_libdir}/%{name}/dropins/jdt/plugins/org.eclipse.jdt.core.manipulation_*
+%{_libdir}/%{name}/dropins/jdt/plugins/org.eclipse.jdt.debug.ui_*
+%{_libdir}/%{name}/dropins/jdt/plugins/org.eclipse.jdt.debug_*
+%{_libdir}/%{name}/dropins/jdt/plugins/org.eclipse.jdt.junit_*
+%{_libdir}/%{name}/dropins/jdt/plugins/org.eclipse.jdt.junit.runtime_*
+%{_libdir}/%{name}/dropins/jdt/plugins/org.eclipse.jdt.junit4.runtime_*
+%{_libdir}/%{name}/dropins/jdt/plugins/org.eclipse.jdt.launching_*
+%{_libdir}/%{name}/dropins/jdt/plugins/org.eclipse.jdt.ui_*
+%{_libdir}/%{name}/dropins/jdt/plugins/org.junit_*
+%{_libdir}/%{name}/dropins/jdt/plugins/org.junit4_*
+%{_libdir}/%{name}/dropins/jdt/plugins/org.eclipse.jdt.doc.user_*
%files pde
%defattr(-,root,root)
@@ -1449,6 +1458,12 @@
%{_libdir}/%{name}/configuration/org.eclipse.equinox.source
%changelog
+* Mon Aug 11 2008 Andrew Overholt <overholt at redhat.com> 3.4.0-19
+- Move jdt and sdk dropins contents to non-eclipse-sub-dir place which
+ makes dropins reconciler see them as dropins and not extension
+ locations
+- Add versions to jetty, lucene, and jsch Requires
+
* Thu Aug 07 2008 Andrew Overholt <overholt at redhat.com> 3.4.0-18
- Add %%{_libdir}/eclipse/dropins/jdt to ecj files list
- Previous message (by thread): rpms/nmap/devel nmap.spec,1.46,1.47
- Next message (by thread): rpms/libdrm/devel import.log, NONE, 1.1 .cvsignore, 1.13, 1.14 libdrm-2.4.0-no-bc.patch, 1.1, 1.2 libdrm.spec, 1.46, 1.47 sources, 1.13, 1.14
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list