[ibus-chewing] Fixed RHBZ 842856, 1027030; Added translations:fr_FR, ja_JP, ko_KR

Ding-Yi Chen dchen at fedoraproject.org
Wed Dec 18 06:39:13 UTC 2013 

commit 9d2384f6a18e24003de5a6561a3381eb2017ef37
Author: Ding-Yi Chen <dingyichen at gmail.com>
Date:   Wed Dec 18 16:39:18 2013 +1000

    Fixed RHBZ 842856, 1027030; Added translations:fr_FR, ja_JP, ko_KR

 .gitignore                      |    1 +
 ibus-chewing-1.4.3-cflags.patch |   12 ----
 ibus-chewing.spec               |  115 ++++++++++++++++-----------------------
 sources                         |    2 +-
 4 files changed, 50 insertions(+), 80 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7102f55..909804f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ ibus-chewing-1.3.6.20100730-Source.tar.gz
 /ibus-chewing-1.4.0-Source.tar.gz
 /ibus-chewing-1.4.2-Source.tar.gz
 /ibus-chewing-1.4.3-Source.tar.gz
+/ibus-chewing-1.4.4-Source.tar.gz
diff --git a/ibus-chewing.spec b/ibus-chewing.spec
index f4784df..f28a804 100644
--- a/ibus-chewing.spec
+++ b/ibus-chewing.spec
@@ -1,32 +1,32 @@
-%global message_level 6
 Name:       ibus-chewing
-Version:    1.4.3
-Release:    4%{?dist}
+Version:    1.4.4
+Release:    1%{?dist}
 Summary:    The Chewing engine for IBus input platform
 Summary(zh_TW): IBus新酷音輸入法
 License:    GPLv2+
 Group:      System Environment/Libraries
 URL:        http://code.google.com/p/ibus/
 Source0:    http://ibus.googlecode.com/files/%{name}-%{version}-Source.tar.gz
-# http://code.google.com/p/ibus/issues/detail?id=1597
-Patch0:     %{name}-1.4.3-cflags.patch
-
-BuildRequires:  gettext-devel
-BuildRequires:  gtk2-devel
-BuildRequires:  ibus-devel >= 1.3
-BuildRequires:  cmake >= 2.6.2
-
-# Make sure gob2 is patched against https://bugzilla.redhat.com/show_bug.cgi?id=519108
-BuildRequires:  gob2 >= 2.0.16-4
-BuildRequires:  libchewing-devel >= 0.3.3
-BuildRequires:  pkgconfig
-BuildRequires:  GConf2-devel
-BuildRequires:  libXtst-devel
+
+
+BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+
+
+BuildRequires:   cmake >= 2.6.2
+BuildRequires:   gob2 >= 2.0.16
+BuildRequires:   pkgconfig
+BuildRequires:   gtk2-devel
+BuildRequires:   ibus-devel >= 1.3
+BuildRequires:   libchewing-devel >= 0.3.3
+BuildRequires:   libX11-devel
+BuildRequires:   libXtst-devel
+BuildRequires:   gettext-devel
+BuildRequires:   GConf2-devel
+
+Requires:   gtk2
 Requires:   ibus >= 1.3
-Requires:  libchewing >= 0.3.3
-Requires(pre): GConf2
-Requires(post): GConf2
-Requires(preun): GConf2
+Requires:   libchewing >= 0.3.3
 
 %description
 IBus-chewing is an IBus front-end of Chewing, an intelligent Chinese input
@@ -44,70 +44,50 @@ IBus-chewing 是新酷音輸入法的IBus前端。
 
 本輸入法也同時支援帶調漢語拼音輸入。
 
+
+
+
 %prep
 %setup -q -n %{name}-%{version}-Source
-%patch0 -p1
 
 %build
 # $RPM_OPT_FLAGS should be loaded from cmake macro.
 
