Merge with 7042535 7042538, to 7060930
authormkaz
Sat, 02 Jul 2011 02:31:13 +0900
changeset 695 09df0025cbef
parent 694 aed1d741dbc7 (current diff)
parent 693 f69e07fc61a1 (diff)
child 696 1a27aeb5dea8
Merge with 7042535 7042538, to 7060930
specs/ext-sources/imf-selector-1.0.tar.gz
--- a/imf-selector/help/C/imf-selector.xml	Fri Jul 01 03:38:17 2011 +0900
+++ b/imf-selector/help/C/imf-selector.xml	Sat Jul 02 02:31:13 2011 +0900
@@ -22,11 +22,11 @@
 
 -->
 <!--
-  Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
 -->
 <!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
   <!ENTITY author1 "Oracle">
-  <!ENTITY author2 "Input Method dev team">
+  <!ENTITY author2 "Corporation">
   <!ENTITY appversion "1.0">
   <!ENTITY manrevision "1.0">
   <!ENTITY date "April 2010">
@@ -43,12 +43,9 @@
 		<author> 
 		  <firstname>&author1;</firstname> 
 		  <surname>&author2;</surname> 
-           <affiliation>
-             <orgname>&publisher;</orgname>
-           </affiliation>
 		</author> 
 	 </authorgroup>
-     <pubdate>August 2010</pubdate>
+     <pubdate>June 2011</pubdate>
      <publisher role="maintainer"><publishername>&publisher;</publishername>
      </publisher>
 
Binary file specs/ext-sources/imf-selector-1.0.tar.gz has changed
--- a/specs/ibus-xkbc.spec	Fri Jul 01 03:38:17 2011 +0900
+++ b/specs/ibus-xkbc.spec	Sat Jul 02 02:31:13 2011 +0900
@@ -13,6 +13,7 @@
 Source1: 	ibus-xkbc-icon.tar.gz
 Patch1:     ibus-xkbc-panel-menu-patch.diff
 Patch2:     ibus-xkbc-icon.diff
+Patch3:     ibus-xkbc-help.diff
 BuildRoot:      %{_tmppath}/%{src_name}-%{version}-build
 SUNW_Copyright: %{src_name}.copyright
 IPS_Package_Name:	system/input-method/ibus/xkbc
@@ -27,6 +28,7 @@
 gzip -dc %SOURCE1 | tar xf - 
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 export CXX="${CXX} -norunpath"
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/specs/patches/ibus-xkbc-help.diff	Sat Jul 02 02:31:13 2011 +0900
@@ -0,0 +1,38 @@
+--- ibus-xkbc-1.3.3.20100922/help/C/ibus-xkbc.xml.orig	2011-06-28 14:22:25.211572200 +0900
++++ ibus-xkbc-1.3.3.20100922/help/C/ibus-xkbc.xml	2011-06-28 14:32:45.766716750 +0900
+@@ -4,11 +4,11 @@
+   <!ENTITY legal SYSTEM "legal.xml">
+   <!ENTITY appname "iBus XKBC">
+   <!ENTITY author1 "Oracle">
+-  <!ENTITY author2 "Input Method dev">
+-  <!ENTITY publisher "Oracle">
++  <!ENTITY author2 "Corporation">
++  <!ENTITY publisher "Oracle Corporation">
+   <!ENTITY appversion "1.0">
+   <!ENTITY manrevision "1.0">
+-  <!ENTITY date "January 2010">
++  <!ENTITY date "June 2011">
+ ]>
+ 
+ <article id="index" lang="en">
+@@ -19,8 +19,9 @@
+ 	 <abstract role="description">
+ 	   <para>&appname; emulates various keyboard layout.</para>
+ 	 </abstract>
++     <publisher><publishername>&publisher;</publishername></publisher>
+ 	 <copyright>
+-	   <year>2010</year>
++	   <year>2011</year>
+ 	   <holder>&publisher;</holder>
+ 	 </copyright>	 
+ 
+@@ -33,9 +34,6 @@
+ 		<author> 
+ 		  <firstname>&author1;</firstname> 
+ 		  <surname>&author2;</surname> 
+-		  <affiliation> 
+-			 <orgname>&publisher;</orgname> 
+-		  </affiliation> 
+ 		</author> 
+ 	 </authorgroup>
+