rpms/scim-bridge/devel .cvsignore, 1.28, 1.29 scim-bridge.spec, 1.46, 1.47 sources, 1.28, 1.29

[Huang Peng (phuang)]

Author: phuang

Update of /cvs/pkgs/rpms/scim-bridge/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28406

Modified Files:
	.cvsignore scim-bridge.spec sources 
Log Message:
Update to 0.4.13



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/scim-bridge/devel/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- .cvsignore	21 May 2007 04:03:30 -0000	1.28
+++ .cvsignore	2 Jul 2007 14:08:19 -0000	1.29
@@ -1 +1 @@
-scim-bridge-0.4.12.tar.gz
+scim-bridge-0.4.13.tar.gz


Index: scim-bridge.spec
===================================================================
RCS file: /cvs/pkgs/rpms/scim-bridge/devel/scim-bridge.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- scim-bridge.spec	6 Jun 2007 07:52:52 -0000	1.46
+++ scim-bridge.spec	2 Jul 2007 14:08:19 -0000	1.47
@@ -4,8 +4,8 @@
 %define build_qt 1
 
 Name:           scim-bridge
-Version:        0.4.12
-Release:        3%{?dist}
+Version:        0.4.13
+Release:        1%{?dist}
 Summary:        SCIM Bridge Gtk IM module
 
 Group:          System Environment/Libraries
@@ -16,13 +16,14 @@
 BuildRequires:  scim-devel >= 1.4.6
 %if %{build_qt}
 BuildRequires:  qt-devel
+BuildRequires:  qt4-devel
 %endif
 %if %{snapshot}
 Buildrequires:  autoconf, automake, libtool
 %endif
 Requires:       scim >= 1.4.6
 
-Patch1:		scim-bridge-dont-fallback-some-keyevent.patch
+# Patch1:		scim-bridge-dont-fallback-some-keyevent.patch
 
 %description
 SCIM Bridge is a C implementation of a Gtk IM module for SCIM.
@@ -51,12 +52,23 @@
 
 %description qt
 This package provides the SCIM Bridge Qt input method module.
+
+%package qt4
+Summary:    SCIM Bridge Qt4 IM module
+Group:      System Environment/Libraries
+Requires:   %{name} = %{version}-%{release}
+Obsoletes:  scim-bridge-qtimm < 0.4.2
+
+%description qt4
+This package provides the SCIM Bridge Qt4 input method module.
+
+
 %endif
 
 
 %prep
 %setup -q %{?snapdate:-n %{name}-%{version}-%{snapdate}}
-%patch1 -p1 -b .1-fallback
+# %patch1 -p1 -b .1-fallback
 
 %if %{snapshot}
 mkdir m4
@@ -67,7 +79,8 @@
 %build
 %configure --disable-static --disable-documents \
 %if !%{build_qt}
-  --disable-qt3-immodule
+  --disable-qt3-immodule \
+  --disable-qt4-immodule
 %else
   %{nil}
 %endif
@@ -82,6 +95,7 @@
 rm $RPM_BUILD_ROOT/%{_libdir}/gtk-2.0/immodules/im-scim-bridge.*a
 %if %{build_qt}
 rm $RPM_BUILD_ROOT/%{_libdir}/qt-3.3/plugins/inputmethods/im-scim-bridge.*a
+rm $RPM_BUILD_ROOT/%{_libdir}/qt4/plugins/inputmethods/im-scim-bridge.*a
 %endif
 
 # remove unnecessary doc files
@@ -116,10 +130,18 @@
 %files qt
 %defattr(-,root,root,-)
 %{_libdir}/qt-3.3/plugins/inputmethods/*.so
+
+%files qt4
+%defattr(-,root,root,-)
+%{_libdir}/qt4/plugins/inputmethods/*.so
+
 %endif
 
 
 %changelog
+* Mon Jul  2 2007 Huang Peng <phuang at redhat.com> - 0.4.13-1
+- Update to 0.4.13
+
 * Wed Jun  6 2007 Huang Peng <phuang at redhat.com> - 0.4.12-3
 - Do not fall back for some key events to fix a bug (#209626)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/scim-bridge/devel/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sources	21 May 2007 04:03:30 -0000	1.28
+++ sources	2 Jul 2007 14:08:19 -0000	1.29
@@ -1 +1 @@
-b306777fb3e27de91f23eefa040f5c0f  scim-bridge-0.4.12.tar.gz
+32e2cff6a239e62c2de51075d4c512d9  scim-bridge-0.4.13.tar.gz