790733: Install pdebuild script into _bindir

https://bugzilla.redhat.com/show_bug.cgi?id=790733
This commit is contained in:
Krzysztof Daniel 2012-04-02 12:53:46 +02:00
parent cf421ab8ad
commit 13216d3b93
2 changed files with 16 additions and 4 deletions

View File

@ -20,7 +20,7 @@ Epoch: 1
Summary: An open, extensible IDE
Name: eclipse
Version: %{eclipse_version}
Release: 0.3.fa15ab%{?dist}
Release: 0.4.fa15ab%{?dist}
License: EPL
Group: Text Editors/Integrated Development Environments (IDE)
URL: http://www.eclipse.org/
@ -34,6 +34,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
@ -100,13 +101,13 @@ Requires: webkitgtk
%description swt
SWT Library for GTK+-2.0.
%package -n eclipse-emf-core
%package emf-core
Version: %{emf_version}
Summary: Eclipse Modeling Framework Core
Group: Development/Languages
Conflicts: eclipse-emf < 2.8.0
%description -n eclipse-emf-core
%description emf-core
Eclipse Modeling Framework Core
@ -327,11 +328,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
@ -651,10 +656,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:4.2.0-0.4.fa15ab
- pdebuild script installed into %{_bindir}
* Thu Mar 29 2012 Krzysztof Daniel <kdaniel@redhat.com> 1:4.2.0-0.3.fa15ab
- Sort out problems with versions.

3
pdebuild_old_info.sh Normal file
View File

@ -0,0 +1,3 @@
#!/bin/bash
echo "pdebuild was renamed into eclipse-pdebuild and moved into _bindir"
exit 1;