[fcitx] Update to 4.2.8 (https://www.csslayer.info/wordpress/fcitx-dev/fcitx-4-2-8/)

李瑞彬 cheeselee at fedoraproject.org
Tue Jul 2 06:10:47 UTC 2013


commit 2aff040e97aeaa52e0b9d3ea6df4a198317c1b4f
Author: Robin Lee <cheeselee at fedoraproject.org>
Date:   Tue Jul 2 14:09:34 2013 +0800

    Update to 4.2.8 (https://www.csslayer.info/wordpress/fcitx-dev/fcitx-4-2-8/)
    
    - Add scriptlets to update icon cache (BZ#980309)

 .gitignore |    1 +
 fcitx.spec |   34 +++++++++++++++++++++++++++++++---
 sources    |    2 +-
 3 files changed, 33 insertions(+), 4 deletions(-)
---
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..75b4986
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/fcitx-4.2.8_dict.tar.xz
diff --git a/fcitx.spec b/fcitx.spec
index d23078a..ef70abe 100644
--- a/fcitx.spec
+++ b/fcitx.spec
@@ -4,8 +4,8 @@
 
 Name:			fcitx
 Summary:		Free Chinese Input Toy for X (XIM)
-Version:		4.2.7
-Release:		6%{?dist}
+Version:		4.2.8
+Release:		1%{?dist}
 License:		GPLv2+
 Group:			User Interface/Desktops
 URL:			http://code.google.com/p/%{name}/
@@ -22,7 +22,7 @@ BuildRequires:		libX11-devel, qt-x11, dbus-glib-devel, dbus-x11
 BuildRequires:		desktop-file-utils, libxml2-devel
 BuildRequires:		lua-devel
 Requires:		%{name}-data = %{version}-%{release}
-Requires:		imsettings 
+Requires:		imsettings
 Requires(post):		%{_sbindir}/alternatives
 Requires(postun):	%{_sbindir}/alternatives
 Requires:		%{name}-libs = %{version}-%{release}
@@ -38,6 +38,7 @@ methods. It's small and fast.
 Summary:		Data files of FCITX
 Group:			System Environment/Libraries
 BuildArch:		noarch
+Requires:		hicolor-icon-theme
 
 %description data
 The %{name}-data package provides shared datas for FCITX.
@@ -186,6 +187,18 @@ update-desktop-database %{_datadir}/applications &>/dev/null || :
 
 %postun libs -p /sbin/ldconfig
 
+%post data
+/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+
+%postun data
+if [ $1 -eq 0 ] ; then
+    /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+    /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+fi
+
+%posttrans data
+/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
 %post gtk2
 %{_bindir}/update-gtk-immodules %{_host} || :
 
@@ -236,6 +249,7 @@ update-desktop-database %{_datadir}/applications &>/dev/null || :
 %{_libdir}/%{name}/%{name}-punc.so
 %{_libdir}/%{name}/%{name}-quickphrase.so
 %{_libdir}/%{name}/qt/
+%{_libdir}/%{name}/libexec/
 %dir %{_libdir}/girepository-1.0/
 %{_libdir}/girepository-1.0/Fcitx-1.0.typelib
 
@@ -253,13 +267,23 @@ update-desktop-database %{_datadir}/applications &>/dev/null || :
 %{_datadir}/icons/hicolor/24x24/status/*.png
 %{_datadir}/icons/hicolor/48x48/status/*.png
 %{_datadir}/icons/hicolor/scalable/status/*.svg
+%{_datadir}/icons/hicolor/scalable/apps/*.svg
+# co-own directories also owned by gnome-icon-theme
+%dir %{_datadir}/icons/gnome
+%dir %{_datadir}/icons/gnome/scalable
+%dir %{_datadir}/icons/gnome/scalable/status
+%dir %{_datadir}/icons/gnome/scalable/apps
 %{_datadir}/icons/gnome/scalable/status/*.svg
+%{_datadir}/icons/gnome/scalable/apps/*.svg
+%dir %{_datadir}/%{name}
 %{_datadir}/%{name}/skin/
+%dir %{_datadir}/%{name}/addon
 %{_datadir}/%{name}/addon/%{name}-[!pqt]*.conf
 %{_datadir}/%{name}/addon/%{name}-punc.conf
 %{_datadir}/%{name}/addon/%{name}-quickphrase.conf
 %{_datadir}/%{name}/data/
 %{_datadir}/%{name}/spell/
+%dir %{_datadir}/%{name}/configdesc
 %{_datadir}/%{name}/configdesc/[!ft]*.desc
 %{_datadir}/%{name}/configdesc/fcitx-[!p]*.desc
 
@@ -324,6 +348,10 @@ update-desktop-database %{_datadir}/applications &>/dev/null || :
 
 
 %changelog
+* Tue Jul  2 2013 Robin Lee <cheeselee at fedoraproject.org> - 4.2.8-1
+- Update to 4.2.8 (https://www.csslayer.info/wordpress/fcitx-dev/fcitx-4-2-8/)
+- Add scriptlets to update icon cache (BZ#980309)
+
 * Fri Jun 21 2013 Robin Lee <cheeselee at fedoraproject.org> - 4.2.7-6
 - Move fcitx4-config to devel package and patch it to use pkg-config to solve
   libdir
diff --git a/sources b/sources
index 1ccddb3..1ad03e8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6e291717c24615b9dc9bfaa2949af3a7  fcitx-4.2.7_dict.tar.xz
+79676d18536ebb9d0a0fa47e96416016  fcitx-4.2.8_dict.tar.xz


More information about the scm-commits mailing list