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

Add appstream addon metadata for JDT and PDE plugins 

- Only use GTK3 by default on F22 or newer, rhbz1118317
This commit is contained in:
Mat Booth 2014-07-16 15:08:25 +01:00
parent 07c056ffd6
commit 322be2b48a
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
eclipse.spec
View File

@ -12,7 +12,7 @@ Epoch: 1
%global eclipse_major 4
%global eclipse_minor 4
%global eclipse_micro 0
%global eb_commit b95311b1c90288893e23fdd8d13373aba80a8e6b
%global eb_commit 2da2dea04ec2c827e1f5e6567fa06fe78ca67fa0
%global eclipse_tag R4_4
%global eclipse_version %{eclipse_major}.%{eclipse_minor}.%{eclipse_micro}
%global _jetty_version 9.2.1
@ -38,7 +38,7 @@ Epoch: 1
Summary: An open, extensible IDE
Name: %{?scl_prefix}eclipse
Version: %{eclipse_version}
Release: 6%{?dist}
Release: 7%{?dist}
License: EPL
Group: Development/Tools
URL: http://www.eclipse.org/
@ -549,7 +549,13 @@ popd
sed -i "s|-Xms40m|-Xms128m|g" eclipse.ini
sed -i "s|-Xmx384m|-Xmx512m|g" eclipse.ini
sed -i '1i-protect\nmaster' eclipse.ini
# Use GTK3 by default on F22 or newer
%if 0%{?fedora} >= 22
sed -i '5i--launcher.GTK_version\n3' eclipse.ini
%else
sed -i '5i--launcher.GTK_version\n2' eclipse.ini
%endif
# Temporary fix until https://bugs.eclipse.org/294877 is resolved
cat >> eclipse.ini <<EOF
@ -594,6 +600,8 @@ ln -s /usr/share/icons/hicolor/256x256/apps/%{?scl_prefix}eclipse.png \
%{?scl: sed -i -e 's/Name=Eclipse/Name=DTS Eclipse/g' desktopintegration/eclipse.desktop}
install -D desktopintegration/eclipse.desktop $RPM_BUILD_ROOT/usr/share/applications/%{?scl_prefix}eclipse.desktop
install -D desktopintegration/eclipse.appdata.xml $RPM_BUILD_ROOT/usr/share/appdata/%{?scl_prefix}eclipse.appdata.xml
install -D desktopintegration/eclipse-jdt.metainfo.xml $RPM_BUILD_ROOT/usr/share/appdata/%{?scl_prefix}eclipse-jdt.metainfo.xml
install -D desktopintegration/eclipse-pde.metainfo.xml $RPM_BUILD_ROOT/usr/share/appdata/%{?scl_prefix}eclipse-pde.metainfo.xml
desktop-file-validate $RPM_BUILD_ROOT/usr/share/applications/%{?scl_prefix}eclipse.desktop
#################################
@ -993,10 +1001,12 @@ fi
%files jdt
%{_bindir}/efj
/usr/share/appdata/%{?scl_prefix}eclipse-jdt.metainfo.xml
%{_libdir}/%{pkg_name}/dropins/jdt
%files pde
%{_bindir}/%{pkg_name}-pdebuild
/usr/share/appdata/%{?scl_prefix}eclipse-pde.metainfo.xml
%{_libdir}/%{pkg_name}/buildscripts
%{_libdir}/%{pkg_name}/dropins/sdk
%{_libdir}/%{pkg_name}/dropins/cvs
@ -1017,6 +1027,10 @@ fi
%{_libdir}/%{pkg_name}/plugins/org.eclipse.osgi.compatibility.state_*
%changelog
* Tue Jul 15 2014 Mat Booth <mat.booth@redhat.com> - 1:4.4.0-7
- Add appstream addon metadata for JDT and PDE plugins
- Only use GTK3 by default on F22 or newer, rhbz1118317
* Tue Jul 15 2014 Mat Booth <mat.booth@redhat.com> - 1:4.4.0-6
- Backport fix for eclipse bz438992
- Only assemble products for current running target environment

2
sources
View File

@ -1,2 +1,2 @@
d1e37d9af6848edbdd54d5988c77fa58 R4_platform-aggregator-R4_4.tar.xz
7c474d620e8cad433ea871b4b6239d3e org.eclipse.linuxtools.eclipse-build-b95311b1c90288893e23fdd8d13373aba80a8e6b.tar.bz2
24a3b316248be49e449515c56a48e3f3 org.eclipse.linuxtools.eclipse-build-2da2dea04ec2c827e1f5e6567fa06fe78ca67fa0.tar.bz2