Browse Source

updated: uim, scim-uim

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@1590 ec354946-7b23-47d6-9f5a-488ba84defc7
inagaki 13 years ago
parent
commit
5bb81cc02d
2 changed files with 45 additions and 64 deletions
  1. 6 1
      s/scim-uim/scim-uim-vl.spec
  2. 39 63
      u/uim/uim-vl.spec

+ 6 - 1
s/scim-uim/scim-uim-vl.spec

@@ -2,10 +2,11 @@ Summary: SCIM-UIM input method engine which use uim library as the backend
 Summary(ja): バックエンドとして uim ライブラリを使った SCIM-UIM インプットメソッドエンジン
 Name: scim-uim
 Version: 0.2.0
-Release: 2%{?_dist_release}
+Release: 3%{?_dist_release}
 License: GPL
 Group: System Environment/Libraries
 URL: http://scim.freedesktop.org/
+
 Source0: http://prdownloads.sourceforge.net/scim/%{name}-%{version}.tar.gz
 Patch0: scim-uim-0.2.0-include.patch
 
@@ -48,6 +49,10 @@ make DESTDIR=%{buildroot} install
 %{_datadir}/scim/icons/scim-uim.png
 
 %changelog
+* Sat Aug 14 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 0.2.0-3
+- rebuilt with uim-1.6.0
+- updated Patch0
+
 * Sat Oct 24 2009 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 0.2.0-2
 - rebuilt with uim-1.5.6 (added Patch0 for building uim-1.5.6)
 

+ 39 - 63
u/uim/uim-vl.spec

@@ -28,7 +28,7 @@
 Name: uim
 Summary: Uim an input method library
 Summary(ja): uim - 入力メソッドライブラリ
-Version: 1.5.7
+Version: 1.6.0
 Release: 1%{?_dist_release}
 
 License: LGPLv2/BSD
@@ -39,8 +39,6 @@ Source0: http://uim.googlecode.com/files/uim-%{version}%{?extraver:-%extraver}.t
 Source1: uim-el-install.sh
 Source2: uim-el-remove.sh
 Source3: uim-update-installed-modules.sh.in
-# Bug 24728
-Patch0: uim-1.5.7-qt4.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: libXft-devel libX11-devel libXext-devel 
@@ -48,6 +46,7 @@ BuildRequires: libXrender-devel libXau-devel libXdmcp-devel libXt-devel
 BuildRequires: gtk2-devel 
 BuildRequires: ncurses-devel
 BuildRequires: anthy-devel m17n-lib-devel eb-devel
+BuildRequires: libedit-devel libffi-devel expat-devel curl-devel
 BuildRequires: gettext-devel desktop-file-utils
 %if %{with_qt}
 BuildRequires: qt-devel
@@ -56,7 +55,7 @@ BuildRequires: qt-devel
 BuildRequires: qt4-devel
 %endif
 %if %{with_gnome}
-BuildRequires: gnome-panel
+BuildRequires: gnome-panel-devel
 BuildRequires: libgnomeui-devel
 %endif
 %if %{with_kde}
@@ -118,10 +117,10 @@ Summary: Qt3 support for Uim
 Summary(ja): uim の Qt3 サポート
 Group: User Interface/Desktops
 Requires: %{name}-xim = %{version}-%{release}
-Requires: %{name}-qt-common = %{version}-%{release}
 Requires: qt = %{_qt3_version}
 
 Obsoletes: %{name}-qt-immodule < 1.5.6-2
+Obsoletes: %{name}-qt-common < %{version}-%{release}
 Obsoletes: uim-qtkde-helper
 Provides: %{name}-qt-immodule = %{version}-%{release}
 Provides: uim-qtkde-helper
@@ -141,8 +140,8 @@ Summary: Qt4 support for Uim
 Summary(ja): Uim の Qt4 サポート
 Group: User Interface/Desktops
 Requires: %{name}-xim = %{version}-%{release}
-Requires: %{name}-qt-common = %{version}-%{release}
 Requires: qt4 = %{_qt4_version}
+Obsoletes: %{name}-qt-common < %{version}-%{release}
 
 %description qt4
 This package contains some applications like toolbar, candidate window,
@@ -153,37 +152,10 @@ and preference tool using Qt4.
 が含まれています。
 %endif
 
-%if (%{with_qt}%{with_qt4})
-%package	qt-common
-Summary:	Qt support for Uim
-Group:		User Interface/Desktops
-Requires:	uim = %{version}-%{release}
-Obsoletes:	%{name}-qt < 1.5.6-2
-
-%description	qt-common
-This package contains the helper applications for Qt support.
-%endif
-
-#%if %{with_qtimm}
-#%package qt-immodule
-#Summary: A plugin for using Uim with Qt
-#Summary(ja): Qt で uim を使うためのプラグイン
-#Group: System Environment/Libraries
-#Requires: %{name} = %{version}-%{release}
-#Requires: qt = %{qtver}
-#BuildRequires: qt-devel = %{qtver}
-
-#%description qt-immodule
-#A Plugin for using Uim with Qt.
-#
-#%description -l ja qt-immodule
-#Qt アプリケーションで uim を使うためのプラグインです。
-#%endif
-
 %if %{with_gnome}
 %package applet
-Summary: GNOME2 panel applet for Uim
-Summary(ja): uim の GNOME2 用パネルアプレット
+Summary: GNOME panel applet for Uim
+Summary(ja): uim の GNOME 用パネルアプレット
 Group: User Interface/Desktops
 BuildRequires: libgnomeui-devel
 Requires: %{name}-xim = %{version}-%{release}
