From 077a47b982e4ddb312bcaf9e5209ca543f13bf84 Mon Sep 17 00:00:00 2001
From: Mathieu Bridon <bochecha@fedoraproject.org>
Date: May 06 2013 15:03:07 +0000
Subject: New submission to the review


This was submitted on Mon May 06 2013:
    https://bugzilla.redhat.com/show_bug.cgi?id=958881#c4

---

diff --git a/ibus-cangjie.spec b/ibus-cangjie.spec
index 9e10de0..d3f2d56 100644
--- a/ibus-cangjie.spec
+++ b/ibus-cangjie.spec
@@ -3,13 +3,14 @@
 Name:             ibus-cangjie
 Summary:          IBus engine to input Cangjie and Quick
 Version:          1.0
-Release:          1%{?dist}
+Release:          2%{?dist}
 License:          GPLv3+
 URL:              http://ibus-cangjie.opensource.hk
 Source0:          http://ibus-cangjie.opensource.hk/downloads/%{name}/%{name}-%{version}.tar.xz
 
 BuildArch:        noarch
 
+BuildRequires:    desktop-file-utils
 BuildRequires:    ibus-devel
 BuildRequires:    intltool
 BuildRequires:    python3-devel
@@ -48,11 +49,14 @@ make install DESTDIR=%{buildroot}
 %check
 make check
 
+# Upstream doesn't validate their desktop files
+desktop-file-validate %{buildroot}/%{_datadir}/applications/ibus-setup-cangjie.desktop
+desktop-file-validate %{buildroot}/%{_datadir}/applications/ibus-setup-quick.desktop
+
 
 %files -f %{name}.lang
 %doc README COPYING
 %{_bindir}/ibus-setup-cangjie
-%{_prefix}/lib/%{name}
 %{python3_sitelib}/%{module_name}
 %{_datadir}/applications/ibus-setup-cangjie.desktop
 %{_datadir}/applications/ibus-setup-quick.desktop
@@ -60,7 +64,16 @@ make check
 %{_datadir}/ibus/component/cangjie.xml
 %{_datadir}/ibus/component/quick.xml
 
+# Using %%{_prefix}/lib is allowed here because the package is exempt from
+# multilib (because it is noarch), see:
+#     https://fedoraproject.org/wiki/Packaging:Guidelines#Multilib_Exempt_Locations
+%{_prefix}/lib/%{name}
+
 
 %changelog
+* Mon May 06 2013 Mathieu Bridon <bochecha@fedoraproject.org> - 1.0-2
+- Comment on the usage of %%{_prefix}/lib
+- Validate the desktop file.
+
 * Thu May 02 2013 Mathieu Bridon <bochecha@fedoraproject.org> - 1.0-1
 - Initial package for Fedora.