Browse Source

mozc 0.12.402.102-2

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@1313 ec354946-7b23-47d6-9f5a-488ba84defc7
iwaim 14 years ago
parent
commit
d14bb4bb6b
2 changed files with 38 additions and 13 deletions
  1. 28 0
      m/mozc/mozc-copyright
  2. 10 13
      m/mozc/mozc-vl.spec

+ 28 - 0
m/mozc/mozc-copyright

@@ -0,0 +1,28 @@
+Copyright 2010, Google Inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+    * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+    * Neither the name of Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

+ 10 - 13
m/mozc/mozc-vl.spec

@@ -1,5 +1,5 @@
 %define		ver	0.12.402.102
-%define		rel	1
+%define		rel	2
 
 %define		scim_dir		%(pkg-config --variable=moduledir scim)
 
@@ -12,9 +12,9 @@ Group:		System Environment/Libraries
 License:	BSD-like (and EDICT is CC-by-sa 3.0 Unported)
 URL:		http://code.google.com/p/mozc/
 
-# Source tar ball is not released yet.
-# See http://code.google.com/p/mozc/wiki/LinuxBuildInstructions
-Source0:	%{name}-%{version}.tar.bz2
+Source0:	http://mozc.googlecode.com/files/%{name}-%{version}.tar.bz2
+## svn debian/copyright
+Source1:	mozc-copyright	
 
 ## Mozc icons by AWASHIRO Ikuya
 ## http://blog.goo.ne.jp/ikunya/e/2ac954b762a5eec3cc767f2502971f14
@@ -30,10 +30,7 @@ Source6:	ikuya-mozc-property.png
 # Vine Lunux
 Source10:	README.vine
 
-#Patch0:		ibus-mozc-fix-for-x86_64.diff
 Patch1:		ibus-mozc-0.11.0-fix-compile-w-i386.patch
-# based openSUSE by kazukado
-Patch2:		mozc-0.11.383.102-x86_64_libdir.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 BuildRequires:	python, ibus-devel, dbus-devel
@@ -118,11 +115,8 @@ Mozc GUI ユーティリティー。設定ツールやユーザ辞書ツール
 
 %prep
 %setup -q
-#%patch0 -p0 -b .fix-x86_64
+%{__cp} -p %{SOURCE1} COPYING
 %patch1 -p1 -b .fix-i386
-%ifarch x86_64
-%patch2 -p1
-%endif
 
 # update execute files path
 %{__sed} -i -e"s|/usr/lib/mozc|%{_libexecdir}|g" base/util.cc
@@ -171,8 +165,6 @@ Mozc GUI ユーティリティー。設定ツールやユーザ辞書ツール
 %{__cp} -p %{SOURCE6} %{buildroot}%{_datadir}/scim/icons/scim-mozc-property.png
 
 # install document
-%{__chmod} 644 debian/*
-%{__cp} debian/copyright COPYING
 %{__cp} %{SOURCE10} .
 
 %clean
@@ -213,6 +205,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/scim/icons/scim-mozc-tool.png
 
 %changelog
+* Mon Jul 12 2010 IWAI, Masaharu <iwai@alib.jp> 0.12.402.102-2
+- drop obsolete x86_64 libdir patch (Patch2)
+- replace source tarball: using upstream tarball
+- add mozc-copyright (Source1) from SVN debian/copyright
+
 * Fri Jul  2 2010 IWAI, Masaharu <iwai@alib.jp> 0.12.402.102-1
 - new upstream release
 - drop mozcdic-ut dictionary