[ibus-bogo] Update to new release 0.4 from upstream.

Truong Anh Tuan tuanta at fedoraproject.org
Wed Jan 22 08:48:17 UTC 2014 

commit 90152151328a29c1374dbeb71df0c720cc001888
Author: Truong Anh Tuan (iWay CEO) <tuanta at iwayvietnam.com>
Date:   Wed Jan 22 15:48:32 2014 +0700

    Update to new release 0.4 from upstream.

 .gitignore                               |    1 +
 ibus-bogo-fix-libexec-folder-name.patch  |   32 ++++++++++++++--------------
 ibus-bogo-fix-python2-for-settings.patch |   18 ---------------
 ibus-bogo.spec                           |   34 +++++++++++++++---------------
 sources                                  |    2 +-
 5 files changed, 35 insertions(+), 52 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 67e3bca..b01972c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /ibus-bogo-0.3-7aeb7bd.tar.gz
+/ibus-bogo-0.4-ce44b96.tar.gz
diff --git a/ibus-bogo-fix-libexec-folder-name.patch b/ibus-bogo-fix-libexec-folder-name.patch
index b5a66f1..9136e3b 100644
--- a/ibus-bogo-fix-libexec-folder-name.patch
+++ b/ibus-bogo-fix-libexec-folder-name.patch
@@ -1,7 +1,7 @@
-diff -rupN ibus-bogo-python-7aeb7bdb0a42d5babc034509e07fce177b4ae5ac/config-gui/CMakeLists.txt ibus-bogo-python-7aeb7bdb0a42d5babc034509e07fce177b4ae5ac-new-libexec-folder-name/config-gui/CMakeLists.txt
---- ibus-bogo-python-7aeb7bdb0a42d5babc034509e07fce177b4ae5ac/config-gui/CMakeLists.txt	2013-03-29 22:48:17.000000000 +0700
-+++ ibus-bogo-python-7aeb7bdb0a42d5babc034509e07fce177b4ae5ac-new-libexec-folder-name/config-gui/CMakeLists.txt	2013-03-30 10:22:25.056768664 +0700
-@@ -22,7 +22,7 @@
+diff -rupN ibus-bogo-python-ce44b961de5a0f82a4a2d8fc0e487e8fcb29289d/gui/CMakeLists.txt ibus-bogo-python-ce44b961de5a0f82a4a2d8fc0e487e8fcb29289d-new/gui/CMakeLists.txt
+--- ibus-bogo-python-ce44b961de5a0f82a4a2d8fc0e487e8fcb29289d/gui/CMakeLists.txt	2014-01-17 00:34:52.000000000 +0700
++++ ibus-bogo-python-ce44b961de5a0f82a4a2d8fc0e487e8fcb29289d-new/gui/CMakeLists.txt	2014-01-22 11:38:21.347815190 +0700
+@@ -24,7 +24,7 @@ set(GUI_INSTALL_DIR "${BOGO_INSTALL_DIR}
  install (PROGRAMS
    ibus-bogo-settings
    DESTINATION
@@ -10,21 +10,21 @@ diff -rupN ibus-bogo-python-7aeb7bdb0a42d5babc034509e07fce177b4ae5ac/config-gui/
    )
  
  install (FILES
-diff -rupN ibus-bogo-python-7aeb7bdb0a42d5babc034509e07fce177b4ae5ac/config-gui/ibus-bogo-settings.desktop ibus-bogo-python-7aeb7bdb0a42d5babc034509e07fce177b4ae5ac-new-libexec-folder-name/config-gui/ibus-bogo-settings.desktop
---- ibus-bogo-python-7aeb7bdb0a42d5babc034509e07fce177b4ae5ac/config-gui/ibus-bogo-settings.desktop	2013-03-29 22:48:17.000000000 +0700
-+++ ibus-bogo-python-7aeb7bdb0a42d5babc034509e07fce177b4ae5ac-new-libexec-folder-name/config-gui/ibus-bogo-settings.desktop	2013-03-30 10:22:49.963779719 +0700
+diff -rupN ibus-bogo-python-ce44b961de5a0f82a4a2d8fc0e487e8fcb29289d/gui/ibus-setup-bogo.desktop ibus-bogo-python-ce44b961de5a0f82a4a2d8fc0e487e8fcb29289d-new/gui/ibus-setup-bogo.desktop
+--- ibus-bogo-python-ce44b961de5a0f82a4a2d8fc0e487e8fcb29289d/gui/ibus-setup-bogo.desktop	2014-01-17 00:34:52.000000000 +0700
++++ ibus-bogo-python-ce44b961de5a0f82a4a2d8fc0e487e8fcb29289d-new/gui/ibus-setup-bogo.desktop	2014-01-22 11:39:17.137731608 +0700
 @@ -2,7 +2,7 @@
  Encoding=UTF-8
- Name=ibus-bogo Settings
+ Name=BoGo Settings
  Comment=Settings for the ibus-bogo the Vietnamese input method
 -Exec=/usr/lib/ibus-bogo/ibus-bogo-settings
 +Exec=/usr/libexec/ibus-bogo/ibus-bogo-settings
  Icon=ibus-bogo
  Type=Application
  Categories=Utility;
-diff -rupN ibus-bogo-python-7aeb7bdb0a42d5babc034509e07fce177b4ae5ac/ibus_engine/CMakeLists.txt ibus-bogo-python-7aeb7bdb0a42d5babc034509e07fce177b4ae5ac-new-libexec-folder-name/ibus_engine/CMakeLists.txt
---- ibus-bogo-python-7aeb7bdb0a42d5babc034509e07fce177b4ae5ac/ibus_engine/CMakeLists.txt	2013-03-29 22:48:17.000000000 +0700
-+++ ibus-bogo-python-7aeb7bdb0a42d5babc034509e07fce177b4ae5ac-new-libexec-folder-name/ibus_engine/CMakeLists.txt	2013-03-30 10:24:08.113936911 +0700
+diff -rupN ibus-bogo-python-ce44b961de5a0f82a4a2d8fc0e487e8fcb29289d/ibus_engine/CMakeLists.txt ibus-bogo-python-ce44b961de5a0f82a4a2d8fc0e487e8fcb29289d-new/ibus_engine/CMakeLists.txt
+--- ibus-bogo-python-ce44b961de5a0f82a4a2d8fc0e487e8fcb29289d/ibus_engine/CMakeLists.txt	2014-01-17 00:34:52.000000000 +0700
++++ ibus-bogo-python-ce44b961de5a0f82a4a2d8fc0e487e8fcb29289d-new/ibus_engine/CMakeLists.txt	2014-01-22 11:39:48.987678741 +0700
 @@ -22,7 +22,7 @@
  install (PROGRAMS
    data/ibus-engine-bogo
@@ -34,16 +34,16 @@ diff -rupN ibus-bogo-python-7aeb7bdb0a42d5babc034509e07fce177b4ae5ac/ibus_engine
    )
  
  install (FILES
-diff -rupN ibus-bogo-python-7aeb7bdb0a42d5babc034509e07fce177b4ae5ac/ibus_engine/data/bogo.xml ibus-bogo-python-7aeb7bdb0a42d5babc034509e07fce177b4ae5ac-new-libexec-folder-name/ibus_engine/data/bogo.xml
---- ibus-bogo-python-7aeb7bdb0a42d5babc034509e07fce177b4ae5ac/ibus_engine/data/bogo.xml	2013-03-29 22:48:17.000000000 +0700
-+++ ibus-bogo-python-7aeb7bdb0a42d5babc034509e07fce177b4ae5ac-new-libexec-folder-name/ibus_engine/data/bogo.xml	2013-03-30 10:24:39.215597519 +0700
+diff -rupN ibus-bogo-python-ce44b961de5a0f82a4a2d8fc0e487e8fcb29289d/ibus_engine/data/bogo.xml ibus-bogo-python-ce44b961de5a0f82a4a2d8fc0e487e8fcb29289d-new/ibus_engine/data/bogo.xml
+--- ibus-bogo-python-ce44b961de5a0f82a4a2d8fc0e487e8fcb29289d/ibus_engine/data/bogo.xml	2014-01-17 00:34:52.000000000 +0700
++++ ibus-bogo-python-ce44b961de5a0f82a4a2d8fc0e487e8fcb29289d-new/ibus_engine/data/bogo.xml	2014-01-22 11:40:35.921595978 +0700
 @@ -3,7 +3,7 @@
  <component>
- 	<name>org.freedesktop.IBus.BoGoPython</name>
+ 	<name>org.freedesktop.IBus.BoGo</name>
  	<description>BoGo Engine for IBus</description>
 -	<exec>/usr/lib/ibus-bogo/ibus-engine-bogo --ibus</exec>
 +	<exec>/usr/libexec/ibus-bogo/ibus-engine-bogo --ibus</exec>
- 	<version>0.3</version>
+ 	<version>0.4</version>
  	<author>Đàm Tiến Long &lt;longdt90 at gmail.com&gt;
  Ngô Đức Trung &lt;ndtrung4419 at gmail.com&gt;
 @@ -25,7 +25,7 @@ Ngô Đức Trung &lt;ndtrung4419 at gmail.
diff --git a/ibus-bogo.spec b/ibus-bogo.spec
index e6d0fdf..396b51b 100644
--- a/ibus-bogo.spec
+++ b/ibus-bogo.spec
@@ -1,10 +1,10 @@
 Name:		ibus-bogo
 
-%global commit 7aeb7bdb0a42d5babc034509e07fce177b4ae5ac
+%global commit ce44b961de5a0f82a4a2d8fc0e487e8fcb29289d
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 
-Version:	0.3
-Release:	6%{?dist}
+Version:	0.4
+Release:	1%{?dist}
 Summary:	Vietnamese engine for IBus input platform
 
 Group:		User Interface/X
@@ -14,24 +14,22 @@ URL:		http://github.com/BoGoEngine/ibus-bogo-python
 Source0:	http://github.com/BoGoEngine/ibus-bogo-python/archive/%{commit}/%{name}-%{version}-%{shortcommit}.tar.gz
 # fix the run scripts folder to /usr/libexec since upstream developers put it in /usr/lib
 Patch0:		ibus-bogo-fix-libexec-folder-name.patch
-# fix the settings script to run with python2 since python3-pyside package is not available at the moment
-Patch1:		ibus-bogo-fix-python2-for-settings.patch
 
 BuildRequires:	desktop-file-utils
 BuildRequires:	ibus-devel
 BuildRequires:	python3-devel
 BuildRequires:	python3-gobject
-BuildRequires:	python-pyside-devel
-BuildRequires:	qt3-devel
-BuildRequires:	pyside-tools
+BuildRequires:	python3-PyQt4-devel
+BuildRequires:	PyQt4-devel
+
 BuildArch:	noarch
 
 Requires:	ibus
 Requires:	python3
-Requires:	python-pyside
-Requires:	qt3
+Requires:	python3-PyQt4
+Requires:	PyQt4
 Requires:	python3-gobject
-Requires:	libwnck3	
+Requires:	libwnck3
 
 
 %description
@@ -41,7 +39,6 @@ A Vietnamese engine for IBus input platform that uses BoGoEngine.
 %prep
 %setup -qn %{name}-python-%{commit}
 %patch0 -p1 -b .ibus-bogo-origin0
-%patch1 -p1 -b .ibus-bogo-origin1
 
 %build
 %cmake .
@@ -54,7 +51,7 @@ desktop-file-install \
 --add-category="Settings" \
 --delete-original \
 --dir=${RPM_BUILD_ROOT}%{_datadir}/applications \
-${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}-settings.desktop
+${RPM_BUILD_ROOT}%{_datadir}/applications/ibus-setup-bogo.desktop
 
 
 %post
@@ -72,15 +69,15 @@ fi
 
 %files
 %doc README.md AUTHORS COPYING
-%{_datadir}/applications/%{name}-settings.desktop
+%{_datadir}/applications/ibus-setup-bogo.desktop
 %{_datadir}/ibus/component/bogo.xml
 %{_datadir}/%{name}/
 %{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
 %{_libexecdir}/%{name}/
 %exclude %{_datadir}/%{name}/bogo/*.pyc
 %exclude %{_datadir}/%{name}/bogo/*.pyo
-%exclude %{_datadir}/%{name}/config-gui/*.pyc
-%exclude %{_datadir}/%{name}/config-gui/*.pyo
+%exclude %{_datadir}/%{name}/gui/*.pyc
+%exclude %{_datadir}/%{name}/gui/*.pyo
 %exclude %{_datadir}/%{name}/ibus_engine/*.pyc
 %exclude %{_datadir}/%{name}/ibus_engine/*.pyo
 %exclude %{_datadir}/%{name}/vncharsets/*.pyc
@@ -88,13 +85,16 @@ fi
 
 
 %changelog
+* Wed Jan 22 2014 Truong Anh Tuan <tuanta at iwayvietnam.com> - 0.4-1
+- Update to new release 0.4 from upstream.
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
 * Mon May 6 2013 Truong Anh Tuan <tuanta at iwayvietnam.com> - 0.3-5
 - Add python3-gobject, libwnck3 as Requires.
 
-* Wed Apr 29 2013 Truong Anh Tuan <tuanta at iwayvietnam.com> - 0.3-4
+* Mon Apr 29 2013 Truong Anh Tuan <tuanta at iwayvietnam.com> - 0.3-4
 - Add pyside-tools as a BuildRequires (missing).
 
 * Wed Apr 24 2013 Truong Anh Tuan <tuanta at iwayvietnam.com> - 0.3-3
diff --git a/sources b/sources
index eb260bd..8ba28a2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f7e4f00d8fa54ef07b142ac052b54ed9  ibus-bogo-0.3-7aeb7bd.tar.gz
+c4804f08c6252c38d57d2ea4222f4dd1  ibus-bogo-0.4-ce44b96.tar.gz

More information about the scm-commits mailing list