Procházet zdrojové kódy

mozc 1.1.717.102-2

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@4485 ec354946-7b23-47d6-9f5a-488ba84defc7
iwaim před 13 roky
rodič
revize
92cb272896
1 změnil soubory, kde provedl 22 přidání a 3 odebrání
  1. 22 3
      m/mozc/mozc-vl.spec

+ 22 - 3
m/mozc/mozc-vl.spec

@@ -1,7 +1,12 @@
 %define		ver	1.1.717.102
-%define		rel	1
+%define		rel	2
 
+# if you want to make scim-mozc package, rpm --define with_scim:1
+%define		with_scim	0
+
+%if %{with_scim}
 %define		scim_dir		%(pkg-config --variable=moduledir scim)
+%endif
 %define		mozc_el			mozc-el
 
 Name:		mozc
@@ -25,7 +30,7 @@ Source5:	%{name}-init.el
 
 # Vine Lunux
 Source10:	README.vine
-Patch0:		mozc-1.1.690.102-ibus-lang_panel.patch
+Patch0:		mozc-1.1.717.102-ibus-lang_panel.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 BuildRequires:	python, ibus-devel, dbus-devel
@@ -34,10 +39,12 @@ BuildRequires:	curl-devel
 BuildRequires:	protobuf-devel, gtest-devel
 BuildRequires:	qt4-devel
 BuildRequires:  gyp
+%if %{with_scim}
 # for scim-mozc
 BuildRequires:	pkgconfig
 BuildRequires:  gtk2-devel
 BuildRequires:  scim-devel
+%endif
 # for 1.1.690.102+
 BuildRequires:	zinnia-devel
 
@@ -83,6 +90,7 @@ iBus engine module for Mozc.
 %description -n ibus-mozc -l ja
 Mozc 用 iBus エンジンモジュール。
 
+%if %{with_scim}
 %package -n scim-mozc
 Summary:	SCIM IMEngine module for Mozc
 Summary(ja):	Mozc 用 SCIM IMEngine モジュール
@@ -96,6 +104,8 @@ SCIM IMEngine module for Mozc.
 %description -n scim-mozc -l ja
 Mozc 用 SCIM IMエンジンモジュール
 
+%endif
+
 %package utils-gui
 Summary:	Mozc GUI utilities
 Summary(ja):	Mozc GUI ユーティリティー
@@ -138,7 +148,9 @@ Mozc のための Emacs-lisp フロントエンド
 %{__python} build_mozc.py gyp --gypdir=%{_bindir} --channel_dev=0
 %{__python} build_mozc.py build_tools -c Release
 %{__python} build_mozc.py build -c Release unix/ibus/ibus.gyp:ibus_mozc \
+%if %{with_scim}
 	    unix/scim/scim.gyp:scim_mozc unix/scim/scim.gyp:scim_mozc_setup \
+%endif
 	    unix/emacs/emacs.gyp:mozc_emacs_helper server/server.gyp:mozc_server \
             gui/gui.gyp:mozc_tool
 
@@ -168,7 +180,7 @@ Mozc のための Emacs-lisp フロントエンド
 %{__cp} -p data/images/unix/ui-alpha_half.png %{buildroot}%{_datadir}/ibus-mozc/alpha_half.png
 %{__cp} -p data/images/unix/ui-alpha_full.png %{buildroot}%{_datadir}/ibus-mozc/alpha_full.png
 
-
+%if %{with_scim}
 # scim-mozc
 %{__mkdir_p} %{buildroot}%{scim_dir}/{IMEngine,SetupUI}
 %{__cp} -p %{output_dir}/lib.target/libscim_mozc.so \
@@ -187,6 +199,7 @@ Mozc のための Emacs-lisp フロントエンド
 %{__cp} -p data/images/unix/ui-katakana_full.png %{buildroot}%{_datadir}/scim/icons/scim-mozc-katakana_full.png
 %{__cp} -p data/images/unix/ui-alpha_half.png %{buildroot}%{_datadir}/scim/icons/scim-mozc-alpha_half.png
 %{__cp} -p data/images/unix/ui-alpha_full.png %{buildroot}%{_datadir}/scim/icons/scim-mozc-alpha_full.png
+%endif
 
 
 # mozc-server
@@ -262,12 +275,14 @@ fi
 %dir %{_datadir}/ibus-mozc/setup
 %{_datadir}/ibus-mozc/*.png
 
+%if %{with_scim}
 %files -n scim-mozc
 %defattr(-,root,root)
 %doc COPYING
 %{scim_dir}/SetupUI/mozc-setup.so
 %{scim_dir}/IMEngine/mozc.so
 %{_datadir}/scim/icons/*.png
+%endif
 
 %files -n %{mozc_el}
 %defattr(-,root,root)
@@ -279,6 +294,10 @@ fi
 
 
 %changelog
+* Fri Jul 22 2011 IWAI, Masaharu <iwai@alib.jp> 1.1.717.102-2
+- fix typo in ibus lang panel patch (Patch0): <BTS:VineLinux:1161>
+- stop built scim-mozc package by default
+
 * Fri May 20 2011 IWAI, Masaharu <iwai@alib.jp> 1.1.717.102-1
 - new upstream release