-%if 0%{?rhel} <= 6
-%cmake -DMANAGE_MESSAGE_LEVEL=%{message_level} -DCMAKE_FEDORA_ENABLE_FEDORA_BUILD=1 -DGNOME_SHELL=0 .
-%else
-%cmake -DMANAGE_MESSAGE_LEVEL=%{message_level} -DCMAKE_FEDORA_ENABLE_FEDORA_BUILD=1 .
-%endif
-%__make VERBOSE=1  %{?_smp_mflags}
+%cmake -DCMAKE_FEDORA_ENABLE_FEDORA_BUILD=1 .
+make VERBOSE=1 %{?_smp_mflags}
+
 
 %install
-%__make install DESTDIR=%{buildroot}
-# We install document using %doc
-(cd %{buildroot}//usr/share/doc/ibus-chewing-1.4.3
- rm -rf RELEASE-NOTES.txt AUTHORS README ChangeLog COPYING USER-GUIDE
- )
+%__rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
 
+# We install document using doc
+(cd $RPM_BUILD_ROOT/usr/share/doc/ibus-chewing-1.4.4
+    rm -fr *
+)
 %find_lang %{name}
 
-%pre
-if [ "$1" -gt 1 ] ; then
-    export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-    [ -r %{_sysconfdir}/gconf/schemas/%{name}.schemas ] &&
-    gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/%{name}.schemas\
-    >/dev/null || :
-
-# Upgrading 1.0.2.20090302-1.fc11 or older?
-    [ -r %{_sysconfdir}/gconf/schemas/%{name}.schema ] &&
-    gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/%{name}.schema\
-     >/dev/null || :
-fi
-
-%post
-export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || :
-
-%preun
-if [ "$1" -eq 0 ] ; then
-export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || :
-fi
+
+
+
 
 %clean
 
 %files -f %{name}.lang
-%doc RELEASE-NOTES.txt AUTHORS README ChangeLog COPYING USER-GUIDE
+%doc AUTHORS README ChangeLog COPYING USER-GUIDE
 %{_libexecdir}/ibus-engine-chewing
-%{_datadir}/%{name}
+%config %{_sysconfdir}/gconf/schemas/ibus-chewing.schemas
 %{_datadir}/ibus/component/chewing.xml
-%config(noreplace) %{_sysconfdir}/gconf/schemas/%{name}.schemas
+%{_datadir}/%{name}/icons
 
 %changelog
-* Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.3-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
-
-* Wed Feb 20 2013 Ville Skyttä <ville.skytta at iki.fi> - 1.4.3-3
-- Build with $RPM_OPT_FLAGS (#842856).
-
-* Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.3-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+* Wed Dec 18 2013 Ding-Yi Chen <dchen at redhat.com> - 1.4.4-1
+- Resolves Bug 842856 - ibus-chewing 1.4.3-1 not built with $RPM_OPT_FLAGS
+- Resolves Bug 1027030 - CVE-2013-4509 ibus-chewing: ibus: visible 
+  password entry flaw [fedora-all]
+  Thanks czchen for the GitHub pull request 39.
+- Added translations: fr_FR, ja_JP, ko_KR
+- Adopt cmake-fedora-1.2.0
 
 * Mon Nov 26 2012 Ding-Yi Chen <dchen at redhat.com> - 1.4.3-1
 - Fixed GitHub issue #30: Rework decorate_preedit
@@ -416,8 +396,9 @@ Fix the errors which Funda Wang as pointing out:
 * Tue Sep 16 2008 Huang Peng <shawn.p.huang at gmail.com> - 0.1.1.20080916-1
 - Update to 0.1.1.20080916.
 
-* Mon Sep 09 2008 Huang Peng <shawn.p.huang at gmail.com> - 0.1.1.20080901-1
+* Tue Sep 09 2008 Huang Peng <shawn.p.huang at gmail.com> - 0.1.1.20080901-1
 - Update to 0.1.1.20080901.
 
 * Fri Aug 15 2008 Huang Peng <shawn.p.huang at gmail.com> - 0.1.1.20081023-1
 - The first version.
+
diff --git a/sources b/sources
index 88c7538..ac0b454 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-20b1d553ba14cecabcf7418e91da353b  ibus-chewing-1.4.3-Source.tar.gz
+6b24622416a46f6c8debd23d66f9d3f5  ibus-chewing-1.4.4-Source.tar.gz

More information about the scm-commits mailing list