rpm/uim
SHA256
1
0
Fork 0
forked from pool/uim
Code Pull Requests Activity

Accepting request 77977 from M17N

Browse Source 
- updated to uim-1.7.1:
  Major updates, see release notes of 1.6.0, 1.6.1, 1.7.0 and
  1.7.1:
    http://uim.googlecode.com/svn/tags/uim-1.6.0/RELNOTE
    http://uim.googlecode.com/svn/tags/uim-1.6.1/RELNOTE
    http://uim.googlecode.com/svn/tags/uim-1.7.0/RELNOTE
    http://uim.googlecode.com/svn/tags/uim-1.7.1/RELNOTE
- Enabled Gtk3 IM build
- Re-enabled applet build for FACTORY, created uim-applet-gnome
  sub-package
- Enable libedit properly
- Enable m17n-lib
- Clean up spec file

OBS-URL: https://build.opensuse.org/request/show/77977
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/uim?expand=0&rev=26
This commit is contained in:
Sascha Peilicke 2011-08-07 16:59:04 +00:00 committed by Git OBS Bridge
commit ff4e049612
8 changed files with 154 additions and 125 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
baselibs.conf
View File

@ -1,5 +1,9 @@
uim
uim-gtk2
supplements "packageand(uim-gtk2:gtk2-<targettype>)"
uim-gtk3
supplements "packageand(uim-gtk3:gtk3-<targettype>)"
uim-qt
supplements "packageand(uim-qt:qt3-<targettype>)"
uim-qt4
supplements "packageand(uim-qt4:libqt4-<targettype>)"

45
etc-x11-xim.d-uim
View File

@ -5,10 +5,6 @@ if ! type -p uim-xim > /dev/null 2>&1 ; then
echo "uim-xim is not available."
return 1
fi
if ! rpm -q uim-qt > /dev/null 2>&1 ; then
echo "uim-qt package is not installed."
return 1
fi
export XMODIFIERS="@im=uim"
export GTK_IM_MODULE=uim
@ -17,6 +13,47 @@ export QT_IM_MODULE=uim
uim-xim &
case "$WINDOWMANAGER" in
*gnome*)
# if applet is available, no need to start additional programs here
if rpm -q uim-applet-gnome > /dev/null 2>&1 ; then
PATH=$OLD_PATH
# success:
return 0
fi;;
esac
# start system-tray or stand-alone tool
look_for_uim_toolbar () {
local p
for p in $*; do
if type -p "$p" > /dev/null 2>&1; then
toolbar="$p"
return 0
fi
done
}
toolbar=""
look_for_uim_toolbar uim-toolbar-gtk3-systray uim-toolbar-gtk-systray
if [ -z "$toolbar" ]; then
# no systray found, let's start a stand-alone toolbar
case "$WINDOWMANAGER" in
*kde*)
look_for_uim_toolbar \
uim-toolbar-qt4 uim-toolbar-qt \
uim-toolbar-gtk3 uim-toolbar-gtk;;
*)
look_for_uim_toolbar \
uim-toolbar-gtk3 uim-toolbar-gtk \
uim-toolbar-qt4 uim-toolbar-qt;;
esac
fi
test -n "$toolbar" && $toolbar &
unset toolbar
PATH=$OLD_PATH
# success:

15
qt-build.patch
View File

@ -1,15 +0,0 @@
diff -ru uim-1.2.1.orig/configure.ac uim-1.2.1/configure.ac
--- uim-1.2.1.orig/configure.ac 2006-08-14 06:27:37.000000000 +0200
+++ uim-1.2.1/configure.ac 2006-09-14 12:46:00.000000000 +0200
@@ -709,7 +709,10 @@
fi
# GUESS $QTLIBDIR
- QTLIBDIR="$QTDIR/lib"
+ QTLIBDIR="$QTDIR/lib64"
+ if test ! -d "$QTLIBDIR"; then
+ QTLIBDIR="$QTDIR/lib"
+ fi
if test ! -d "$QTLIBDIR"; then
QTLIBDIR="/usr/lib/qt3"
fi

3
uim-1.5.6.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ce6b7218c3b79e5d100d52fa745e51abc83a1fe7668b3b759584b9ec7a00c28f
size 3343584

3
uim-1.7.1.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:81964ed6786eaa8306b0a638193db8171b78b386b9443d2e6a78e7f2cdf9a773
size 6354866

