rpms
/
eclipse
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

- Remove dropins contents while running initializer. 

- Resolves #466476. Fix pdebuild script. Jeff Johnston
This commit is contained in:
Alexander Kurtakov 2008-10-14 08:18:32 +00:00
parent a86bebac3e
commit 21a5042307
2 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
eclipse-pdebuild.sh
View File

@ -205,13 +205,13 @@ if [ $debugPlatform -eq 1 ]; then
fi
if [ $testing != true ]; then
p2Generate="-Dp2.root.name=\"$featureName\" \
-Dp2.root.version=\"$featureVersion\" \
-Dgenerate.p2.metadata=true \
-Dp2.metadata.repo=file:$buildDir/repo \
-Dp2.artifact.repo=file:$buildDir/repo \
-Dp2.flavor=tooling \
-Dp2.publish.artifacts=true"
p2Generate="-Dp2.root.name=\"$featureName\"" \
" -Dp2.root.version=\"$featureVersion\"" \
" -Dgenerate.p2.metadata=true" \
" -Dp2.metadata.repo=file:$buildDir/repo" \
" -Dp2.artifact.repo=file:$buildDir/repo" \
" -Dp2.flavor=tooling" \
" -Dp2.publish.artifacts=true"
fi
echo
@ -268,4 +268,4 @@ if [ $testing != true ]; then
zip -r $featureId.zip eclipse
rm -rf eclipse
popd
fi
fi

15
eclipse.spec
View File

@ -29,7 +29,7 @@ Epoch: 1
Summary: An open, extensible IDE
Name: eclipse
Version: %{eclipse_majmin}.%{eclipse_micro}
Release: 1%{?dist}
Release: 3%{?dist}
License: EPL
Group: Text Editors/Integrated Development Environments (IDE)
URL: http://www.eclipse.org/
@ -977,6 +977,8 @@ popd
# Extract .so files
# https://bugs.eclipse.org/bugs/show_bug.cgi?id=90535
pushd $RPM_BUILD_ROOT
mv $RPM_BUILD_ROOT/usr/lib/eclipse/dropins $RPM_BUILD_ROOT/dropins
mkdir $RPM_BUILD_ROOT/usr/lib/eclipse/dropins
libdir_path=$(echo %{_libdir}/%{name} | sed -e 's/^\///')
java -Dosgi.sharedConfiguration.area=$libdir_path/configuration \
-cp $libdir_path/startup.jar \
@ -985,6 +987,8 @@ java -Dosgi.sharedConfiguration.area=$libdir_path/configuration \
-application org.eclipse.equinox.initializer.configInitializer \
-fileInitializer %{SOURCE19}
popd
rm -fr $RPM_BUILD_ROOT/usr/lib/eclipse/dropins
mv $RPM_BUILD_ROOT/dropins $RPM_BUILD_ROOT/usr/lib/eclipse/dropins
# Remove the unnecessary configuration data
rm -r $sdkDir/configuration/org.eclipse.update
@ -1503,9 +1507,16 @@ fi
%{_libdir}/%{name}/buildscripts
%{_libdir}/%{name}/dropins/sdk
# FIXME: where should this go?
%{_libdir}/%{name}/configuration/org.eclipse.equinox.source
#%{_libdir}/%{name}/configuration/org.eclipse.equinox.source
%changelog
* Mon Oct 13 2008 Alexander Kurtakov <akurtako@redhat.com> 3.4.1-3
- Remove dropins contents while running initializer.
* Fri Oct 10 2008 Jeff Johnston <jjohnstn@redhat.com> 3.4.1-2
- Resolves #466476
- Fix pdebuild script.
* Fri Oct 03 2008 Andrew Overholt <overholt@redhat.com> 3.4.1-1
- Symlink to ant-apache-bsf and ant-commons-net.
- Update branding.