Hello community,
here is the log from the commit of package uim for openSUSE:Factory checked in at 2012-07-02 12:54:43
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/uim (Old)
and /work/SRC/openSUSE:Factory/.uim.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "uim", Maintainer is "LZWang@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/uim/uim.changes 2012-03-08 19:46:10.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.uim.new/uim.changes 2012-07-02 12:54:55.000000000 +0200
@@ -1,0 +2,17 @@
+Mon Jul 2 04:07:57 UTC 2012 - i@marguerite.su
+
+- update version 1.8.1
+ * New IM uim-google-cgiapi-jp
+ * New IM uim-baidu-olime-jp
+ * Delay showing candidate window
+ * Horizontal candidate window
+ * Japanese Romaji-Kana composing rule in uim-pref
+ * Many new features in uim-tutcode
+
+-------------------------------------------------------------------
+Tue Jun 5 16:17:18 UTC 2012 - i@marguerite.su
+
+- fix sles builds.
+ * %make_install to %makeinstall
+
+-------------------------------------------------------------------
Old:
----
uim-1.7.3.tar.bz2
New:
----
fix-for-sles-qhash-incomplete-type.patch
uim-1.8.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ uim.spec ++++++
--- /var/tmp/diff_new_pack.92pTad/_old 2012-07-02 12:54:59.000000000 +0200
+++ /var/tmp/diff_new_pack.92pTad/_new 2012-07-02 12:54:59.000000000 +0200
@@ -16,16 +16,33 @@
#
-%define build_gtk3 (%{suse_version} >= 1140)
-%define is_gnome3 (%{suse_version} > 1140)
+%define build_gtk3 (0%{?suse_version} >= 1140)
+%define is_gnome3 (0%{?suse_version} > 1140)
Name: uim
+Version: 1.8.1
+Release: 0
+Summary: A multilingual input method library
+License: GPL-2.0+
+Group: System/I18n/Japanese
+Url: http://uim.freedesktop.org/wiki/
+Source0: http://uim.googlecode.com/files/uim-%{version}.tar.bz2
+Source1: suse-start-uim.el
+Source2: xemacs-auto-autoloads.el
+Source3: etc-x11-xim.d-uim
+Source4: baselibs.conf
+Patch10: uim-sigscheme-build-fixes.diff
+Patch12: uim-fix-crash-in-firefox.diff
+Patch13: fix-for-sles-qhash-incomplete-type.patch
BuildRequires: anthy-devel
BuildRequires: canna-devel
BuildRequires: emacs-x11
-BuildRequires: emacs-x11
+BuildRequires: fdupes
BuildRequires: gcc-c++
+BuildRequires: gnome-panel-devel
+BuildRequires: gtk2-devel
BuildRequires: intltool
+BuildRequires: kdebase3-devel
BuildRequires: libedit-devel
BuildRequires: libexpat-devel
BuildRequires: libqt4-devel
@@ -34,37 +51,15 @@
BuildRequires: ncurses-devel
BuildRequires: perl-XML-Parser
BuildRequires: pkg-config
-%if %suse_version > 1130
-BuildRequires: pkgconfig(gtk+-2.0)
-%else
-BuildRequires: gtk2-devel
-%endif
-%if %build_gtk3
-BuildRequires: pkgconfig(gtk+-3.0)
-%endif
-BuildRequires: fdupes
-BuildRequires: gnome-panel-devel
-BuildRequires: kdebase3-devel
BuildRequires: qt3-devel
BuildRequires: update-desktop-files
BuildRequires: xemacs
-Version: 1.7.3
-Release: 0
-# xorg-x11-libXdmcp-devel libgnomeprintui-devel
-Summary: A multilingual input method library
-License: GPL-2.0+
-Group: System/I18n/Japanese
-Url: http://uim.freedesktop.org/wiki/
-Source0: http://uim.googlecode.com/files/uim-%{version}.tar.bz2
-Source1: suse-start-uim.el
-Source2: xemacs-auto-autoloads.el
-Source3: etc-x11-xim.d-uim
-Source4: baselibs.conf
-Patch10: uim-sigscheme-build-fixes.diff
-Patch12: uim-fix-crash-in-firefox.diff
-PreReq: %{_bindir}/touch
+%if %build_gtk3
+BuildRequires: pkgconfig(gtk+-3.0)
+%endif
Provides: locale(xorg-x11:ja)
BuildRoot: %{_tmppath}/%{name}-%{version}-build
+Requires(pre): %{_bindir}/touch
%description
Uim is a multilingual input method library. Uim's project goal is to
@@ -81,7 +76,7 @@
Include Files and Libraries mandatory for Development.
%package gtk2
-Summary: GTK+2.0 IM module for uim
+Summary: GTK2 IM Module for UIM
Group: System/I18n/Japanese
Requires: %{name} = %{version}
Provides: locale(gtk2:ja)
@@ -93,7 +88,7 @@
%if %{build_gtk3}
%package gtk3
-Summary: GTK+3.0 IM module for uim
+Summary: GTK3 IM Module for UIM
Group: System/I18n/Japanese
Requires: %{name} = %{version}
Provides: locale(gtk3:ja)
@@ -107,8 +102,8 @@
Summary: GNOME applet for uim
Group: System/I18n/Japanese
Requires: %{name} = %{version}
-Obsoletes: uim-applet
-Provides: uim-applet
+Obsoletes: uim-applet < %{version}
+Provides: uim-applet = %{version}
Provides: locale(gnome-libs:ja)
%description applet-gnome
@@ -138,7 +133,7 @@
%package kde3
Summary: KDE3 Applet for Uim
Group: User Interface/Desktops
-Requires: uim = %{version}-%{release}
+Requires: uim = %{version}
Requires: uim-qt3
%description kde3
@@ -150,13 +145,14 @@
%setup0 -q
%patch10 -p1
%patch12 -p1
+%patch13 -p1
cp emacs/README README.emacs
iconv -f euc-jp -t utf-8 < emacs/README.ja > README.ja.emacs
%build
autoreconf -f -i
intltoolize --force
-cp po/Makefile.in.in qt/chardict/po
+cp po/Makefile.in.in qt3/chardict/po
cp po/Makefile.in.in qt4/chardict/po
%configure --disable-static --with-pic \
--libexecdir=%{_prefix}/lib/uim \
@@ -171,7 +167,7 @@
make %{?_smp_mflags}
%install
-%make_install
+%makeinstall
rm -f %{buildroot}%{_includedir}/gcroots.h
rm -f %{buildroot}%{_libdir}/pkgconfig/gcroots.pc
# this file is generated by "uim-module-manager".
@@ -226,9 +222,6 @@
find %{buildroot} -type f -name "*.la" -delete -print
rm -f doc/Makefile*
-%clean
-rm -rf %{buildroot}
-
%post
/sbin/ldconfig
# register uim modules to uim. This will change the files:
@@ -257,7 +250,7 @@
%files -f uim.lang
%defattr(-, root, root)
-%doc AUTHORS COPYING ChangeLog INSTALL* NEWS* README*
+%doc AUTHORS COPYING ChangeLog NEWS* README*
%doc doc
%dir %{_sysconfdir}/X11/xim.d/
%{_sysconfdir}/X11/xim.d/*
@@ -338,7 +331,7 @@
%files kde3
%defattr (-, root, root, -)
%doc AUTHORS COPYING ChangeLog* NEWS README
-/opt/kde3/%_lib/kde3/uim_panelapplet.so
+/opt/kde3/%{_lib}/kde3/uim_panelapplet.so
/opt/kde3/share/apps/kicker/applets/uimapplet.desktop
%changelog
++++++ fix-for-sles-qhash-incomplete-type.patch ++++++
diff -urN uim-1.8.1.orig/qt4/immodule/quiminputcontext.h uim-1.8.1/qt4/immodule/quiminputcontext.h
--- uim-1.8.1.orig/qt4/immodule/quiminputcontext.h 2012-07-02 12:16:36.306241316 +0800
+++ uim-1.8.1/qt4/immodule/quiminputcontext.h 2012-07-02 14:59:57.244712724 +0800
@@ -36,6 +36,7 @@
#define UIM_QT4_IMMODULE_QUIMINPUTCONTEXT_H
#include