rpms/scim-bridge/FC-5 .cvsignore, 1.2, 1.3 scim-bridge.spec, 1.3, 1.4 sources, 1.2, 1.3

[Jens Petersen (petersen)]

Author: petersen

Update of /cvs/extras/rpms/scim-bridge/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8305

Modified Files:
	.cvsignore scim-bridge.spec sources 
Log Message:
- sync to 0.4.5
- make im module subpackages require scim-bridge = ver-rel instead of
  %{_bindir}/scim-bridge (#207872)
- move gtkimm xinput.d script to gtk subpackage
- add qtimm xinput.d script to qt subpackage
- buildrequire qt-devel
- include html docs
- update url
- define _xinputdir
- use _host not _target_platform for update-gtk-immodules in scripts (#195343)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/scim-bridge/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	30 May 2006 06:45:21 -0000	1.2
+++ .cvsignore	26 Sep 2006 13:44:11 -0000	1.3
@@ -1 +1 @@
-scim-bridge-0.1.12.tar.gz
+scim-bridge-0.4.5.tar.gz


Index: scim-bridge.spec
===================================================================
RCS file: /cvs/extras/rpms/scim-bridge/FC-5/scim-bridge.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- scim-bridge.spec	4 Aug 2006 06:09:33 -0000	1.3
+++ scim-bridge.spec	26 Sep 2006 13:44:11 -0000	1.4
@@ -1,39 +1,63 @@
 %define with_libstdc_preview 1
 
 Name:		scim-bridge
-Version:	0.1.12
-Release:	1%{?dist}.1
+Version:	0.4.5
+Release:	1%{?dist}
 Summary:	SCIM Bridge Gtk IM module
 
 Group:		System Environment/Libraries
 License:	LGPL
-URL:		http://shibatama.tea-nifty.com/blog/2006/02/scimbridge_has__e4eb.html 
+URL:		http://www.scim-im.org/projects/scim_bridge
 Source0:	http://dl.sourceforge.net/sourceforge/scim/%{name}-%{version}.tar.gz
-Source1:	xinput-scim-bridge
+Source1:	xinput-scim-bridge-gtk
+Source2:	xinput-scim-bridge-qt
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	scim-devel
+BuildRequires:	scim-devel, qt-devel
 %if %{with_libstdc_preview}
 Buildrequires: libstdc++so7-devel
 %endif
-Requires:	scim, scim-bridge-gtkimm = %{version}-%{release}
+Requires:	scim
 
 %description
 SCIM Bridge is a C implementation of a Gtk IM module for SCIM.
 
-%package gtkimm
+
+%package gtk
 Summary:    SCIM Bridge Gtk IM module
 Group:      System Environment/Libraries
 # for update-gtk-immodules
-PreReq:     gtk2 > 2.8
+PreReq:     gtk2 >= 2.8.19-1
 %if %{with_libstdc_preview}
 PreReq:     libstdc++so7
 %endif
+# need %{_bindir}/scim-bridge
+Requires:   %{name}-%{version}-%{release}
+Obsoletes:  scim-bridge-gtkimm < 0.4.2
 
-%description gtkimm
+%description gtk
 This package provides the SCIM Bridge GTK input method module.
 
 
+%if %{build_qt}
+%package qt
+Summary:    SCIM Bridge Qt IM module
+Group:      System Environment/Libraries
+%if %{with_libstdc_preview}
+PreReq:     libstdc++so7
+%endif
+# need %{_bindir}/scim-bridge
+Requires:   %{name}-%{version}-%{release}
+Obsoletes:  scim-bridge-qtimm < 0.4.2
+
+%description qt
+This package provides the SCIM Bridge Qt input method module.
+%endif
+
+
+%define _xinputdir %{_sysconfdir}/X11/xinit/xinput.d
+
+
 %prep
 %setup -q
 
@@ -57,38 +81,60 @@
 %endif
 make install DESTDIR=$RPM_BUILD_ROOT
 
-mkdir -pm 755 ${RPM_BUILD_ROOT}/%{_sysconfdir}/X11/xinit/xinput.d
-install -pm 644 %{SOURCE1} ${RPM_BUILD_ROOT}/%{_sysconfdir}/X11/xinit/xinput.d/scim-bridge
-
+mkdir -pm 755 ${RPM_BUILD_ROOT}/%{_xinputdir}
+install -pm 644 %{SOURCE1} ${RPM_BUILD_ROOT}/%{_xinputdir}/scim-bridge-gtk
 rm $RPM_BUILD_ROOT/%{_libdir}/gtk-2.0/immodules/im-scim-bridge.*a
 
+install -pm 644 %{SOURCE2} ${RPM_BUILD_ROOT}/%{_xinputdir}/scim-bridge-qt
+rm $RPM_BUILD_ROOT/%{_libdir}/qt-3.3/plugins/inputmethods/im-scim-bridge.*a
+
+rm doc/{Makefile.*,doxygen.conf}
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
-%post gtkimm
-%{_bindir}/update-gtk-immodules %{_target_platform}
+%post gtk
+%{_bindir}/update-gtk-immodules %{_host}
 
 
-%postun gtkimm
-%{_bindir}/update-gtk-immodules %{_target_platform}
+%postun gtk
+%{_bindir}/update-gtk-immodules %{_host}
 
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING README
-%{_bindir}/scim-bridge-agent
-%{_sysconfdir}/X11/xinit/xinput.d/scim-bridge
+%doc AUTHORS COPYING README doc
+%{_bindir}/scim-bridge
 
 
-%files gtkimm
+%files gtk
 %defattr(-,root,root,-)
 %dir %{_libdir}/gtk-2.0/immodules
 %{_libdir}/gtk-2.0/immodules/im-scim-bridge.so
+%{_xinputdir}/scim-bridge-gtk
+
+
+%files qt
+%defattr(-,root,root,-)
+%{_libdir}/qt-3.3/plugins/inputmethods/*.so
+%{_xinputdir}/scim-bridge-qt
 
 
 %changelog
+* Tue Sep 26 2006 Jens Petersen <petersen at redhat.com> - 0.4.5-1
+- sync to 0.4.5
+- make im module subpackages require scim-bridge = ver-rel instead of
+  %{_bindir}/scim-bridge (#207872)
+- move gtkimm xinput.d script to gtk subpackage
+- add qtimm xinput.d script to qt subpackage
+- buildrequire qt-devel
+- include html docs
+- update url
+- define _xinputdir
+- use _host not _target_platform for update-gtk-immodules in scripts (#195343)
+
 * Fri Aug  4 2006 Jens Petersen <petersen at redhat.com> - 0.1.12-1.fc5.1
 - rebuild against new libstdc++so7 (#197718)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/scim-bridge/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	30 May 2006 06:45:21 -0000	1.2
+++ sources	26 Sep 2006 13:44:11 -0000	1.3
@@ -1 +1 @@
-3439bdf3695fcfe53e6cce234dc985bf  scim-bridge-0.1.12.tar.gz
+c2b4524e659f1a7237cb3ce29e223f97  scim-bridge-0.4.5.tar.gz