rpms/uim/F-7 uim.spec,1.39,1.40
Akira Tagoh (tagoh)
fedora-extras-commits at redhat.com
Wed Mar 12 09:02:51 UTC 2008
- Previous message (by thread): rpms/ppp/devel ppp-2.4.4-closelog.patch, NONE, 1.1 ppp-2.4.4-response_len.patch, NONE, 1.1 ppp.spec, 1.43, 1.44
- Next message (by thread): rpms/uim/F-7 .cvsignore,1.19,1.20 sources,1.18,1.19
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: tagoh
Update of /cvs/pkgs/rpms/uim/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1500
Modified Files:
uim.spec
Log Message:
* Wed Mar 12 2008 Akira TAGOH <tagoh at redhat.com> - 1.4.2-1
- New upstream release.
- Fix a memory corruption, causing a crash on Firefox 3 say.
- Add Requires: uim-gtk2 in uim-gnome.
- Update License tag.
Index: uim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/uim/F-7/uim.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- uim.spec 7 Jun 2007 06:10:26 -0000 1.39
+++ uim.spec 12 Mar 2008 09:02:20 -0000 1.40
@@ -2,10 +2,14 @@
%define uninst_xinput alternatives --remove xinputrc %{_sysconfdir}/X11/xinit/xinput.d/uim.conf
Name: uim
-Version: 1.4.1
-Release: 4%{?dist}
-License: GPL/BSD
-URL: http://uim.freedesktop.org/
+Version: 1.4.2
+Release: 1%{?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 LGPLv2
+License: BSD and LGPLv2+ and (BSD or LGPLv2)
+URL: http://code.google.com/p/uim/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libXft-devel libX11-devel libXext-devel libXrender-devel libXau-devel libXdmcp-devel libXt-devel
BuildRequires: gtk2-devel gnome-panel-devel qt-devel ncurses-devel
@@ -19,7 +23,7 @@
BuildRequires: m17n-db-sinhala m17n-db-slovak m17n-db-swedish m17n-db-syriac m17n-db-tamil
BuildRequires: m17n-db-telugu m17n-db-thai m17n-db-tibetan m17n-db-vietnamese m17n-db-urdu
BuildRequires: emacs
-Source0: http://uim.freedesktop.org/release/%{name}-%{version}.tar.bz2
+Source0: http://uim.googlecode.com/files/%{name}-%{version}.tar.bz2
Source1: xinput.d-uim
Source2: uim-init.el
@@ -50,6 +54,7 @@
Requires: uim = %{version}-%{release}
Requires(post): %{_sbindir}/bonobo-activation-sysconf
Requires(postun): %{_sbindir}/bonobo-activation-sysconf
+Requires: uim-gtk2
%package qt
Summary: Qt support for Uim
@@ -191,9 +196,9 @@
rm -rf $RPM_BUILD_ROOT%{_datadir}/uim/{installed-modules,loader}.scm
install -d $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinput.d
-install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinput.d/uim.conf
+install -m 0644 -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinput.d/uim.conf
install -d $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/site-start.d
-install -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/site-start.d/
+install -m 0644 -p %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/site-start.d/
install -d $RPM_BUILD_ROOT%{_localstatedir}/lib/uim
touch $RPM_BUILD_ROOT%{_localstatedir}/lib/uim/{installed-modules,loader}.scm
@@ -286,6 +291,7 @@
%exclude %{_datadir}/uim/canna*.scm
%exclude %{_datadir}/uim/skk*.scm
%exclude %{_datadir}/uim/m17nlib.scm
+## 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
@@ -305,8 +311,11 @@
%files gtk2
%defattr (-, root, root)
+# BSD
%{_bindir}/uim-toolbar-gtk
+# BSD and LGPLv2+
%{_bindir}/uim-toolbar-gtk-systray
+# BSD
%{_bindir}/uim-pref-gtk
%{_bindir}/uim-im-switcher-gtk
%{_bindir}/uim-input-pad-ja
@@ -320,9 +329,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 +356,7 @@
%defattr (-, root, root)
%{_libdir}/uim/plugin/libuim-anthy.so
%{_datadir}/uim/anthy*.scm
+# BSD or LGPLv2
%{_datadir}/uim/pixmaps/anthy.png
%dir %{_datadir}/uim
@@ -350,6 +364,7 @@
%defattr (-, root, root)
%{_libdir}/uim/plugin/libuim-canna.so
%{_datadir}/uim/canna*.scm
+# BSD or LGPLv2
%{_datadir}/uim/pixmaps/canna.png
%dir %{_datadir}/uim
@@ -363,10 +378,17 @@
%defattr (-, root, root)
%{_libdir}/uim/plugin/libuim-m17nlib.so
%{_datadir}/uim/m17nlib.scm
-%{_datadir}/uim//pixmaps/m17n*png
+# BSD or LGPLv2
+%{_datadir}/uim/pixmaps/m17n*png
%dir %{_datadir}/uim
%changelog
+* Wed Mar 12 2008 Akira TAGOH <tagoh at redhat.com> - 1.4.2-1
+- New upstream release.
+ - Fix a memory corruption, causing a crash on Firefox 3 say.
+- Add Requires: uim-gtk2 in uim-gnome.
+- Update License tag.
+
* Tue May 29 2007 Akira TAGOH <tagoh at redhat.com> - 1.4.1-4
- Remove uim.desktop file. (#240706)
- Previous message (by thread): rpms/ppp/devel ppp-2.4.4-closelog.patch, NONE, 1.1 ppp-2.4.4-response_len.patch, NONE, 1.1 ppp.spec, 1.43, 1.44
- Next message (by thread): rpms/uim/F-7 .cvsignore,1.19,1.20 sources,1.18,1.19
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list