* Added simple device definition

diff --git a/etc/simple_device_data.xml b/etc/simple_device_data.xml
new file mode 100755 (executable)
index 0000000..aa95826
--- /dev/null
+++ b/etc/simple_device_data.xml
@@ -0,0 +1,240 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<devices>
+  <!--=======================================================================-->
+  <!-- AU                                                                    -->
+  <!--=======================================================================-->
+  <user_agent pattern="^KDDI-([^     ]+) UP.Browser/[^   ]+ .+">
+    <!--======================================================================-->
+    <!-- UNKNOWN                                                              -->
+    <!--======================================================================-->
+    <device>
+      <device_id>KDDI-COMMON-DEVICE</device_id>
+      <device_name>KDDI Common device</device_name>
+      <html_spec_type>XHTML_MOBILE_1_0</html_spec_type>
+      <width>233</width>
+      <heigh>268</heigh>
+      <gif>true</gif>
+      <jpeg>true</jpeg>
+      <png>true</png>
+      <bmp2>false</bmp2>
+      <bmp4>false</bmp4>
+      <color>65536</color>
+      <emoji_type>D</emoji_type>
+
+      <wp_width>240</wp_width>
+      <wp_heigh>320</wp_heigh>
+      <cache>9000</cache>
+      <dpi_width>96</dpi_width>
+      <dpi_heigh>96</dpi_heigh>
+    </device>
+  </user_agent>
+  <user_agent pattern="^UP.Browser/[^\-]+-([^     ]+) .+">
+    <device>
+      <device_id>HDML-COMMON-DEVICE</device_id>
+      <device_name>HDML Common device</device_name>
+      <html_spec_type>HDML</html_spec_type>
+      <width>114</width>
+      <heigh>137</heigh>
+      <gif>false</gif>
+      <jpeg>false</jpeg>
+      <png>false</png>
+      <bmp2>false</bmp2>
+      <bmp4>false</bmp4>
+      <color>0</color>
+      <emoji_type>A</emoji_type>
+
+      <wp_width>114</wp_width>
+      <wp_heigh>137</wp_heigh>
+      <cache>1000</cache>
+      <dpi_width>72</dpi_width>
+      <dpi_heigh>72</dpi_heigh>
+    </device>
+  </user_agent>
+  <!--=======================================================================-->
+  <!-- DoCoMo                                                                -->
+  <!--=======================================================================-->
+  <user_agent pattern="^DoCoMo/1.0/([^   /]+).*$">
+    <device>
+      <device_id>DoCoMo1.0-COMMON-DEVICE</device_id>
+      <device_name>DoCoMo1.0 Common device</device_name>
+      <html_spec_type>CHTML_2_0</html_spec_type>
+      <width>96</width>
+      <heigh>96</heigh>
+      <gif>true</gif>
+      <jpeg>false</jpeg>
+      <png>false</png>
+      <bmp2>false</bmp2>
+      <bmp4>false</bmp4>
+      <color>256</color>
+      <emoji_type></emoji_type>
+
+      <wp_width>96</wp_width>
+      <wp_heigh>96</wp_heigh>
+      <cache>10000</cache>
+      <dpi_width>72</dpi_width>
+      <dpi_heigh>72</dpi_heigh>
+    </device>
+  </user_agent>
+  <user_agent pattern="^DoCoMo/2.0[  ]+([^( ]+)(\(.+\))*$">
+    <device>
+      <device_id>DoCoMo2.0-COMMON-DEVICE</device_id>
+      <device_name>DoCoMo2.0 Common device</device_name>
+      <html_spec_type>CHTML_5_0</html_spec_type>
+      <width>118</width>
+      <heigh>128</heigh>
+      <gif>true</gif>
+      <jpeg>false</jpeg>
+      <png>false</png>
+      <bmp2>false</bmp2>
+      <bmp4>false</bmp4>
+      <color>4096</color>
+      <emoji_type></emoji_type>
+
+      <wp_width>120</wp_width>
+      <wp_heigh>130</wp_heigh>
+      <cache>100000</cache>
+      <dpi_width>96</dpi_width>
+      <dpi_heigh>96</dpi_heigh>
+    </device>
+  </user_agent>
+
+  <!--=======================================================================-->
+  <!-- Softbank/Vodafone/J-Phone                                             -->
+  <!--=======================================================================-->
+  <user_agent pattern="^J-PHONE/[^/ ]+/([^/_]+)$">
+    <device>
+      <device_id>JPHONE-COMMON-DEVICE1</device_id>
+      <device_name>JPHONE Common device1</device_name>
+      <html_spec_type>JHTML</html_spec_type>
+      <width>222</width>
+      <heigh>260</heigh>
+      <gif>false</gif>
+      <jpeg>true</jpeg>
+      <png>true</png>
+      <bmp2>false</bmp2>
+      <bmp4>false</bmp4>
+      <color>262144</color>
+      <emoji_type></emoji_type>
+
+      <wp_width>240</wp_width>
+      <wp_heigh>320</wp_heigh>
+      <cache>6000</cache>
+      <dpi_width>96</dpi_width>
+      <dpi_heigh>96</dpi_heigh>
+    </device>
+  </user_agent>
+  <user_agent pattern="^J-PHONE/[^/ ]+/([^/_]+)_.+$">
+    <device>
+      <device_id>JPHONE-COMMON-DEVICE2</device_id>
+      <device_name>JPHONE Common device2</device_name>
+      <html_spec_type>JHTML</html_spec_type>
+      <width>222</width>
+      <heigh>260</heigh>
+      <gif>false</gif>
+      <jpeg>true</jpeg>
+      <png>true</png>
+      <bmp2>false</bmp2>
+      <bmp4>false</bmp4>
+      <color>262144</color>
+      <emoji_type></emoji_type>
+
+      <wp_width>240</wp_width>
+      <wp_heigh>320</wp_heigh>
+      <cache>6000</cache>
+      <dpi_width>72</dpi_width>
+      <dpi_heigh>72</dpi_heigh>
+    </device>
+  </user_agent>
+  <user_agent pattern="^J-PHONE/[^/ ]+/([^/ _]+?)[/ _].+?$">
+    <device>
+      <device_id>JPHONE-COMMON-DEVICE3</device_id>
+      <device_name>JPHONE Common Device3</device_name>
+      <html_spec_type>JHTML</html_spec_type>
+      <width>240</width>
+      <heigh>256</heigh>
+      <gif>false</gif>
+      <jpeg>true</jpeg>
+      <png>true</png>
+      <bmp2>false</bmp2>
+      <bmp4>false</bmp4>
+      <color>262144</color>
+      <emoji_type></emoji_type>
+
+      <wp_width>240</wp_width>
+      <wp_heigh>320</wp_heigh>
+      <cache>200000</cache>
+      <dpi_width>96</dpi_width>
+      <dpi_heigh>96</dpi_heigh>
+    </device>
+  </user_agent>
+  <user_agent pattern="^Vodafone/[^/ ]+/([^/ _]+?)[/ _].+?$">
+    <device>
+      <device_id>Vodafone-COMMON-DEVICE</device_id>
+      <device_name>Vodafone common Device</device_name>
+      <html_spec_type>JXHTML</html_spec_type>
+      <width>240</width>
+      <heigh>276</heigh>
+      <gif>true</gif>
+      <jpeg>true</jpeg>
+      <png>true</png>
+      <bmp2>false</bmp2>
+      <bmp4>false</bmp4>
+      <color>262144</color>
+      <emoji_type></emoji_type>
+
+      <wp_width>240</wp_width>
+      <wp_heigh>320</wp_heigh>
+      <cache>307200</cache>
+      <dpi_width>96</dpi_width>
+      <dpi_heigh>96</dpi_heigh>
+    </device>
+  </user_agent>
+  <user_agent pattern="^MOT-([^/ ]+?)/.+?$">
+    <device>
+      <device_id>MOT-COMMON-DEVICE</device_id>
+      <device_name>MOT Common Device</device_name>
+      <html_spec_type>JXHTML</html_spec_type>
+      <width>176</width>
+      <heigh>220</heigh>
+      <gif>false</gif>
+      <jpeg>true</jpeg>
+      <png>true</png>
+      <bmp2>false</bmp2>
+      <bmp4>false</bmp4>
+      <color>65536</color>
+      <emoji_type></emoji_type>
+
+      <wp_width>176</wp_width>
+      <wp_heigh>220</wp_heigh>
+      <cache>300000</cache>
+      <dpi_width>96</dpi_width>
+      <dpi_heigh>96</dpi_heigh>
+    </device>
+  </user_agent>
+
+  <user_agent pattern="^SoftBank/[^/ ]+/([^/ _]+?)[/ _].+?$">
+    <device>
+      <device_id>SoftBank-COMMON-DEVICE</device_id>
+      <device_name>SoftBank Common Device</device_name>
+      <html_spec_type>JXHTML</html_spec_type>
+      <width>240</width>
+      <heigh>375</heigh>
+      <gif>true</gif>
+      <jpeg>true</jpeg>
+      <png>true</png>
+      <bmp2>false</bmp2>
+      <bmp4>false</bmp4>
+      <color>262144</color>
+      <emoji_type></emoji_type>
+      <wp_width>240</wp_width>
+      <wp_heigh>427</wp_heigh>
+      <cache>307200</cache>
+      <dpi_width>96</dpi_width>
+      <dpi_heigh>96</dpi_heigh>
+    </device>
+  </user_agent>
+
+</devices>
+<!--
+vim:ts=2 et
+-->

diff --git a/support/centos/mod-chxj.spec b/support/centos/mod-chxj.spec
index 2f727b0..5c6eb1d 100644 (file)
--- a/support/centos/mod-chxj.spec
+++ b/support/centos/mod-chxj.spec
@@ -11,7 +11,7 @@ URL: http://sourceforge.jp/projects/modchxj/
 Source:  http://sourceforge.jp/projects/modchxj/downloads/33637/mod-chxj_%{version}.src.tar.gz
 Source1: http://download.tangent.org/libmemcached-0.23.tar.gz
 Packager:  Atsushi Konno <konn@sourceforge.jp>
-Requires: ImageMagick >= 6.2.8.0, httpd >= 2.2.3, apr >= 1.2.7, apr-util >= 1.2.7, mysql >= 5.0.45, openssl >= 0.9.8
+Requires: ImageMagick >= 6.2.8.0, httpd >= 2.2.3, apr >= 1.2.7, apr-util >= 1.2.7, mysql >= 5.0.22, openssl >= 0.9.8
 BuildPreReq: mysql-devel httpd-devel ImageMagick-devel gcc-c++ libtool openssl-devel
 
 %description