rpms/uim/devel uim.spec,1.55,1.56

[Akira Tagoh (tagoh)]

Author: tagoh

Update of /cvs/pkgs/rpms/uim/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8708

Modified Files:
	uim.spec 
Log Message:
* Wed Apr  2 2008 Akira TAGOH <tagoh at redhat.com> - 1.4.2-2
- Move Qt3 immodule plugin to uim-qt3.
- Move the helper applications for Qt to uim-qt-common.
- Rebuild against qt3-devel. (#440870)


Index: uim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/uim/devel/uim.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- uim.spec	25 Mar 2008 13:10:41 -0000	1.55
+++ uim.spec	7 Apr 2008 11:42:00 -0000	1.56
@@ -3,7 +3,7 @@
 
 Name:		uim
 Version:	1.4.2
-Release:	1%{?dist}
+Release:	2%{?dist}
 # uim itself is licensed under BSD
 # scm/py.scm, helper/eggtrayicon.[ch], qt/pref-kseparator.{cpp,h}
 #   and qt/chardict/chardict-kseparator.{cpp,h} is licensed under LGPLv2+
@@ -56,10 +56,17 @@
 Requires(postun): %{_sbindir}/bonobo-activation-sysconf
 Requires:	uim-gtk2
 
-%package	qt
+%package	qt3
+Summary:	Qt3 support for Uim
+Group:		User Interface/Desktops
+Requires:	uim-qt-common = %{version}-%{release}
+Obsoletes:	uim-qt < 1.4.2-2
+
+%package	qt-common
 Summary:	Qt support for Uim
 Group:		User Interface/Desktops
 Requires:	uim = %{version}-%{release}
+Obsoletes:	uim-qt < 1.4.2-2
 
 %package	el
 Summary:	Emacs support for Uim
@@ -139,12 +146,19 @@
 
 This package provides the GNOME panel applet.
 
-%description	qt
+%description	qt3
 Uim is a multilingual input method library. Uim aims to
 provide secure and useful input methods for all
 languages.
 
-This package provides the Qt IM module and helper programs.
+This package provides the Qt3 IM module and helper programs.
+
+%description	qt-common
+Uim is a multilingual input method library. Uim aims to
+provide secure and useful input methods for all
+languages.
+
+This package contains the helper applications for Qt support.
 
 %description	el
 This package provides Emacs support.
@@ -278,7 +292,7 @@
 fi
 
 %files -f %{name}.lang
-%defattr (-, root, root)
+%defattr (-, root, root, -)
 %doc AUTHORS COPYING ChangeLog* NEWS README
 %dir %{_libdir}/uim
 %dir %{_libdir}/uim/plugin
@@ -304,13 +318,13 @@
 %dir %{_localstatedir}/lib/uim
 
 %files	devel
-%defattr (-, root, root)
+%defattr (-, root, root, -)
 %{_includedir}/uim/
 %{_libdir}/lib*.so
 %{_libdir}/pkgconfig/*
 
 %files	gtk2
-%defattr (-, root, root)
+%defattr (-, root, root, -)
 # BSD
 %{_bindir}/uim-toolbar-gtk
 # BSD and LGPLv2+
@@ -323,12 +337,16 @@
 %{_libexecdir}/uim-candwin-gtk
 
 %files	gnome
-%defattr (-, root, root)
+%defattr (-, root, root, -)
 %{_libexecdir}/uim-toolbar-applet
 %{_libdir}/bonobo/servers/GNOME_UimApplet.server
 
-%files	-f uim-chardict-qt.lang qt
-%defattr (-, root, root)
+%files qt3
+%defattr (-, root, root, -)
+%{_libdir}/qt-3.*/plugins/inputmethods
+
+%files	-f uim-chardict-qt.lang qt-common
+%defattr (-, root, root, -)
 # BSD and LGPLv2+
 %{_bindir}/uim-chardict-qt
 # BSD
@@ -337,23 +355,22 @@
 %{_bindir}/uim-pref-qt
 # BSD
 %{_bindir}/uim-toolbar-qt
-%{_libdir}/qt-3.*/plugins/inputmethods
 %{_libexecdir}/uim-candwin-qt
 
 %files	el
-%defattr (-, root, root)
+%defattr (-, root, root, -)
 %doc emacs/COPYING emacs/README
 %lang(ja) %doc emacs/README.ja
 %{_datadir}/emacs/site-lisp/uim-el
 %{_datadir}/emacs/site-lisp/site-start.d/uim-init.el
 
 %files el-common
-%defattr (-, root, root)
+%defattr (-, root, root, -)
 %{_bindir}/uim-el-agent
 %{_bindir}/uim-el-helper-agent
 
 %files	anthy
-%defattr (-, root, root)
+%defattr (-, root, root, -)
 %{_libdir}/uim/plugin/libuim-anthy.so
 %{_datadir}/uim/anthy*.scm
 # BSD or LGPLv2
@@ -361,7 +378,7 @@
 %dir %{_datadir}/uim
 
 %files	canna
-%defattr (-, root, root)
+%defattr (-, root, root, -)
 %{_libdir}/uim/plugin/libuim-canna.so
 %{_datadir}/uim/canna*.scm
 # BSD or LGPLv2
@@ -369,13 +386,13 @@
 %dir %{_datadir}/uim
 
 %files	skk
-%defattr (-, root, root)
+%defattr (-, root, root, -)
 %{_libdir}/uim/plugin/libuim-skk.so
 %{_datadir}/uim/skk*.scm
 %dir %{_datadir}/uim
 
 %files m17n
-%defattr (-, root, root)
+%defattr (-, root, root, -)
 %{_libdir}/uim/plugin/libuim-m17nlib.so
 %{_datadir}/uim/m17nlib.scm
 # BSD or LGPLv2
@@ -383,6 +400,11 @@
 %dir %{_datadir}/uim
 
 %changelog
+* Wed Apr  2 2008 Akira TAGOH <tagoh at redhat.com> - 1.4.2-2
+- Move Qt3 immodule plugin to uim-qt3.
+- Move the helper applications for Qt to uim-qt-common.
+- Rebuild against qt3-devel. (#440870)
+
 * Wed Mar  5 2008 Akira TAGOH <tagoh at redhat.com> - 1.4.2-1
 - New upstream release.
 - Remove patches because of no longer needed.