From 9c1c1639996b1d21d82e5d87e154a581d7df94bf Mon Sep 17 00:00:00 2001 From: Ben Konrath Date: Tue, 13 Jun 2006 22:41:27 +0000 Subject: [PATCH] - Rename -devel packages to -sdk to match upstream names. - Add Provides eclipse-sdk to platform-sdk. - Remove zip re-pack code. --- eclipse.spec | 85 +++++++++++++++++++++++++++------------------------- 1 file changed, 45 insertions(+), 40 deletions(-) diff --git a/eclipse.spec b/eclipse.spec index 544d960..f741a04 100644 --- a/eclipse.spec +++ b/eclipse.spec @@ -36,7 +36,7 @@ Epoch: 1 Summary: %{pkg_summary} Name: eclipse Version: %{eclipse_majmin}.%{eclipse_micro} -Release: 0jpp_0fc.3.2RC7.6 +Release: 0jpp_0fc.3.2RC7.7 License: EPL Group: Text Editors/Integrated Development Environments (IDE) URL: http://www.eclipse.org/ @@ -248,16 +248,19 @@ Requires: regexp Eclipse platform common files. This package now contains the GTK2 UI (the former eclipse-gtk2 package). -%package platform-devel +%package platform-sdk Summary: Eclipse platform Source Group: Text Editors/Integrated Development Environments (IDE) +Provides: platform-devel +Obsoletes: platform-devel Requires: %{name}-platform = %{epoch}:%{version}-%{release} -Requires: %{name}-rcp-devel = %{epoch}:%{version}-%{release} +Requires: %{name}-rcp-sdk = %{epoch}:%{version}-%{release} Requires(post): %{name}-platform = %{epoch}:%{version}-%{release} Requires(postun): %{name}-platform = %{epoch}:%{version}-%{release} Requires: java-javadoc -%description platform-devel +#FIXME: fix description to include docs +%description platform-sdk Source for Eclipse platform for use within Eclipse. %package jdt @@ -277,15 +280,19 @@ Requires(postun): java-gcj-compat >= 1.0.52 %description jdt Eclipse Java developments tools. -%package jdt-devel +%package jdt-sdk Summary: Eclipse JDT Source Group: Text Editors/Integrated Development Environments (IDE) +Provides: jdt-devel +Obsoletes: jdt-devel Requires: %{name}-jdt = %{epoch}:%{version}-%{release} Requires(post): %{name}-platform = %{epoch}:%{version}-%{release} Requires(postun): %{name}-platform = %{epoch}:%{version}-%{release} Requires: java-javadoc -%description jdt-devel + +#FIXME: fix description to include docs +%description jdt-sdk Source for JDT for use within Eclipse. %package pde @@ -293,7 +300,7 @@ Summary: Eclipse PDE Group: Text Editors/Integrated Development Environments (IDE) Requires: %{name}-jdt = %{epoch}:%{version}-%{release} Requires: %{name}-pde-runtime = %{epoch}:%{version}-%{release} -Requires: %{name}-platform-devel = %{epoch}:%{version}-%{release} +Requires: %{name}-platform-sdk = %{epoch}:%{version}-%{release} Requires(post): %{name}-platform = %{epoch}:%{version}-%{release} Requires(postun): %{name}-platform = %{epoch}:%{version}-%{release} %if %{gcj_support} @@ -309,7 +316,7 @@ Eclipse Plug-in Development Environment. Summary: Eclipse PDE runtime plugin. Group: Text Editors/Integrated Development Environments (IDE) Requires: %{name}-jdt = %{epoch}:%{version}-%{release} -Requires: %{name}-platform-devel = %{epoch}:%{version}-%{release} +Requires: %{name}-platform-sdk = %{epoch}:%{version}-%{release} Requires(post): %{name}-platform = %{epoch}:%{version}-%{release} Requires(postun): %{name}-platform = %{epoch}:%{version}-%{release} %if %{gcj_support} @@ -321,17 +328,21 @@ Requires(postun): java-gcj-compat >= 1.0.52 %description pde-runtime Eclipse Plug-in Development Environment runtime plugin (org.eclipse.pde.runtime). -%package pde-devel +%package pde-sdk Summary: Eclipse PDE Source Group: Text Editors/Integrated Development Environments (IDE) +Provides: %{name}-sdk +Provides: pde-devel +Obsoletes: pde-devel Requires: %{name}-pde = %{epoch}:%{version}-%{release} -Requires: %{name}-jdt-devel = %{epoch}:%{version}-%{release} +Requires: %{name}-jdt-sdk = %{epoch}:%{version}-%{release} Requires(post): %{name}-platform = %{epoch}:%{version}-%{release} Requires(postun): %{name}-platform = %{epoch}:%{version}-%{release} Obsoletes: %{name}-source Provides: %{name}-source = %{epoch}:%{version}-%{release} -%description pde-devel +#FIXME: fix description to include docs +%description pde-sdk Source for Eclipse Plug-in Development Environment for use within Eclipse. %package -n %{libname}-gtk2 @@ -360,13 +371,16 @@ Requires: java >= 1.4.2 %description rcp Eclipse Rich Client Platform -%package rcp-devel +%package rcp-sdk Summary: Eclipse RCP Source Group: Text Editors/Integrated Development Environments (IDE) +Provides: rcp-devel +Obsoletes: rcp-devel Requires: %{name}-rcp = %{epoch}:%{version}-%{release} -Requires: %{name}-jdt-devel = %{epoch}:%{version}-%{release} +Requires: %{name}-jdt-sdk = %{epoch}:%{version}-%{release} -%description rcp-devel +#FIXME: fix description to include docs +%description rcp-sdk Source for RCP for use within Eclipse. %prep @@ -786,20 +800,6 @@ ant \ #./copyallsrc $src_root/org.eclipse.swt/Eclipse\ SWT/gtk/org #popd -# FIXME: document this properly -# re-pack all zips. we need to do this to work around the multilib problem -for zip in $(find -type f -name \*.zip); do - mkdir $zip-repack - pushd $zip-repack - zipfile=../$(echo $zip | sed "s:./.*/::") - unzip -qq $zipfile - rm $zipfile - find -type f -exec touch --date=1/1/1970 "{}" \; - zip -q -X -9 -r $zipfile . - popd - rm -r $zip-repack -done - %install rm -rf $RPM_BUILD_ROOT @@ -1161,7 +1161,7 @@ if [ -x %{_datadir}/%{name}/buildscripts/rebuild-sdk-features ]; then %{_datadir}/%{name}/buildscripts/rebuild-sdk-features > /dev/null fi -%post jdt-devel +%post jdt-sdk if [ -x %{_datadir}/%{name}/buildscripts/rebuild-sdk-features ]; then %{_datadir}/%{name}/buildscripts/rebuild-sdk-features > /dev/null fi @@ -1179,7 +1179,7 @@ fi %{_bindir}/rebuild-gcj-db %endif -%post pde-devel +%post pde-sdk if [ -x %{_datadir}/%{name}/buildscripts/rebuild-sdk-features ]; then %{_datadir}/%{name}/buildscripts/rebuild-sdk-features > /dev/null fi @@ -1189,7 +1189,7 @@ fi %{_bindir}/rebuild-gcj-db %endif -%post rcp-devel +%post rcp-sdk if [ -x %{_datadir}/%{name}/buildscripts/rebuild-sdk-features ]; then %{_datadir}/%{name}/buildscripts/rebuild-sdk-features > /dev/null fi @@ -1211,7 +1211,7 @@ if [ -x /usr/bin/gtk-update-icon-cache ]; then gtk-update-icon-cache -q %{_datadir}/icons/hicolor fi -%post platform-devel +%post platform-sdk if [ -x %{_datadir}/%{name}/buildscripts/rebuild-sdk-features ]; then %{_datadir}/%{name}/buildscripts/rebuild-sdk-features > /dev/null fi @@ -1229,7 +1229,7 @@ if [ -x %{_datadir}/%{name}/buildscripts/rebuild-sdk-features ]; then %{_datadir}/%{name}/buildscripts/rebuild-sdk-features > /dev/null fi -%postun jdt-devel +%postun jdt-sdk if [ -x %{_datadir}/%{name}/buildscripts/rebuild-sdk-features ]; then %{_datadir}/%{name}/buildscripts/rebuild-sdk-features > /dev/null fi @@ -1247,7 +1247,7 @@ fi %{_bindir}/rebuild-gcj-db %endif -%postun pde-devel +%postun pde-sdk if [ -x %{_datadir}/%{name}/buildscripts/rebuild-sdk-features ]; then %{_datadir}/%{name}/buildscripts/rebuild-sdk-features > /dev/null fi @@ -1257,7 +1257,7 @@ fi %{_bindir}/rebuild-gcj-db %endif -%postun rcp-devel +%postun rcp-sdk if [ -x %{_datadir}/%{name}/buildscripts/rebuild-sdk-features ]; then %{_datadir}/%{name}/buildscripts/rebuild-sdk-features > /dev/null fi @@ -1276,7 +1276,7 @@ if [ -x /usr/bin/gtk-update-icon-cache ]; then gtk-update-icon-cache -q %{_datadir}/icons/hicolor fi -%postun platform-devel +%postun platform-sdk if [ -x %{_datadir}/%{name}/buildscripts/rebuild-sdk-features ]; then %{_datadir}/%{name}/buildscripts/rebuild-sdk-features > /dev/null fi @@ -1350,7 +1350,7 @@ fi %{_libdir}/gcj/%{name}/jdi.jar.* %endif -%files jdt-devel +%files jdt-sdk %defattr(-,root,root) %{_datadir}/%{name}/plugins/org.eclipse.jdt.doc.isv_* %{_datadir}/%{name}/plugins/org.eclipse.jdt.source_* @@ -1383,7 +1383,7 @@ fi %{_libdir}/gcj/%{name}/org.eclipse.pde.runtime_* %endif -%files pde-devel +%files pde-sdk %defattr(-,root,root) %{_datadir}/%{name}/plugins/org.eclipse.pde.source_* %{_datadir}/%{name}/features/org.eclipse.pde.source_* @@ -1400,7 +1400,7 @@ fi %{_libdir}/gcj/%{name}/org.eclipse.core.runtime_* %endif -%files rcp-devel +%files rcp-sdk %defattr(-,root,root) %{_datadir}/%{name}/plugins/com.ibm.icu.source_* %{_datadir}/%{name}/plugins/org.eclipse.rcp.source_* @@ -1618,7 +1618,7 @@ fi %{_libdir}/gcj/%{name}/tomcat-util.jar* %endif -%files platform-devel +%files platform-sdk %defattr(-,root,root) %{_datadir}/%{name}/plugins/org.eclipse.platform.doc.isv_* %{_datadir}/%{name}/plugins/org.eclipse.platform.source_* @@ -1630,6 +1630,11 @@ fi %endif %changelog +* Tue Jun 13 2006 Ben Konrath 3.2.0-0jpp_0fc.3.2RC7.7 +- Rename -devel packages to -sdk to match upstream names. +- Add Provides eclipse-sdk to platform-sdk. +- Remove zip re-pack code. + * Mon Jun 12 2006 Ben Konrath 3.2.0-0jpp_0fc.3.2RC7.6 - Bump release again.