liangsuilong pushed to fcitx (f21). "update scriptlets (mime mostly), tighten subpkg deps, BR: qt4-devel"

[notifications at fedoraproject.org]

>From dc74b7042f523cbd4fcf44c3356accd03524dbda Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Tue, 9 Sep 2014 08:37:07 -0500
Subject: update scriptlets (mime mostly), tighten subpkg deps, BR: qt4-devel


diff --git a/fcitx.spec b/fcitx.spec
index 812654f..67ac3ec 100644
--- a/fcitx.spec
+++ b/fcitx.spec
@@ -5,7 +5,7 @@
 Name:			fcitx
 Summary:		An input method framework
 Version:		4.2.8.4
-Release:		5%{?dist}
+Release:		6%{?dist}
 License:		GPLv2+
 Group:			User Interface/Desktops
 URL:			https://fcitx-im.org/wiki/Fcitx
@@ -14,18 +14,18 @@ Source1:		xinput-%{name}
 BuildRequires:		pango-devel, dbus-devel, opencc-devel
 BuildRequires:		wget, intltool, chrpath, sysconftool, opencc
 BuildRequires:		cmake, libtool, doxygen, libicu-devel
-BuildRequires:		qt-devel, gtk3-devel, gtk2-devel, libicu
+BuildRequires:		qt4-devel, gtk3-devel, gtk2-devel, libicu
 BuildRequires:		xorg-x11-proto-devel, xorg-x11-xtrans-devel
 BuildRequires:		gobject-introspection-devel, libxkbfile-devel 
 BuildRequires:		enchant-devel, iso-codes-devel, libicu-devel
-BuildRequires:		libX11-devel, qt-x11, dbus-glib-devel, dbus-x11
+BuildRequires:		libX11-devel, dbus-glib-devel, dbus-x11
 BuildRequires:		desktop-file-utils, libxml2-devel
 BuildRequires:		lua-devel
 Requires:		%{name}-data = %{version}-%{release}
 Requires:		imsettings
 Requires(post):		%{_sbindir}/alternatives
 Requires(postun):	%{_sbindir}/alternatives
-Requires:		%{name}-libs = %{version}-%{release}
+Requires:		%{name}-libs%{?_isa} = %{version}-%{release}
 Requires:		%{name}-gtk3 = %{version}-%{release}
 Requires:		%{name}-gtk2 = %{version}-%{release}
 
@@ -58,7 +58,7 @@ The %{name}-libs package provides shared libraries for Fcitx
 %package devel
 Summary:		Development files for Fcitx
 Group:			Development/Libraries
-Requires:		%{name}-libs = %{version}-%{release}
+Requires:		%{name}-libs%{?_isa} = %{version}-%{release}
 Requires:		/usr/bin/pkg-config
 Requires:		libX11-devel
 
@@ -79,7 +79,7 @@ The %{name}-table-chinese package provides other Chinese table for Fcitx.
 Summary:		Fcitx IM module for gtk2
 Group:			System Environment/Libraries
 Requires:		%{name} = %{version}-%{release}
-Requires:		%{name}-libs = %{version}-%{release}
+Requires:		%{name}-libs%{?_isa} = %{version}-%{release}
 
 %description gtk2
 This package contains Fcitx IM module for gtk2.
@@ -88,7 +88,7 @@ This package contains Fcitx IM module for gtk2.
 Summary:		Fcitx IM module for gtk3
 Group:			System Environment/Libraries
 Requires:		%{name} = %{version}-%{release}
-Requires:		%{name}-libs = %{version}-%{release}
+Requires:		%{name}-libs%{?_isa} = %{version}-%{release}
 Requires:		imsettings-gnome
 
 %description gtk3
@@ -98,7 +98,7 @@ This package contains Fcitx IM module for gtk3.
 Summary:		Fcitx IM module for qt4
 Group:			System Environment/Libraries
 Requires:		%{name} = %{version}-%{release}
-Requires:		%{name}-libs = %{version}-%{release}
+Requires:		%{name}-libs%{?_isa} = %{version}-%{release}
 
 %description qt4
 This package contains Fcitx IM module for qt4.
@@ -108,7 +108,7 @@ Summary:		Pinyin Engine for Fcitx
 URL:			https://fcitx-im.org/wiki/Built-in_Pinyin
 Group:			System Environment/Libraries
 Requires:		%{name} = %{version}-%{release}
-Requires:		%{name}-libs = %{version}-%{release}
+Requires:		%{name}-libs%{?_isa} = %{version}-%{release}
 Requires:		%{name}-data = %{version}-%{release}
 
 %description pinyin
@@ -119,7 +119,7 @@ Summary:		Quwei Engine for Fcitx
 URL:			https://fcitx-im.org/wiki/QuWei
 Group:			System Environment/Libraries
 Requires:		%{name} = %{version}-%{release}
-Requires:		%{name}-libs = %{version}-%{release}
+Requires:		%{name}-libs%{?_isa} = %{version}-%{release}
 Requires:		%{name}-data = %{version}-%{release}
 
 %description qw
@@ -130,7 +130,7 @@ Summary:		Table Engine for Fcitx
 URL:			https://fcitx-im.org/wiki/Table
 Group:			System Environment/Libraries
 Requires:		%{name} = %{version}-%{release}
-Requires:		%{name}-libs = %{version}-%{release}
+Requires:		%{name}-libs%{?_isa} = %{version}-%{release}
 Requires:		%{name}-data = %{version}-%{release}
 Requires:		%{name}-pinyin = %{version}-%{release}
 
@@ -183,15 +183,20 @@ rm -rf %{buildroot}
 
 %post 
 %{_sbindir}/alternatives --install %{_sysconfdir}/X11/xinit/xinputrc xinputrc %{_xinputconf} 55 || :
-update-desktop-database %{_datadir}/applications &>/dev/null || :
+/bin/touch --no-create %{_datadir}/mime/packages &>/dev/null || :
+/usr/bin/update-desktop-database &> /dev/null || :
 
 %postun  
 if [ "$1" = "0" ]; then
   %{_sbindir}/alternatives --remove xinputrc %{_xinputconf} || :
   # if alternative was set to manual, reset to auto
   [ -L %{_sysconfdir}/alternatives/xinputrc -a "`readlink %{_sysconfdir}/alternatives/xinputrc`" = "%{_xinputconf}" ] && %{_sbindir}/alternatives --auto xinputrc || :
+  /usr/bin/update-mime-database %{_datadir}/mime &> /dev/null || :
 fi
-update-desktop-database %{_datadir}/applications &>/dev/null || :
+/usr/bin/update-desktop-database &> /dev/null || :
+
+%posttrans
+/usr/bin/update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
 
 %post libs -p /sbin/ldconfig
 
@@ -355,6 +360,9 @@ fi
 
 
 %changelog
+* Tue Sep 09 2014 Rex Dieter <rdieter at fedoraproject.org> 4.2.8.4-6
+- update scriptlets (mime mostly), tighten subpkg deps, BR: qt4-devel
+
 * Tue Aug 26 2014 David Tardon <dtardon at redhat.com> - 4.2.8.4-5
 - rebuild for ICU 53.1
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/fcitx.git/commit/?h=f21&id=dc74b7042f523cbd4fcf44c3356accd03524dbda