rpms/uim/devel uim.spec,1.40,1.41

[Akira Tagoh (tagoh)]

Author: tagoh

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

Modified Files:
	uim.spec 
Log Message:
* Fri Aug 10 2007 Akira TAGOH <tagoh at redhat.com> - 1.4.1-5
- Update License tag.


Index: uim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/uim/devel/uim.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- uim.spec	29 May 2007 14:04:13 -0000	1.40
+++ uim.spec	10 Aug 2007 06:48:14 -0000	1.41
@@ -3,8 +3,12 @@
 
 Name:		uim
 Version:	1.4.1
-Release:	4%{?dist}
-License:	GPL/BSD
+Release:	5%{?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+)
 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
@@ -286,6 +290,7 @@
 %exclude %{_datadir}/uim/canna*.scm
 %exclude %{_datadir}/uim/skk*.scm
 %exclude %{_datadir}/uim/m17nlib.scm
+## pixmaps are licensed under BSD or LGPL+
 %exclude %{_datadir}/uim/pixmaps/anthy.png
 %exclude %{_datadir}/uim/pixmaps/canna.png
 %exclude %{_datadir}/uim/pixmaps/m17n*png
@@ -305,8 +310,11 @@
 
 %files	gtk2
 %defattr (-, root, root)
+# BSD
 %{_bindir}/uim-toolbar-gtk
+# BSD + LGPLv2+
 %{_bindir}/uim-toolbar-gtk-systray
+# BSD
 %{_bindir}/uim-pref-gtk
 %{_bindir}/uim-im-switcher-gtk
 %{_bindir}/uim-input-pad-ja
@@ -320,9 +328,13 @@
 
 %files	-f uim-chardict-qt.lang qt
 %defattr (-, root, root)
+# BSD and LGPLv2+
 %{_bindir}/uim-chardict-qt
+# BSD
 %{_bindir}/uim-im-switcher-qt
+# BSD and LGPLv2+
 %{_bindir}/uim-pref-qt
+# BSD
 %{_bindir}/uim-toolbar-qt
 %{_libdir}/qt-3.*/plugins/inputmethods
 %{_libexecdir}/uim-candwin-qt
@@ -343,6 +355,7 @@
 %defattr (-, root, root)
 %{_libdir}/uim/plugin/libuim-anthy.so
 %{_datadir}/uim/anthy*.scm
+# BSD and LGPL+
 %{_datadir}/uim/pixmaps/anthy.png
 %dir %{_datadir}/uim
 
@@ -350,6 +363,7 @@
 %defattr (-, root, root)
 %{_libdir}/uim/plugin/libuim-canna.so
 %{_datadir}/uim/canna*.scm
+# BSD and LGPL+
 %{_datadir}/uim/pixmaps/canna.png
 %dir %{_datadir}/uim
 
@@ -363,10 +377,14 @@
 %defattr (-, root, root)
 %{_libdir}/uim/plugin/libuim-m17nlib.so
 %{_datadir}/uim/m17nlib.scm
+# BSD and LGPL+
 %{_datadir}/uim//pixmaps/m17n*png
 %dir %{_datadir}/uim
 
 %changelog
+* Fri Aug 10 2007 Akira TAGOH <tagoh at redhat.com> - 1.4.1-5
+- Update License tag.
+
 * Tue May 29 2007 Akira TAGOH <tagoh at redhat.com> - 1.4.1-4
 - Remove uim.desktop file. (#240706)