than pushed to qt (f22). "Fix the build harder (..more)"

[notifications at fedoraproject.org]

>From 74e790ecfb28363e8ce99c55c318cc98dfdf0b30 Mon Sep 17 00:00:00 2001
From: Kalev Lember <kalevlember at gmail.com>
Date: Thu, 26 Mar 2015 22:44:57 +0100
Subject: Fix the build harder

Commit 8b8b6f75202a2fa3c1ae4415f7485a11dcc5dadb added appdata to the end
of the %pre script; this moves it to %install where it belongs.

diff --git a/qt.spec b/qt.spec
index 59a59e1..e76e95a 100644
--- a/qt.spec
+++ b/qt.spec
@@ -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 at 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 at 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}
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/qt.git/commit/?h=f22&id=74e790ecfb28363e8ce99c55c318cc98dfdf0b30