From b6940525b416ac67d22482f3e86a817e8e2eabb9 Mon Sep 17 00:00:00 2001
From: Akira TAGOH <tagoh@redhat.com>
Date: Feb 27 2012 09:01:54 +0000
Subject: Fix docdir.


---

diff --git a/mozc-fix-dirs.patch b/mozc-fix-dirs.patch
new file mode 100644
index 0000000..eb10770
--- /dev/null
+++ b/mozc-fix-dirs.patch
@@ -0,0 +1,29 @@
+diff -pruN mozc-1.3.975.102.orig/base/util.cc mozc-1.3.975.102/base/util.cc
+--- mozc-1.3.975.102.orig/base/util.cc	2012-01-26 18:15:04.000000000 +0900
++++ mozc-1.3.975.102/base/util.cc	2012-02-27 17:04:28.000000000 +0900
+@@ -72,6 +72,7 @@
+ #ifdef OS_MACOSX
+ #include "base/mac_util.h"
+ #endif
++#include "base/version.h"
+ 
+ 
+ namespace {
+@@ -2637,7 +2638,7 @@ string Util::GetServerDirectory() {
+ #endif  // OS_MACOSX
+ 
+ #ifdef OS_LINUX
+-  return "/usr/lib/mozc";
++  return "/usr/libexec";
+ #endif  // OS_LINUX
+ }
+ 
+@@ -2645,7 +2646,7 @@ string Util::GetDocumentDirectory() {
+ #ifdef OS_MACOSX
+   return Util::GetServerDirectory();
+ #else
+-  return Util::JoinPath(Util::GetServerDirectory(), "documents");
++  return "/usr/share/doc/mozc-" + Version::GetMozcVersion();
+ #endif
+ }
+ 
diff --git a/mozc-serverdir.patch b/mozc-serverdir.patch
deleted file mode 100644
index 7818293..0000000
--- a/mozc-serverdir.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -pruN mozc-1.3.911.102.orig/base/util.cc mozc-1.3.911.102/base/util.cc
---- mozc-1.3.911.102.orig/base/util.cc	2011-11-30 18:02:06.000000000 +0900
-+++ mozc-1.3.911.102/base/util.cc	2012-02-13 10:51:46.000000000 +0900
-@@ -2593,7 +2593,7 @@ string Util::GetServerDirectory() {
- #endif  // OS_MACOSX
- 
- #ifdef OS_LINUX
--  return "/usr/lib/mozc";
-+  return "/usr/libexec";
- #endif  // OS_LINUX
- }
- 
diff --git a/mozc.spec b/mozc.spec
index 88444a2..d5e615b 100644
--- a/mozc.spec
+++ b/mozc.spec
@@ -2,7 +2,7 @@
 
 Name:		mozc
 Version:	1.3.975.102
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Open-sourced Google Japanese Input
 
 Group:		System Environment/Libraries
@@ -26,7 +26,7 @@ Patch0:		mozc-build-verbosely.patch
 Patch1:		mozc-fix-model-path-for-zinnia.patch
 Patch2:		mozc-no-Werror.patch
 Patch3:		mozc-support-new-ibus.patch
-Patch4:		mozc-serverdir.patch
+Patch4:		mozc-fix-dirs.patch
 Patch5:		mozc-fix-build-fail.patch
 Patch6:		mozc-ibus141.patch
 
@@ -141,7 +141,7 @@ to use mozc with XEmacs.
 %patch1 -p1 -b .1-fix-zinnia
 %patch2 -p1 -b .2-no-Werror
 %patch3 -p1 -b .3-new-ibus
-%patch4 -p1 -b .4-serverdir
+%patch4 -p1 -b .4-dirs
 %patch5 -p1 -b .5-missing-headers
 %patch6 -p0 -b .6-ibus141
 (cd data/dictionary;
@@ -263,6 +263,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_xemacs_sitelispdir}/%{pkg}/*.el
 
 %changelog
+* Mon Feb 27 2012 Akira TAGOH <tagoh@redhat.com> - 1.3.975.102-2
+- Fix docdir.
+
 * Mon Feb 13 2012 Akira TAGOH <tagoh@redhat.com> - 1.3.975.102-1
 - New upstream release.
 - Update zipcode dictionaries.