From cbea38963d68e2426f8db8856e9b44487f8060b2 Mon Sep 17 00:00:00 2001 From: cvs2git Date: Tue, 16 Nov 2010 20:21:53 +0000 Subject: [PATCH] This commit was manufactured by cvs2git to create branch 'ECLIPSE_3_3'. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Sprout from master 2010-05-12 11:27:21 UTC Jan Rękorajski '- rel 3' Cherrypick from master 2010-11-16 20:21:53 UTC Elan Ruusamäe '- provide eclipse-jdt until in main package': eclipse.spec -> 1.103 --- eclipse.spec | 56 +++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 42 insertions(+), 14 deletions(-) diff --git a/eclipse.spec b/eclipse.spec index da1add0..c6571c0 100644 --- a/eclipse.spec +++ b/eclipse.spec @@ -1,32 +1,32 @@ # TODO: # - make use of eclipse-swt package -%define ver_major 3.3.1.1 -%define buildid 200710231652 +%include /usr/lib/rpm/macros.java Summary: Eclipse - an open extensible IDE Summary(pl.UTF-8): Eclipse - otwarte, rozszerzalne środowisko programistyczne Name: eclipse -Version: %{ver_major} -Release: 3 +Version: 3.3.2 +Release: 2 License: EPL v1.0 Group: Development/Tools -Source0: http://download.eclipse.org/eclipse/downloads/drops/R-%{ver_major}-%{buildid}/%{name}-sourceBuild-srcIncluded-%{version}.zip -# Source0-md5: 593b56fce7d1f1f799e87365cafefbef +Source0: http://archive.eclipse.org/eclipse/downloads/drops/R-%{version}-200802211800/%{name}-sourceBuild-srcIncluded-%{version}.zip +# Source0-md5: 4b7016cf9aedf07b8f34b39470947799 Source1: %{name}.desktop Patch0: %{name}-launcher-set-install-dir-and-shared-config.patch -Patch1: %{name}-launcher-double-free-bug.patch URL: http://www.eclipse.org/ BuildRequires: ant >= 1.6.1 BuildRequires: ant-apache-regexp BuildRequires: jdk >= 1.6 +BuildRequires: jpackage-utils BuildRequires: pkgconfig +BuildRequires: rpm-javaprov BuildRequires: rpm-pythonprov BuildRequires: rpmbuild(macros) >= 1.300 BuildRequires: sed >= 4.0 BuildRequires: unzip BuildRequires: zip Requires: ant -Requires: jdk >= 1.4 +Provides: eclipse-jdt = %{version}-%{release} Obsoletes: eclipse-SDK BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -55,7 +55,6 @@ wszystkiego i niczego w szczególności. rm plugins/org.eclipse.platform/launchersrc.zip cd features/org.eclipse.equinox.executable %patch0 -p0 -%patch1 -p0 # put the configuration directory in an arch-specific location sed -i -e 's:/usr/lib/eclipse/configuration:%{_libdir}/%{name}/configuration:' library/eclipse.c # make the eclipse binary relocatable @@ -101,8 +100,8 @@ fi if [ ! -f installed.stamp ]; then install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir} - install plugins/org.eclipse.core.filesystem/natives/unix/linux/lib*.so $RPM_BUILD_ROOT%{_libdir}/%{name} - install plugins/org.eclipse.update.core.linux/src/lib*.so $RPM_BUILD_ROOT%{_libdir}/%{name} + install -p plugins/org.eclipse.core.filesystem/natives/unix/linux/lib*.so $RPM_BUILD_ROOT%{_libdir}/%{name} + install -p plugins/org.eclipse.update.core.linux/src/lib*.so $RPM_BUILD_ROOT%{_libdir}/%{name} # wrapper install -d $RPM_BUILD_ROOT%{_bindir} @@ -116,12 +115,15 @@ if [ ! -f installed.stamp ]; then version=%{version} EOF - if [ ! -f "$RPM_BUILD_ROOT%{_libdir}/%{name}/icon.xpm" ]; then - install features/org.eclipse.equinox.executable/bin/gtk/linux/x86/icon.xpm $RPM_BUILD_ROOT%{_libdir}/%{name}/icon.xpm + if [ ! -f $RPM_BUILD_ROOT%{_libdir}/%{name}/icon.xpm ]; then + install -p features/org.eclipse.equinox.executable/bin/gtk/linux/x86/icon.xpm $RPM_BUILD_ROOT%{_libdir}/%{name}/icon.xpm fi - install -D features/org.eclipse.equinox.executable/bin/gtk/linux/x86/icon.xpm $RPM_BUILD_ROOT%{_pixmapsdir}/eclipse-icon.xpm + install -Dp features/org.eclipse.equinox.executable/bin/gtk/linux/x86/icon.xpm $RPM_BUILD_ROOT%{_pixmapsdir}/eclipse-icon.xpm # not packaged -- remove + %if 0 + # if we're removing source bundles, we should adjust manifests as well, but + # were not doing that, so don't break packaging rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/features/org.eclipse.cvs.source_* rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/features/org.eclipse.jdt.source_* rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/features/org.eclipse.pde.source_* @@ -144,6 +146,7 @@ if [ ! -f installed.stamp ]; then rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/org.eclipse.rcp.source_* rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/org.junit.source_* rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/org.mortbay.jetty.source_* + %endif touch installed.stamp fi @@ -305,6 +308,31 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/%{name}/plugins/org.junit4_*.*.* %{_libdir}/%{name}/plugins/org.mortbay.jetty_*.*.* +%if 1 +%{_libdir}/%{name}/features/org.eclipse.cvs.source_* +%{_libdir}/%{name}/features/org.eclipse.jdt.source_* +%{_libdir}/%{name}/features/org.eclipse.pde.source_* +%{_libdir}/%{name}/features/org.eclipse.platform.source_* +%{_libdir}/%{name}/features/org.eclipse.rcp.source_* +%{_libdir}/%{name}/plugins/javax.servlet.jsp.source_* +%{_libdir}/%{name}/plugins/javax.servlet.source_* +%{_libdir}/%{name}/plugins/org.apache.ant.source_* +%{_libdir}/%{name}/plugins/org.apache.commons.el.source_* +%{_libdir}/%{name}/plugins/org.apache.commons.logging.source_* +%{_libdir}/%{name}/plugins/org.apache.jasper.source_* +%{_libdir}/%{name}/plugins/org.apache.lucene.analysis.source_* +%{_libdir}/%{name}/plugins/org.apache.lucene.source_* +%{_libdir}/%{name}/plugins/org.eclipse.cvs.source_* +%{_libdir}/%{name}/plugins/org.eclipse.jdt.source_* +%{_libdir}/%{name}/plugins/org.eclipse.pde.source_* +%{_libdir}/%{name}/plugins/org.eclipse.platform.source.linux.gtk.* +%{_libdir}/%{name}/plugins/org.eclipse.platform.source_* +%{_libdir}/%{name}/plugins/org.eclipse.rcp.source.linux.gtk.* +%{_libdir}/%{name}/plugins/org.eclipse.rcp.source_* +%{_libdir}/%{name}/plugins/org.junit.source_* +%{_libdir}/%{name}/plugins/org.mortbay.jetty.source_* +%endif + %dir %{_datadir}/%{name} %dir %{_datadir}/%{name}/features %dir %{_datadir}/%{name}/plugins -- 2.44.0