rpms/qt
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix the build harder

Browse Source 
Commit 8b8b6f7520 added appdata to the end
of the %pre script; this moves it to %install where it belongs.
This commit is contained in:
Kalev Lember 2015-03-26 22:44:57 +01:00
parent b3faea3dcf
commit 74e790ecfb
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
qt.spec
View File

@ -869,6 +869,20 @@ done
install -p -m644 -D tools/qdbus/qdbusviewer/images/qdbusviewer.png %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/qdbusviewer.png
install -p -m644 -D tools/qdbus/qdbusviewer/images/qdbusviewer-128.png %{buildroot}%{_datadir}/icons/hicolor/128x128/apps/qdbusviewer.png
# Merge applications into one software center item
mkdir -p %{buildroot}%{_datadir}/appdata
cat > %{buildroot}%{_datadir}/appdata/qt4-linguist.appdata.xml <<EOF
<?xml version="1.0" encoding="UTF-8"?>
<!-- Copyright 2014 Richard Hughes <richard@hughsie.com> -->
<component type="desktop">
<metadata_license>CC0-1.0</metadata_license>
<id>qt4-linguist.desktop</id>
<metadata>
<value key="X-Merge-With-Parent">qt4-designer.desktop</value>
</metadata>
</component>
EOF
# Qt.pc
cat >%{buildroot}%{_libdir}/pkgconfig/Qt.pc<<EOF
prefix=%{_qt4_prefix}
@ -964,20 +978,6 @@ if [ $1 -gt 1 ] ; then
fi
%endif
# Merge applications into one software center item
mkdir -p $RPM_BUILD_ROOT%{_datadir}/appdata
cat > $RPM_BUILD_ROOT%{_datadir}/appdata/qt4-linguist.appdata.xml <<EOF
<?xml version="1.0" encoding="UTF-8"?>
<!-- Copyright 2014 Richard Hughes <richard@hughsie.com> -->
<component type="desktop">
<metadata_license>CC0-1.0</metadata_license>
<id>qt4-linguist.desktop</id>
<metadata>
<value key="X-Merge-With-Parent">qt4-designer.desktop</value>
</metadata>
</component>
EOF
%post
/sbin/ldconfig
%if 0%{?qtchooser}