@@ -191,10 +163,10 @@ Requires: %{name}-gtk = %{version}-%{release}
 Requires: libgnomeui
 
 %description applet
-uim-applet is GNOME2 panel applet for uim.
+uim-applet is GNOME panel applet for uim.
 
 %description -l ja applet
-uim-applet は uim の入力状態を表示する GNOME2 用パネルアプレットです。
+uim-applet は uim の入力状態を表示する GNOME 用パネルアプレットです。
 %endif
 
 %if %{with_kde}
@@ -369,7 +341,7 @@ uim-devel パッケージには libuim を利用したアプリケーション
 
 %prep
 %setup -q -n %{name}-%{version}%{?extraver:-%extraver}
-%patch0 -p0
+
 
 %build
 %if %{with_qt}
@@ -382,6 +354,9 @@ export QTDIR=%{_qt3_prefix}
 	--without-scim --without-prime \
 	--with-gtk2 \
 	--with-m17nlib \
+        --with-curl \
+        --with-expat \
+	--with-ffi \
 	--with-eb --with-eb-conf=%{_sysconfdir}/eb.conf \
 	--disable-static \
 %if %{with_gnome}
@@ -425,16 +400,16 @@ export QTDIR=%{_qt3_prefix}
 %endif
 
 # generate Makefile properly for kde4-applets (ad-hoc)
-%if %{with_kde}
-pushd qt4/toolbar/build
-QTDIR=%{_qt4_prefix} %{cmake} \
-    -DCMAKE_BUILD_TYPE=release \
-    -DDATA_INSTALL_DIR:PATH=%{_datadir}/kde4/apps \
-    -DINCLUDE_INSTALL_DIR:PATH=%{_includedir}/kde4 \
-    -DLIBEXEC_INSTALL_DIR:PATH=%{_libexecdir}/kde4 \
-    ..
-popd
-%endif
+#if %{with_kde}
+#pushd qt4/toolbar/build
+#QTDIR=%{_qt4_prefix} {cmake} \
+#    -DCMAKE_BUILD_TYPE=release \
+#    -DDATA_INSTALL_DIR:PATH=%{_datadir}/kde4/apps \
+#    -DINCLUDE_INSTALL_DIR:PATH=%{_includedir}/kde4 \
+#    -DLIBEXEC_INSTALL_DIR:PATH=%{_libexecdir}/kde4 \
+#    ..
+#popd
+#endif
 
 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:$LD_LIBRARY_PATH make
@@ -599,6 +574,7 @@ fi
 %defattr(-,root,root)
 %doc README* ChangeLog* INSTALL* AUTHORS COPYING
 %config(noreplace) %{_sysconfdir}/sysconfig/uim
+%{_bindir}/uim-help
 %{_bindir}/uim-sh
 %{_bindir}/uim-module-manager
 %{_libdir}/*.so.*
@@ -618,8 +594,17 @@ fi
 %endif
 %dir %{_libdir}/uim
 %dir %{_libdir}/uim/plugin
+%{_libdir}/uim/plugin/libuim-curl.so
 %{_libdir}/uim/plugin/libuim-custom-enabler.so
+%{_libdir}/uim/plugin/libuim-eb.so
+%{_libdir}/uim/plugin/libuim-editline.so
+%{_libdir}/uim/plugin/libuim-expat.so
+%{_libdir}/uim/plugin/libuim-ffi.so
+%{_libdir}/uim/plugin/libuim-fileio.so
+%{_libdir}/uim/plugin/libuim-lolevel.so
 %{_libdir}/uim/plugin/libuim-look.so
+%{_libdir}/uim/plugin/libuim-process.so
+%{_libdir}/uim/plugin/libuim-socket.so
 %{_libexecdir}/uim-helper-server
 
 %files xim
@@ -633,6 +618,7 @@ fi
 %{_bindir}/uim-*-gtk*
 %{_bindir}/uim-input-pad-ja
 %{_libexecdir}/uim-candwin-gtk
+%{_libexecdir}/uim-candwin-tbl-gtk
 %{_libdir}/gtk-2.0/*/immodules/*.so
 %{_datadir}/applications/uim.desktop
 
@@ -655,8 +641,6 @@ fi
 %if %{with_qt4}
 %files qt4
 %defattr(-,root,root)
-%lang(en) %doc qt4/immodule/README.en
-%lang(ja) %doc qt4/immodule/README.ja
 # BSD and LGPLv2+
 %{_bindir}/uim-chardict-qt4
 # BSD
@@ -670,17 +654,6 @@ fi
 %{_datadir}/locale/*/*/uim-chardict-qt4.mo
 %endif
 
-%if (%{with_qt}%{with_qt4})
-%files qt-common
-%defattr(-,root,root)
-%doc AUTHORS COPYING ChangeLog* NEWS README
-%endif
-
-#%if %{with_qtimm}
-#%files qt-immodule
-#%defattr(-,root,root)
-#%endif
-
 %if %{with_gnome}
 %files applet
 %defattr(-,root,root)
@@ -767,14 +740,17 @@ fi
 %defattr(-,root,root)
 %doc doc/PLUGIN installed-doc/sigscheme
 %{_libdir}/*.so
-#{_libdir}/*.a
-#{_libdir}/*.la
 %{_includedir}/*.h
 %{_includedir}/uim
 %{_includedir}/sigscheme
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Sat Aug 14 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 1.6.0-1
+- new upstream release
+- dropt Patch0
+- Obsoletes: uim-qt-common
+
 * Sun Jul 25 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 1.5.7-1
 - new upstream release
 - added Patch0