45
uim-gnome-build-fixes.diff
View File

@ -1,45 +0,0 @@
---
helper/toolbar-applet-gnome.c | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
--- a/helper/toolbar-applet-gnome.c
+++ b/helper/toolbar-applet-gnome.c
@@ -38,7 +38,6 @@
#include <stdlib.h>
#include <locale.h>
#include <panel-applet.h>
-#include <gnome.h>
#include <libgnome/libgnome.h>
#include <uim/uim.h>
@@ -155,20 +154,21 @@
const gchar *verbname)
{
GdkPixbuf *icon = NULL;
- GtkWidget *dialog;
+ GtkAboutDialog *dialog;
const gchar *authors[] = {"uim Project", NULL};
/* Feel free to put your names here translators */
gchar *translators = _("TRANSLATORS");
icon = gdk_pixbuf_new_from_file(UIM_PIXMAPSDIR "/uim-icon.png", NULL);
- dialog = gnome_about_new(_("uim Applet"), VERSION,
- "Copyright \xc2\xa9 2003-2009 uim Project.",
- _("Applet for indicating uim's status"),
- authors,
- NULL,
- strcmp("TRANSLATORS", translators) ? translators
- : NULL,
- icon);
+ dialog = gtk_about_dialog_new();
+ gtk_about_dialog_set_name(dialog, _("uim Applet"));
+ gtk_about_dialog_set_version(dialog, VERSION);
+ gtk_about_dialog_set_copyright(dialog, "Copyright \xc2\xa9 2003-2009 uim Project.");
+ gtk_about_dialog_set_comments(dialog, _("Applet for indicating uim's status"));
+ gtk_about_dialog_set_authors(dialog, authors);
+ if (strcmp("TRANSLATORS", translators))
+ gtk_about_dialog_set_translator_credits(dialog, translators);
+ gtk_about_dialog_set_logo(dialog, icon);
if (icon) {
gtk_window_set_icon(GTK_WINDOW(dialog), icon);

17
uim.changes
View File

@ -1,3 +1,20 @@
-------------------------------------------------------------------
Fri Jul 29 17:36:56 CEST 2011 - tiwai@suse.de
- updated to uim-1.7.1:
Major updates, see release notes of 1.6.0, 1.6.1, 1.7.0 and
1.7.1:
http://uim.googlecode.com/svn/tags/uim-1.6.0/RELNOTE
http://uim.googlecode.com/svn/tags/uim-1.6.1/RELNOTE
http://uim.googlecode.com/svn/tags/uim-1.7.0/RELNOTE
http://uim.googlecode.com/svn/tags/uim-1.7.1/RELNOTE
- Enabled Gtk3 IM build
- Re-enabled applet build for FACTORY, created uim-applet-gnome
sub-package
- Enable libedit properly
- Enable m17n-lib
- Clean up spec file
-------------------------------------------------------------------
Tue May 31 16:23:54 UTC 2011 - dimstar@opensuse.org

147
uim.spec
View File

@ -16,8 +16,8 @@
#
# The applet does not work currently on Factory, as it has not been ported to libpanelapplet-4.0 yet.
%define build_applet 0%{?suse_version} <= 1140
%define build_gtk3 (%{suse_version} >= 1140)
%define is_gnome3 (%{suse_version} > 1140)
Name: uim
BuildRequires: anthy-devel
@ -32,40 +32,36 @@ BuildRequires: libqt4-devel
BuildRequires: ncurses-devel
BuildRequires: perl-XML-Parser
BuildRequires: pkg-config
BuildRequires: m17n-lib-devel
BuildRequires: libedit-devel
%if %suse_version > 1130
BuildRequires: pkgconfig(gtk+-2.0)
%else
BuildRequires: gtk2-devel
%endif
%if %{?build_applet}
BuildRequires: gnome-panel-devel
%if %build_gtk3
BuildRequires: pkgconfig(gtk+-3.0)
%endif
BuildRequires: gnome-panel-devel
BuildRequires: qt3-devel
BuildRequires: update-desktop-files
BuildRequires: xemacs
%if 0%{?suse_version} > 1020
BuildRequires: fdupes
%endif
Version: 1.5.6
Version: 1.7.1
Release: 16
# xorg-x11-libXdmcp-devel libgnomeprintui-devel
License: GPLv2+
Summary: A multilingual input method library
Url: http://uim.freedesktop.org/wiki/
Group: System/I18n/Japanese
# svn co http://freedesktop.org:8080/svn/uim/trunk
# Source0: http://freedesktop.org/Software/UimDownload/uim-0.4.2.1.tar.bz2
# freedesktop svn archive is broken. Currently there is an snapshot of
# a new svn repository available which is updated every hour:
# http://freedesktop.org/~tkng/uim-trunk.tar.gz
Source0: http://uim.freedesktop.org/releases/uim-%{version}.tar.bz2
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
Patch1: qt-build.patch
Patch10: uim-sigscheme-build-fixes.diff
Patch11: uim-gnome-build-fixes.diff
PreReq: %{_bindir}/touch
Provides: locale(xorg-x11:ja)
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -87,16 +83,39 @@ Include Files and Libraries mandatory for Development.
%package gtk2
License: GPLv2+
Summary: Control applet using gnome2
Summary: GTK+2.0 IM module for uim
Group: System/I18n/Japanese
Requires: %{name} = %{version}
Provides: locale(gtk2:ja)
%gtk2_immodule_requires
%description gtk2
GTK+2.0 IM module for uim
%if %{build_gtk3}
%package gtk3
License: GPLv2+
Summary: GTK+3.0 IM module for uim
Group: System/I18n/Japanese
Requires: %{name} = %{version}
Provides: locale(gtk3:ja)
%gtk3_immodule_requires
%description gtk3
GTK+3.0 IM module for uim
%endif
%package applet-gnome
License: GPLv2+
Summary: GNOME applet for uim
Group: System/I18n/Japanese
Requires: %{name} = %{version}
Obsoletes: uim-applet
Provides: uim-applet
Provides: locale(gnome-libs:ja)
%gtk2_immodule_requires
%description gtk2
Control applet using gnome2
%description applet-gnome
GNOME applet for uim
%package qt
License: GPLv2+
@ -121,11 +140,7 @@ Qt4 input module plugin for uim
%prep
%setup0 -q
%patch1 -p1
%patch10 -p1
%if 0%{?suse_version} >= 1110
%patch11 -p1
%endif
cp emacs/README README.emacs
iconv -f euc-jp -t utf-8 < emacs/README.ja > README.ja.emacs
@ -133,16 +148,15 @@ iconv -f euc-jp -t utf-8 < emacs/README.ja > README.ja.emacs
autoreconf -f -i
intltoolize --force
cp po/Makefile.in.in qt/chardict/po
cp po/Makefile.in.in qt4/chardict/po
%configure --disable-static --with-pic \
--libexecdir=%{_prefix}/lib/uim \
--without-m17nlib\
--with-canna\
--with-anthy-utf8 \
--with-qt\
--with-qt-immodule \
--with-qt4-immodule \
--with-libedit
# --disable-scm-nested-eval --enable-callback-queue\
--with-qt4 \
--with-qt4-immodule
make %{?_smp_mflags}
%install
@ -199,6 +213,8 @@ find %{buildroot} -name "*.scm" \
%fdupes %{buildroot}%{_prefix}/share
%endif
find %{buildroot} -type f -name "*.la" -delete -print
rm -f doc/Makefile*
%clean
rm -rf %{buildroot}
@ -208,9 +224,9 @@ rm -rf %{buildroot}
# register uim modules to uim. This will change the files:
# %{_datadir}/uim/installed-modules.scm
# %{_datadir}/uim/loader.scm
# %{_datadir}/uim/modules
uim-module-manager --register pyload anthy anthy-utf8 canna skk tcode tutcode hangul viqr ipa-x-sampa latin
uim-module-manager --register \
ajax-ime anthy anthy-utf8 byeoru canna elatin hangul ipa-x-sampa \
latin m17nlib pyload skk tcode trycode tutcode viqr
%postun -p /sbin/ldconfig
%post gtk2
@ -219,20 +235,25 @@ uim-module-manager --register pyload anthy anthy-utf8 canna skk tcode tutcode ha
%postun gtk2
%gtk2_immodule_postun
%files -n uim -f uim.lang
%if %{build_gtk3}
%post gtk3
%gtk3_immodule_post
%postun gtk3
%gtk3_immodule_postun
%endif
%files -f uim.lang
%defattr(-, root, root)
%doc AUTHORS COPYING ChangeLog INSTALL* NEWS* README*
%doc doc
%dir %{_sysconfdir}/X11/xim.d/
%{_sysconfdir}/X11/xim.d/*
%dir %{_datadir}/uim
%dir %{_datadir}/uim/lib
%{_datadir}/uim
# autogenerated by uim-module-manager:
%ghost %{_datadir}/uim/installed-modules.scm
%ghost %{_datadir}/uim/loader.scm
%ghost %{_datadir}/uim/modules
%dir %{_datadir}/uim/pixmaps/
%{_datadir}/uim/pixmaps/*
%{_bindir}/uim-sh
%{_bindir}/uim-module-manager
%{_bindir}/uim-xim
@ -240,55 +261,65 @@ uim-module-manager --register pyload anthy anthy-utf8 canna skk tcode tutcode ha
%{_bindir}/uim-fep-tick
%{_bindir}/uim-el-agent
%{_bindir}/uim-el-helper-agent
%{_bindir}/uim-help
%{_bindir}/uim-m17nlib-relink-icons
%{_libdir}/*.so.*
%dir %{_libdir}/uim
%if "%{_libdir}" != "%{_prefix}/lib"
%dir %{_prefix}/lib/uim
%endif
%{_prefix}/lib/uim/uim-helper-server
%{_prefix}/lib/uim/uim-candwin-gtk
%dir %{_libdir}/uim/plugin/
%{_libdir}/uim/plugin/*.so
%doc %{_mandir}/man1/*.1.gz
%{_datadir}/applications/%{name}.desktop
%{_datadir}/emacs/site-lisp/*
%dir %{_datadir}/xemacs/site-packages/
%dir %{_datadir}/xemacs/site-packages/lisp/
%dir %{_datadir}/xemacs/site-packages/lisp/uim-el/
%{_datadir}/xemacs/site-packages/lisp/uim-el/*
%{_datadir}/xemacs/site-packages
%files -n uim-devel
%files devel
%defattr(-, root, root)
%{_libdir}/*.so
%{_includedir}/uim/
%{_libdir}/pkgconfig/uim.pc
%files -n uim-gtk2
%files gtk2
%defattr(-, root, root)
%{_bindir}/uim-im-switcher-gtk
%{_bindir}/uim-*-gtk
%{_bindir}/uim-*-gtk-*
%{_bindir}/uim-input-pad-ja
%{_bindir}/uim-toolbar-gtk
%{_bindir}/uim-toolbar-gtk-systray
%{_bindir}/uim-pref-gtk
%if %{build_applet}
%{_prefix}/lib/uim/uim-toolbar-applet
%{_libdir}/bonobo/servers/*.server
%{_prefix}/lib/uim/uim-*-gtk
%{_libdir}/gtk-2*/*/immodules/*.so
%if %{build_gtk3}
%files gtk3
%defattr(-, root, root)
%{_bindir}/uim-*-gtk3
%{_bindir}/uim-*-gtk3-*
%{_prefix}/lib/uim/uim-*-gtk3
%{_libdir}/gtk-3*/*/immodules/*.so
%endif
%{_libdir}/gtk-*/*/immodules/*.so
%files -n uim-qt -f uim-chardict-qt.lang
%files applet-gnome
%defattr(-, root, root)
%{_bindir}/uim-chardict-qt
%{_bindir}/uim-im-switcher-qt
%{_bindir}/uim-pref-qt
%{_bindir}/uim-toolbar-qt
%if %{is_gnome3}
%{_prefix}/lib/uim/uim-toolbar-applet-gnome3
%{_datadir}/gnome-panel/*/applets
%{_datadir}/dbus-1/services/*
%else
%{_prefix}/lib/uim/uim-toolbar-applet
%{_libdir}/bonobo/servers/*
%endif
%files qt -f uim-chardict-qt.lang
%defattr(-, root, root)
%{_bindir}/uim-*-qt
%{_prefix}/lib/uim/uim-*-qt
%{_prefix}/lib/qt3/plugins/inputmethods/*.so
%{_prefix}/lib/uim/uim-candwin-qt
%dir %{_datadir}/uim/helperdata/
%{_datadir}/uim/helperdata/bushu.t
%files -n uim-qt4 -f uim-chardict-qt.lang
%files qt4 -f uim-chardict-qt.lang
%defattr(-, root, root)
%{_libdir}/qt4/plugins/inputmethods/*
%{_bindir}/uim-*-qt4
%{_prefix}/lib/uim/uim-*-qt4
%{_libdir}/qt4/plugins/inputmethods/*.so
%changelog