Add workaround for appstream metainfo bug in RPM on F27

This commit is contained in:
Mat Booth 2017-09-19 10:37:27 +01:00
parent f4ee2f43be
commit 7ad9810339
1 changed files with 13 additions and 1 deletions

View File

@ -38,7 +38,7 @@ Epoch: 1
Summary: An open, extensible IDE
Name: eclipse
Version: 4.7.1
Release: 3%{?dist}
Release: 4%{?dist}
License: EPL
URL: http://www.eclipse.org/
@ -757,8 +757,11 @@ desktop-file-validate $RPM_BUILD_ROOT/usr/share/applications/%{name}.desktop
# Install appstream appdata
install -m644 -D desktopintegration/eclipse.appdata.xml $RPM_BUILD_ROOT%{_datadir}/appdata/eclipse.appdata.xml
# Workaround for https://pagure.io/releng/issue/7037
%if 0%{?fedora} < 27
install -m644 -D desktopintegration/eclipse-jdt.metainfo.xml $RPM_BUILD_ROOT%{_datadir}/appdata/eclipse-jdt.metainfo.xml
install -m644 -D desktopintegration/eclipse-pde.metainfo.xml $RPM_BUILD_ROOT%{_datadir}/appdata/eclipse-pde.metainfo.xml
%endif
LOCAL_PWD=`pwd`
#change the installation p2 files
@ -1045,10 +1048,16 @@ fi
%{_javadir}/%{name}/equinox*
%files jdt -f .mfiles-jdt
# Workaround for https://pagure.io/releng/issue/7037
%if 0%{?fedora} < 27
%{_datadir}/appdata/eclipse-jdt.metainfo.xml
%endif
%files pde -f .mfiles-pde -f .mfiles-cvs -f .mfiles-sdk
# Workaround for https://pagure.io/releng/issue/7037
%if 0%{?fedora} < 27
%{_datadir}/appdata/eclipse-pde.metainfo.xml
%endif
%files p2-discovery -f .mfiles-p2-discovery
@ -1065,6 +1074,9 @@ fi
%{_eclipsedir}/plugins/org.eclipse.osgi.util_*
%changelog
* Tue Sep 19 2017 Mat Booth <mat.booth@redhat.com> - 1:4.7.1-4
- Add workaround for appstream metainfo bug in RPM on F27
* Tue Sep 19 2017 Mat Booth <mat.booth@redhat.com> - 1:4.7.1-3
- Obsolete e4-importer that was moved into platform
- Add recommends on recommenders from JDT