[uim] New upstream release. (#808727)

[Akira TAGOH]

commit 179ee52b67f17ab7283ca88aa8d3635238b77758
Author: Akira TAGOH <tagoh at redhat.com>
Date:   Mon Apr 2 16:00:01 2012 +0900

    New upstream release. (#808727)

 sources  |    2 +-
 uim.spec |   19 +++++++++----------
 2 files changed, 10 insertions(+), 11 deletions(-)
---
diff --git a/sources b/sources
index 2c99922..ce5f731 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a4c12c758ec053931af96672c1d866eb  uim-1.7.3.tar.bz2
+f46edbb71f3f384510ac3056866d2550  uim-1.8.0.tar.bz2
diff --git a/uim.spec b/uim.spec
index b3e45d1..d4db216 100644
--- a/uim.spec
+++ b/uim.spec
@@ -2,7 +2,7 @@
 %define uninst_xinput %{_sbindir}/update-alternatives --remove xinputrc %{_sysconfdir}/X11/xinit/xinput.d/uim.conf
 
 Name:		uim
-Version:	1.7.3
+Version:	1.8.0
 Release:	1%{?dist}
 # uim itself is licensed under BSD
 # scm/py.scm, helper/eggtrayicon.[ch], qt/pref-kseparator.{cpp,h}
@@ -24,7 +24,6 @@ BuildRequires:	emacs libtool automake autoconf intltool
 Source0:	http://uim.googlecode.com/files/%{name}-%{version}.tar.bz2
 Source1:	xinput.d-uim
 Source2:	uim-init.el
-Patch0:		uim-fix-implicit-dsolinking.patch
 Patch1:		uim-emacs-utf8.patch
 Patch2:		uim-enable-libgcroots.patch
 
@@ -235,7 +234,6 @@ many languages using the input table map from m17n-db.
 
 %prep
 %setup -q
-%patch0 -p1 -b .0-dso
 %patch1 -p1 -b .1-emacs
 %patch2 -p1 -b .2-libgcroots
 autoconf
@@ -261,9 +259,6 @@ export QTDIR=%{_libdir}/qt-3.3
 	--with-sqlite3 \
 	--with-lispdir=%{_datadir}/emacs/site-lisp \
 	--enable-pref
-#sed -i -e 's/GETTEXT_PACKAGE = .*/GETTEXT_PACKAGE = uim-chardict-qt/' qt/chardict/po/Makefile
-#sed -i -e 's/GETTEXT_PACKAGE = .*/GETTEXT_PACKAGE = uim-chardict-qt4/' qt4/chardict/po/Makefile
-
 #sed -i -e 's/^\(hardcode_direct=\)$/\1yes/' -e 's/^\(hardcode_minus_L=\)$/\1no/' -e 's/^\(libext=\)$/\1"a"/' -e 's/^hardcode_libdir_flag_spec.*$'/'hardcode_libdir_flag_spec=" -D__LIBTOOL_IS_A_FOOL__ "/' libtool
 sed -i -e 's/^\(hardcode_direct=\)$/\1no/' -e 's/^\(hardcode_minus_L=\)$/\1no/' -e 's/^\(libext=\)$/\1"a"/' libtool
 LD_LIBRARY_PATH=$RPM_BUILD_DIR/%{name}-%{version}/uim/.libs make
@@ -313,8 +308,6 @@ ln -sf %{_localstatedir}/lib/uim/loader.scm $RPM_BUILD_ROOT%{_datadir}/uim/
 # https://fedoraproject.org/wiki/packagingDrafts/UsingAlternatives
 touch $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinputrc
 %find_lang %{name}
-%find_lang %{name}-chardict-qt
-%find_lang %{name}-chardict-qt4
 
 find $RPM_BUILD_ROOT -name "*.scm" -type f | egrep -v ".*/(anthy|canna|m17n|mana|prime|scim|sj3|skk|wnn|installed-modules|loader)" > scm.list
 cat scm.list | sed -e s,$RPM_BUILD_ROOT,,g >> %{name}.lang
@@ -477,6 +470,7 @@ fi
 %{_bindir}/uim-input-pad-ja
 %{_libdir}/gtk-2.0/2.*/immodules/*.so
 %{_libexecdir}/uim-candwin-gtk
+%{_libexecdir}/uim-candwin-horizontal-gtk
 %{_libexecdir}/uim-candwin-tbl-gtk
 
 %files	gtk3
@@ -489,6 +483,7 @@ fi
 %{_bindir}/uim-toolbar-gtk3-systray
 %{_libdir}/gtk-3.0/3.*/immodules/*.so
 %{_libexecdir}/uim-candwin-gtk3
+%{_libexecdir}/uim-candwin-horizontal-gtk3
 %{_libexecdir}/uim-candwin-tbl-gtk3
 
 %files	gnome
@@ -498,7 +493,7 @@ fi
 %{_datadir}/dbus-1/services/org.gnome.panel.applet.UimAppletFactory.service
 %{_datadir}/gnome-panel/4.0/applets/UimApplet.panel-applet
 
-%files qt -f %{name}-chardict-qt4.lang
+%files qt
 %defattr (-, root, root, -)
 %doc AUTHORS COPYING ChangeLog* NEWS
 %{_bindir}/uim-chardict-qt4
@@ -508,7 +503,7 @@ fi
 %{_libexecdir}/uim-candwin-qt4
 %{_libdir}/qt4/plugins/inputmethods/libuiminputcontextplugin.so
 
-%files qt3 -f %{name}-chardict-qt.lang
+%files qt3
 %defattr (-, root, root, -)
 %doc AUTHORS COPYING ChangeLog* NEWS README
 # BSD and LGPLv2+
@@ -587,11 +582,15 @@ fi
 %{_bindir}/uim-m17nlib-relink-icons
 %{_libdir}/uim/plugin/libuim-m17nlib.so
 %{_datadir}/uim/m17nlib.scm
+%{_datadir}/uim/m17nlib-custom.scm
 # BSD or LGPLv2
 %{_datadir}/uim/pixmaps/m17n*png
 %dir %{_datadir}/uim
 
 %changelog
+* Mon Apr  2 2012 Akira TAGOH <tagoh at redhat.com> - 1.8.0-1
+- New upstream release. (#808727)
+
 * Fri Feb 17 2012 Akira TAGOH <tagoh at redhat.com> - 1.7.3-1
 - New upstream release. (#790407)