Fix changelog

Merge branch 'master' into f16
Conflicts: fcitx.spec
2012-07-24 23:28:21 +08:00 · 2012-07-24 23:18:01 +08:00 · 2012-06-07 01:32:48 +08:00 · 2012-06-07 01:31:34 +08:00 · 2012-06-06 01:19:42 +08:00 · 2012-06-06 01:17:50 +08:00
1 changed files with 11 additions and 4 deletions
--- a/fcitx.spec
+++ b/fcitx.spec
@ -5,7 +5,7 @@
 Name:			fcitx
 Summary:		Free Chinese Input Toy for X (XIM)
 Version:		4.2.5
-Release:		1%{?dist}
+Release:		1.1%{?dist}
 License:		GPLv2+
 Group:			User Interface/Desktops
 URL:			http://code.google.com/p/%{name}/
@ -135,7 +135,7 @@ This package contains table engine for fcitx.
 %build
 mkdir -p build
 pushd build
-%cmake .. -DENABLE_GTK3_IM_MODULE=On -DENABLE_QT_IM_MODULE=On -DENABLE_OPENCC=On-DENABLE_LUA=On -DENABLE_GIR=On
+%cmake .. -DENABLE_GTK3_IM_MODULE=On -DENABLE_QT_IM_MODULE=On -DENABLE_OPENCC=On-DENABLE_LUA=On -DENABLE_GIR=Off
 make VERBOSE=1 %{?_smp_mflags}

 %install
@ -228,8 +228,6 @@ update-desktop-database %{_datadir}/applications &>/dev/null || :
 %{_libdir}/%{name}/%{name}-[!pqt]*.so
 %{_libdir}/%{name}/%{name}-punc.so
 %{_libdir}/%{name}/%{name}-quickphrase.so
-%{_libdir}/girepository-1.0/Fcitx-1.0.typelib
-%{_datadir}/gir-1.0/Fcitx-1.0.gir

 %files data
 %defattr(-,root,root,-)
@ -308,17 +306,26 @@ update-desktop-database %{_datadir}/applications &>/dev/null || :


 %changelog
+* Tue Jul 24 2012 Liang Suilong <liangsuilong@gmail.com> - 4.2.5-1.1
+- Disable GIR Binding on Fedora 16
+
 * Sun Jul 22 2012 Liang Suilong <liangsuilong@gmail.com> - 4.2.5-1
 - Upstream to fcitx-4.2.5

 * Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.2.4-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild

+* Thu Jun 07 2012 Liang Suilong <liangsuilong@gmail.com> - 4.2.4-2.1
+- Disable GIR Binding on Fedora 16
+
 * Thu Jun 07 2012 Liang Suilong <liangsuilong@gmail.com> - 4.2.4-2
 - Drop fcitx-keyboard
 - Divide Table Engine into fcitx-table
 - Move GIR Binding into fcitx-libs

+* Wed Jun 06 2012 Liang Suilong <liangsuilong@gmail.com> - 4.2.4-1.1
+- Disable GIR Binding on Fedora 16
+
 * Tue Jun 05 2012 Liang Suilong <liangsuilong@gmail.com> - 4.2.4-1
 - Upgrade to fcitx-4.2.4
 - Fix the ownership conflict on fcitx and fcitx-data
Author	SHA1	Message	Date
Fedora	31686c2594	Fix changelog	2012-07-24 23:28:21 +08:00
Fedora	3314702200	Merge branch 'master' into f16 Conflicts: fcitx.spec	2012-07-24 23:18:01 +08:00
Fedora	0e325c007c	Fix SPEC Error	2012-06-07 01:32:48 +08:00
Fedora	80378aaf28	Merge branch 'master' into f16 Conflicts: fcitx.spec	2012-06-07 01:31:34 +08:00
Fedora	6f1a198de7	Disable GIR Binding on Fedora 16	2012-06-06 01:19:42 +08:00
Fedora	ba2ce111a5	Merge branch 'master' into f16	2012-06-06 01:17:50 +08:00
Fedora	a7e47d950d	Merge branch 'master' into f16	2012-05-07 22:59:18 +08:00
Fedora	c404ec65e2	Merge branch 'master' into f16	2012-04-27 00:41:28 +08:00
Fedora	837d3493c9	Merge branch 'master' into f16	2012-04-23 21:58:46 +08:00
Fedora	eec8d37a21	Merge branch 'master' into f16	2012-02-04 13:46:48 +08:00
Fedora	01444a4a28	Merge branch 'master' into f16	2011-12-25 21:54:21 +08:00
Fedora	44ad006468	Merge branch 'master' into f16	2011-12-25 02:30:25 +08:00
Fedora	0bc7823e8d	Merge branch 'master' into f16	2011-12-25 01:26:48 +08:00
Fedora	c079690fbe	Merge branch 'master' into f16	2011-09-11 01:41:27 +08:00
Fedora	fdb0b2e05e	Merge branch 'master' into f16	2011-09-09 23:40:07 +08:00
Fedora	7c3a036960	Merge branch 'master' into f16	2011-09-09 16:50:35 +08:00
Fedora	4f2e64a05f	Merge branch 'master' into f16	2011-08-02 17:52:58 +08:00
Fedora	99a7c18838	Fix specfile mistake	2011-08-02 03:13:42 +08:00
Fedora	c64b7b9c8c	Fix specfile's error	2011-08-02 02:54:05 +08:00