[psi] fix FTBFS (drop Requires(hint) usage) make qca plugin deps arched add arched/versioned qt4 runtime d

[Rex Dieter]

commit 280d9a166ab099da4e00c4bc782a243203de6dd7
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Wed Mar 16 08:49:10 2011 -0500

    fix FTBFS (drop Requires(hint) usage)
    make qca plugin deps arched
    add arched/versioned qt4 runtime dep
    update scriptlets
    drop desktop-file-install --vendor usage (f15+)

 psi.spec |   41 +++++++++++++++++++++++++++--------------
 1 files changed, 27 insertions(+), 14 deletions(-)
---
diff --git a/psi.spec b/psi.spec
index ab16722..1a19f84 100644
--- a/psi.spec
+++ b/psi.spec
@@ -1,6 +1,6 @@
 Name:       psi
 Version:    0.14
-Release:    5%{?dist}
+Release:    6%{?dist}
 Summary:    Jabber client based on Qt
 License:    GPLv2+
 Group:      Applications/Internet
@@ -18,12 +18,14 @@ BuildRequires:  qt4-devel, zlib-devel, desktop-file-utils
 BuildRequires:  qca2-devel, glib2-devel
 BuildRequires:  enchant-devel, libXScrnSaver-devel
 
-Requires(hint): sox
-Requires(hint): gnupg
+Requires: sox
+Requires: gnupg
 # Required for SSL/TLS connections
-Requires(hint): qca-ossl
+Requires: qca-ossl%{?_isa}
 # Required for GnuPG encryption
-Requires(hint): qca-gnupg
+Requires: qca-gnupg%{?_isa}
+# minimal qt4 runtime dep
+%{?_qt4_version:Requires: qt4%{?_isa} >= %{_qt4_version}}
 
 # Language packs
 Source10:   psi-lang-packs-0.13-1.tar.gz
@@ -108,31 +110,35 @@ tar -xzpf %{SOURCE11} -C $RPM_BUILD_ROOT%{_datadir}/%name/iconsets/emoticons/
 tar -xzpf %{SOURCE12} -C $RPM_BUILD_ROOT%{_datadir}/%name/iconsets/roster/
 #tar -xzpf %{SOURCE13} -C $RPM_BUILD_ROOT%{_datadir}/%name/iconsets/system/
 
-
 # Menu
+%if 0%{?fedora} < 15
 desktop-file-install --vendor fedora \
        --dir $RPM_BUILD_ROOT%{_datadir}/applications\
        --delete-original\
        $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
+%endif
 
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins
 
+%check
+%if 0%{?fedora} > 14
+desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
+%endif
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-
 %post
-touch --no-create %{_datadir}/icons/hicolor || :
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-    %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
+touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor || :
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-    %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+if [ $1 -eq 0 ] ; then
+  touch --no-create %{_datadir}/icons/hicolor &> /dev/null
+  gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
 fi
 
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
 
 %files
 %defattr(0644,root,root,0755)
@@ -158,6 +164,13 @@ fi
 
 
 %changelog
+* Wed Mar 16 2011 Rex Dieter <rdieter at fedoraproject.org> 0.14-6
+- fix FTBFS (drop Requires(hint) usage)
+- make qca plugin deps arched
+- add arched/versioned qt4 runtime dep
+- update scriptlets
+- drop desktop-file-install --vendor usage (f15+)
+
 * Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org>
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild