790733: Install pdebuild script into _bindir
https://bugzilla.redhat.com/show_bug.cgi?id=790733 Conflicts: eclipse.spec
This commit is contained in:
parent
246f265712
commit
40bfcca88b
13
eclipse.spec
13
eclipse.spec
@ -18,7 +18,7 @@ Epoch: 1
|
||||
Summary: An open, extensible IDE
|
||||
Name: eclipse
|
||||
Version: %{eclipse_majmin}.%{eclipse_micro}
|
||||
Release: 0.20.I201203201400%{?dist}
|
||||
Release: 0.21.I201203201400%{?dist}
|
||||
License: EPL
|
||||
Group: Text Editors/Integrated Development Environments (IDE)
|
||||
URL: http://www.eclipse.org/
|
||||
@ -32,6 +32,7 @@ Source5: http://repo1.maven.org/maven2/org/eclipse/osgi/org.eclipse.osgi/
|
||||
Source6: org.eclipse.osgi.services-3.2.100.v20100503.pom
|
||||
Source7: http://repo1.maven.org/maven2/org/eclipse/equinox/http/servlet/1.0.0-v20070606/servlet-1.0.0-v20070606.pom
|
||||
Source8: org.eclipse.jdt.core-3.8.0.v_C03.pom
|
||||
Source9: pdebuild_old_info.sh
|
||||
|
||||
BuildRequires: ant >= 1.8.3
|
||||
BuildRequires: rsync
|
||||
@ -300,11 +301,15 @@ copyPlatform=$RPM_BUILD_ROOT%{_libdir}/%{name}/buildscripts/copy-platform
|
||||
|
||||
# Install the PDE Build wrapper script.
|
||||
install -p -D -m0755 pdebuild/eclipse-pdebuild.sh \
|
||||
$RPM_BUILD_ROOT%{_libdir}/%{name}/buildscripts/pdebuild
|
||||
$RPM_BUILD_ROOT%{_bindir}/%{name}-pdebuild
|
||||
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" \
|
||||
$RPM_BUILD_ROOT%{_bindir}/%{name}-pdebuild
|
||||
|
||||
# Install the PDE Build moved info (to be removed at some time)
|
||||
install -p -D -m0755 %{SOURCE9} \
|
||||
$RPM_BUILD_ROOT%{_libdir}/%{name}/buildscripts/pdebuild
|
||||
|
||||
# Install eclipse macros file
|
||||
@ -572,10 +577,14 @@ rm -rf %{_bindir}/efj/
|
||||
%{_libdir}/%{name}/dropins/jdt
|
||||
|
||||
%files pde
|
||||
%{_bindir}/%{name}-pdebuild
|
||||
%{_libdir}/%{name}/buildscripts
|
||||
%{_libdir}/%{name}/dropins/sdk
|
||||
|
||||
%changelog
|
||||
* Mon Apr 2 2012 Krzysztof Daniel <kdaniel@redhat.com> 1:3.8.0-0.21.I201203201400
|
||||
- pdebuild script installed into %{_bindir}
|
||||
|
||||
* Mon Mar 26 2012 Krzysztof Daniel <kdaniel@redhat.com> 1:3.8.0-0.20.I201203201400
|
||||
- Added Provides: osgi(system.bundle) to rcp package.
|
||||
|
||||
|
3
pdebuild_old_info.sh
Normal file
3
pdebuild_old_info.sh
Normal file
@ -0,0 +1,3 @@
|
||||
#!/bin/bash
|
||||
echo "pdebuild was renamed into eclipse-pdebuild and moved into _bindir"
|
||||
exit 1;
|
Loading…
Reference in New Issue
Block a user