diff --git a/eclipse.spec b/eclipse.spec index caa8c85..1e03885 100644 --- a/eclipse.spec +++ b/eclipse.spec @@ -17,7 +17,7 @@ Epoch: 1 Summary: An open, extensible IDE Name: eclipse Version: %{eclipse_majmin}.%{eclipse_micro} -Release: 9%{?dist} +Release: 10%{?dist} License: EPL Group: Text Editors/Integrated Development Environments (IDE) URL: http://www.eclipse.org/ @@ -271,12 +271,7 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop # Create a script that can be used to make a symlink tree of the # eclipse platform. cp -p pdebuild/eclipse-copy-platform.sh copy-platform -( - cd $RPM_BUILD_ROOT%{_libdir}/%{name} - ls -d * | grep -E -v '^(plugins|features|about_files|dropins)$' - ls -d plugins/* features/* -) | -sed -e's,^\(.*\),[ ! -e \1 ] \&\& ln -s $eclipse/\1 \1,' >> copy-platform + mkdir -p $RPM_BUILD_ROOT%{_libdir}/%{name}/buildscripts mv copy-platform $RPM_BUILD_ROOT%{_libdir}/%{name}/buildscripts copyPlatform=$RPM_BUILD_ROOT%{_libdir}/%{name}/buildscripts/copy-platform @@ -286,17 +281,6 @@ copyPlatform=$RPM_BUILD_ROOT%{_libdir}/%{name}/buildscripts/copy-platform # copy-platform gets generated wrong. rm $RPM_BUILD_ROOT/%{_libdir}/%{name}/plugins/com.ibm.icu_*.jar -pushd $RPM_BUILD_ROOT%{_libdir}/%{name} -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/plugins/*); do - plugin=$(basename $p) - echo $p | sed -e"s,^\(.*\),[ ! -e plugins/$plugin ] \&\& ln -s \$eclipse/\1 plugins/$plugin," >> $copyPlatform -done -popd - # Install the PDE Build wrapper script. install -p -D -m0755 pdebuild/eclipse-pdebuild.sh \ $RPM_BUILD_ROOT%{_libdir}/%{name}/buildscripts/pdebuild @@ -647,6 +631,9 @@ rm -rf %{_bindir}/efj/ %{_libdir}/%{name}/dropins/sdk %changelog +* Tue Dec 20 2011 Andrew Robinson 1:3.7.1-10 +- Specfile fix for license feature. + * Mon Dec 19 2011 Andrew Overholt 1:3.7.1-9 - New eclipse-build snapshot with proper p2 repo URLs.