rpms/ibus-chewing/F-10 .cvsignore, 1.6, 1.7 ibus-chewing.spec, 1.5, 1.6 import.log, 1.1, 1.2 sources, 1.6, 1.7

[Ding-Yi Chen]

Author: dchen

Update of /cvs/pkgs/rpms/ibus-chewing/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8855/F-10

Modified Files:
	.cvsignore ibus-chewing.spec import.log sources 
Log Message:
Most setting options revealed, fix google code issue 281.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-chewing/F-10/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	23 Oct 2008 06:49:40 -0000	1.6
+++ .cvsignore	27 Feb 2009 08:02:38 -0000	1.7
@@ -1 +1 @@
-ibus-chewing-0.1.1.20081023.tar.gz
+ibus-chewing-1.0.1.20090227-Source.tar.gz


Index: ibus-chewing.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-chewing/F-10/ibus-chewing.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ibus-chewing.spec	23 Oct 2008 06:49:40 -0000	1.5
+++ ibus-chewing.spec	27 Feb 2009 08:02:38 -0000	1.6
@@ -1,71 +1,89 @@
-%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
-%define mod_path ibus-0.1
 Name:       ibus-chewing
-Version:    0.1.1.20081023
+Version:    1.0.1.20090227
 Release:    1%{?dist}
 Summary:    The Chewing engine for IBus input platform
 License:    GPLv2+
 Group:      System Environment/Libraries
 URL:        http://code.google.com/p/ibus/
-Source0:    http://ibus.googlecode.com/files/%{name}-%{version}.tar.gz
+Source0:    http://ibus.googlecode.com/files/%{name}-%{version}-Source.tar.gz
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gettext-devel
-BuildRequires:  libtool
-BuildRequires:  python-devel
-BuildRequires:  libchewing-devel >= 0.3.1
-BuildRequires:  swig
+BuildRequires:  gtk2-devel
+BuildRequires:  ibus-devel >= 1.1
+BuildRequires:  cmake
+BuildRequires:  gob2
+BuildRequires:  libchewing-devel >= 0.3.2-4
 BuildRequires:  pkgconfig
-
-Requires:   ibus
-Requires:   libchewing >= 0.3.1
+BuildRequires:  GConf2-devel
+Requires:   ibus >= 1.1
+Requires:  libchewing >= 0.3.2-4
+Requires:  gconf2
+Requires(pre): GConf2
+Requires(post): GConf2
+Requires(preun): GConf2
 
 %description
 The Chewing engine for IBus platform. It provides Chinese input method from
 libchewing.
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}-Source
 
 %build
-%configure --disable-static
-# make -C po update-gmo
-make %{?_smp_mflags}
+%cmake -DCMAKE_INSTALL_PREFIX=%{_usr}
+make VERBOSE=1 C_DEFINES="$RPM_OPT_FLAGS" %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make DESTDIR=${RPM_BUILD_ROOT} install
-rm -f $RPM_BUILD_ROOT%{python_sitearch}/_chewing.la
+make install DESTDIR=$RPM_BUILD_ROOT
+%find_lang %{name}
 
+%pre
+if [ "$1" -gt 1 ] ; then
+export GCONF_CONFIG_SOURCE=gconftool-2 --get-default-source
+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}.schema > /dev/null || :
 %find_lang %{name}
 
+%preun
+if [ "$1" -eq 0 ] ; then
+export GCONF_CONFIG_SOURCE=gconftool-2 --get-default-source
+gconftool-2 --makefile-uninstall-rule \
+%{_sysconfdir}/gconf/schemas/%{name}.schema > /dev/null || :
+fi
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING README
-# %dir %{python_sitearch}/ibus
-%{python_sitearch}/chewing.py*
-%{python_sitearch}/_chewing.so
-%dir %{_datadir}/ibus-chewing
-%{_bindir}/ibus-engine-chewing
-%{_datadir}/ibus-chewing/*
-%{_datadir}/ibus/engine/chewing.engine
+%doc AUTHORS README ChangeLog NEWS COPYING
+%{_libexecdir}/ibus-engine-chewing
+%{_datadir}/%{name}
+%{_datadir}/ibus/component/chewing.xml
+%config(noreplace) %{_sysconfdir}/gconf/schemas/%{name}.schema
 
 %changelog
-* Thu Oct 23 2008 Huang Peng <shawn.p.huang at gmail.com> - 0.1.1.20080923-1
-- Update to 0.1.1.20080923.
-
-* Wed Sep 17 2008 Huang Peng <shawn.p.huang at gmail.com> - 0.1.1.20080917-1
-- Update to 0.1.1.20080917.
+* Fri Feb 27 2009 Ding-Yi Chen <dchen at redhat.com> - 1.0.1.20090227-1
+- Setting shows/hides KBType, selKeys, and various settings.
+- Add gconf schema.
+- Fix some memory leaking checked.
+- Move some function to cmake_modules.
+- Fix Google code issue 281
 
-* Tue Sep 16 2008 Huang Peng <shawn.p.huang at gmail.com> - 0.1.1.20080916-1
-- Update to 0.1.1.20080916.
+* Wed Feb 18 2009 Ding-Yi Chen <dchen at redhat.com> - 1.0.0.20090220-1
+- First working version for IBus C
 
-* Mon Sep 09 2008 Huang Peng <shawn.p.huang at gmail.com> - 0.1.1.20080901-1
-- Update to 0.1.1.20080901.
+* Wed Jan 28 2009 Ding-Yi Chen <dchen at redhat.com> - 1.0.0.20090128-1
+- Fix the binding with libchewing 0.3.2.
 
-* Fri Aug 15 2008 Huang Peng <shawn.p.huang at gmail.com> - 0.1.1.20080823-1
+* Fri Aug 15 2008 Huang Peng <shawn.p.huang at gmail.com> - 0.1.1.20081023-1
 - The first version.


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-chewing/F-10/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	24 Aug 2008 22:30:32 -0000	1.1
+++ import.log	27 Feb 2009 08:02:38 -0000	1.2
@@ -1 +1,2 @@
 ibus-chewing-0_1_1_20080823-1_fc9:HEAD:ibus-chewing-0.1.1.20080823-1.fc9.src.rpm:1219617084
+ibus-chewing-1_0_1_20090227-1_fc10:F-10:ibus-chewing-1.0.1.20090227-1.fc10.src.rpm:1235721693


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-chewing/F-10/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	23 Oct 2008 06:49:40 -0000	1.6
+++ sources	27 Feb 2009 08:02:38 -0000	1.7
@@ -1 +1 @@
-0404842616b1d4e6020ad192c5bff714  ibus-chewing-0.1.1.20081023.tar.gz
+d3cfd66afea9b16f7d4810ece97ca3fb  ibus-chewing-1.0.1.20090227-Source.tar.gz