rpms/uim/devel uim.spec,1.45,1.46

[Akira Tagoh (tagoh)]

Author: tagoh

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

Modified Files:
	uim.spec 
Log Message:
* Thu Sep 20 2007 Akira TAGOH <tagoh at redhat.com> - 1.4.1-8
- Add Requires: im-chooser and drop xorg-x11-xinit dependency. (#297231)
- Correct License tag. (Todd Zullinger)


Index: uim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/uim/devel/uim.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- uim.spec	10 Sep 2007 07:18:14 -0000	1.45
+++ uim.spec	20 Sep 2007 02:47:27 -0000	1.46
@@ -3,12 +3,12 @@
 
 Name:		uim
 Version:	1.4.1
-Release:	7%{?dist}
+Release:	8%{?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+
-# pixmaps/*.{svg,png} is licensed under BSD or LGPL+
-License:	BSD and LGPLv2+ and (BSD or LGPL+)
+# pixmaps/*.{svg,png} is licensed under BSD or LGPLv2
+License:	BSD and LGPLv2+ and (BSD or LGPLv2)
 URL:		http://uim.freedesktop.org/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	libXft-devel libX11-devel libXext-devel libXrender-devel libXau-devel libXdmcp-devel libXt-devel
@@ -33,7 +33,7 @@
 Group:		System Environment/Libraries
 Requires(post): %{_sbindir}/alternatives /sbin/ldconfig
 Requires(postun): %{_sbindir}/alternatives /sbin/ldconfig
-Requires:	xorg-x11-xinit >= 1.0.2-5.fc6
+Requires:	im-chooser >= 0.4.1-2.fc8
 
 %package	devel
 Summary:	Development files for the Uim library
@@ -292,7 +292,7 @@
 %exclude %{_datadir}/uim/canna*.scm
 %exclude %{_datadir}/uim/skk*.scm
 %exclude %{_datadir}/uim/m17nlib.scm
-## pixmaps are licensed under BSD or LGPL+
+## pixmaps are licensed under BSD or LGPLv2
 %exclude %{_datadir}/uim/pixmaps/anthy.png
 %exclude %{_datadir}/uim/pixmaps/canna.png
 %exclude %{_datadir}/uim/pixmaps/m17n*png
@@ -357,7 +357,7 @@
 %defattr (-, root, root)
 %{_libdir}/uim/plugin/libuim-anthy.so
 %{_datadir}/uim/anthy*.scm
-# BSD or LGPL+
+# BSD or LGPLv2
 %{_datadir}/uim/pixmaps/anthy.png
 %dir %{_datadir}/uim
 
@@ -365,7 +365,7 @@
 %defattr (-, root, root)
 %{_libdir}/uim/plugin/libuim-canna.so
 %{_datadir}/uim/canna*.scm
-# BSD or LGPL+
+# BSD or LGPLv2
 %{_datadir}/uim/pixmaps/canna.png
 %dir %{_datadir}/uim
 
@@ -379,11 +379,15 @@
 %defattr (-, root, root)
 %{_libdir}/uim/plugin/libuim-m17nlib.so
 %{_datadir}/uim/m17nlib.scm
-# BSD or LGPL+
+# BSD or LGPLv2
 %{_datadir}/uim//pixmaps/m17n*png
 %dir %{_datadir}/uim
 
 %changelog
+* Thu Sep 20 2007 Akira TAGOH <tagoh at redhat.com> - 1.4.1-8
+- Add Requires: im-chooser and drop xorg-x11-xinit dependency. (#297231)
+- Correct License tag. (Todd Zullinger)
+
 * Mon Sep 10 2007 Akira TAGOH <tagoh at redhat.com> - 1.4.1-7
 - Update the xinput script to support the new im-chooser.
   - bring up uim-toolbar-gtk-systray as the auxiliary program