Attachment 152257 Details for Bug 229742 – comps-fc7-core-scim.patch

[patch] comps-fc7-core-scim.patch

comps-fc7-core-scim.patch (text/plain), 18.07 KB, created by Jens Petersen on 2007-04-11 08:31:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jens Petersen

Created: 2007-04-11 08:31:17 UTC

Size: 18.07 KB

patch

obsolete

>Index: comps-fc7.xml.in
>===================================================================
>RCS file: /cvs/devel/comps/comps-fc7.xml.in,v
>retrieving revision 1.37
>diff -u -r1.37 comps-fc7.xml.in
>--- comps-fc7.xml.in	10 Apr 2007 21:01:27 -0000	1.37
>+++ comps-fc7.xml.in	11 Apr 2007 08:25:40 -0000
>@@ -51,10 +51,10 @@
>     <packagelist>
>       <packagereq type="mandatory">fonts-arabic</packagereq>
>       <packagereq type="conditional" requires="kdelibs">kde-i18n-Arabic</packagereq>
>-      <packagereq type="conditional" requires="scim-m17n">m17n-db-arabic</packagereq>
>       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-ar</packagereq>
>       <packagereq type="optional">dejavu-fonts</packagereq>
>       <packagereq type="optional">dejavu-fonts-experimental</packagereq>
>+      <packagereq type="optional">m17n-db-arabic</packagereq>
>     </packagelist>
>   </group>
>   <group>
>@@ -79,9 +79,6 @@
>       <packagereq type="mandatory">fonts-bengali</packagereq>
>       <packagereq type="mandatory">m17n-db-assamese</packagereq>
>       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-as_IN</packagereq>
>-      <packagereq type="conditional" requires="xorg-x11-server-Xorg">scim-bridge-gtk</packagereq>
>-      <packagereq type="conditional" requires="xorg-x11-server-Xorg">scim-m17n</packagereq>
>-      <packagereq type="conditional" requires="qt">scim-qtimm</packagereq>
>     </packagelist>
>   </group>
>   <group>
>@@ -299,6 +296,7 @@
>       <packagereq type="default">pirut</packagereq>
>       <packagereq type="default">policycoreutils-gui</packagereq>
>       <packagereq type="default">rhgb</packagereq>
>+      <packagereq type="default">scim-m17n</packagereq>
>       <packagereq type="default">setroubleshoot</packagereq>
>       <packagereq type="default">smolt-firstboot</packagereq>
>       <packagereq type="default">synaptics</packagereq>
>@@ -372,9 +370,6 @@
>       <packagereq type="mandatory">m17n-db-bengali</packagereq>
>       <packagereq type="conditional" requires="kdelibs">kde-i18n-Bengali</packagereq>
>       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-bn</packagereq>
>-      <packagereq type="conditional" requires="xorg-x11-server-Xorg">scim-bridge-gtk</packagereq>
>-      <packagereq type="conditional" requires="xorg-x11-server-Xorg">scim-m17n</packagereq>
>-      <packagereq type="conditional" requires="qt">scim-qtimm</packagereq>
>     </packagelist>
>   </group>
>   <group>
>@@ -452,15 +447,13 @@
>       <packagereq type="mandatory">fonts-chinese</packagereq>
>       <packagereq type="conditional" requires="kdelibs">kde-i18n-Chinese</packagereq>
>       <packagereq type="conditional" requires="kdelibs">kde-i18n-Chinese-Big5</packagereq>
>-      <packagereq type="conditional" requires="scim-m17n">m17n-db-chinese</packagereq>
>       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-zh_CN</packagereq>
>       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-zh_TW</packagereq>
>-      <packagereq type="conditional" requires="xorg-x11-server-Xorg">scim-bridge-gtk</packagereq>
>       <packagereq type="conditional" requires="xorg-x11-server-Xorg">scim-chewing</packagereq>
>       <packagereq type="conditional" requires="xorg-x11-server-Xorg">scim-pinyin</packagereq>
>-      <packagereq type="conditional" requires="qt">scim-qtimm</packagereq>
>       <packagereq type="conditional" requires="xorg-x11-server-Xorg">scim-tables-chinese</packagereq>
>       <packagereq type="optional">lv</packagereq>
>+      <packagereq type="optional">m17n-db-chinese</packagereq>
>       <packagereq type="optional">stardict</packagereq>
>     </packagelist>
>   </group>
>@@ -540,8 +533,8 @@
>       <packagereq type="conditional" requires="aspell">aspell-hr</packagereq>
>       <packagereq type="conditional" requires="xorg-x11-server-Xorg">fonts-ISO8859-2-100dpi</packagereq>
>       <packagereq type="conditional" requires="xorg-x11-server-Xorg">fonts-ISO8859-2-75dpi</packagereq>
>-      <packagereq type="conditional" requires="scim-m17n">m17n-db-croatian</packagereq>
>       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-hr_HR</packagereq>
>+      <packagereq type="optional">m17n-db-croatian</packagereq>
>     </packagelist>
>   </group>
>   <group>
>@@ -1017,8 +1010,8 @@
>     <uservisible>false</uservisible>
>     <langonly>am</langonly>
>     <packagelist>
>-      <packagereq type="conditional" requires="scim-m17n">m17n-db-amharic</packagereq>
>       <packagereq type="conditional" requires="xorg-x11-server-Xorg">xorg-x11-fonts-ethiopic</packagereq>
>+      <packagereq type="optional">m17n-db-amharic</packagereq>
>     </packagelist>
>   </group>
>   <group>
>@@ -1297,6 +1290,7 @@
>       <packagereq type="default">NetworkManager-gnome</packagereq>
>       <packagereq type="default">notification-daemon</packagereq>
>       <packagereq type="default">orca</packagereq>
>+      <packagereq type="default">scim-bridge-gtk</packagereq>
>       <packagereq type="default">tomboy</packagereq>
>       <packagereq type="default">vino</packagereq>
>       <packagereq type="optional">buoh</packagereq>
>@@ -1409,6 +1403,7 @@
>       <packagereq type="optional">libsigc++20-devel</packagereq>
>       <packagereq type="optional">papyrus-devel</packagereq>
>       <packagereq type="optional">plotmm-devel</packagereq>
>+      <packagereq type="optional">scim-devel</packagereq>
>     </packagelist>
>   </group>
>   <group>
>@@ -1554,8 +1549,8 @@
>     <packagelist>
>       <packagereq type="conditional" requires="aspell">aspell-el</packagereq>
>       <packagereq type="conditional" requires="kdelibs">kde-i18n-Greek</packagereq>
>-      <packagereq type="conditional" requires="scim-m17n">m17n-db-greek</packagereq>
>       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-el_GR</packagereq>
>+      <packagereq type="optional">m17n-db-greek</packagereq>
>     </packagelist>
>   </group>
>   <group>
>@@ -1569,9 +1564,6 @@
>       <packagereq type="mandatory">fonts-gujarati</packagereq>
>       <packagereq type="mandatory">m17n-db-gujarati</packagereq>
>       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-gu_IN</packagereq>
>-      <packagereq type="conditional" requires="xorg-x11-server-Xorg">scim-bridge-gtk</packagereq>
>-      <packagereq type="conditional" requires="xorg-x11-server-Xorg">scim-m17n</packagereq>
>-      <packagereq type="conditional" requires="qt">scim-qtimm</packagereq>
>     </packagelist>
>   </group>
>   <group>
>@@ -1609,10 +1601,10 @@
>     <packagelist>
>       <packagereq type="mandatory">fonts-hebrew</packagereq>
>       <packagereq type="conditional" requires="kdelibs">kde-i18n-Hebrew</packagereq>
>-      <packagereq type="conditional" requires="scim-m17n">m17n-db-hebrew</packagereq>
>       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-he_IL</packagereq>
>       <packagereq type="optional">dejavu-fonts</packagereq>
>       <packagereq type="optional">dejavu-fonts-experimental</packagereq>
>+      <packagereq type="optional">m17n-db-hebrew</packagereq>
>     </packagelist>
>   </group>
>   <group>
>@@ -1627,9 +1619,6 @@
>       <packagereq type="mandatory">m17n-db-hindi</packagereq>
>       <packagereq type="conditional" requires="kdelibs">kde-i18n-Hindi</packagereq>
>       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-hi_IN</packagereq>
>-      <packagereq type="conditional" requires="xorg-x11-server-Xorg">scim-bridge-gtk</packagereq>
>-      <packagereq type="conditional" requires="xorg-x11-server-Xorg">scim-m17n</packagereq>
>-      <packagereq type="conditional" requires="qt">scim-qtimm</packagereq>
>     </packagelist>
>   </group>
>   <group>
>@@ -1709,8 +1698,6 @@
>       <packagereq type="conditional" requires="man-pages">man-pages-ja</packagereq>
>       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-ja_JP</packagereq>
>       <packagereq type="conditional" requires="xorg-x11-server-Xorg">scim-anthy</packagereq>
>-      <packagereq type="conditional" requires="xorg-x11-server-Xorg">scim-bridge-gtk</packagereq>
>-      <packagereq type="conditional" requires="qt">scim-qtimm</packagereq>
>       <packagereq type="optional">anthy</packagereq>
>       <packagereq type="optional">kcc</packagereq>
>       <packagereq type="optional">lv</packagereq>
>@@ -1868,9 +1855,6 @@
>       <packagereq type="mandatory">fonts-kannada</packagereq>
>       <packagereq type="mandatory">m17n-db-kannada</packagereq>
>       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-kn_IN</packagereq>
>-      <packagereq type="conditional" requires="xorg-x11-server-Xorg">scim-bridge-gtk</packagereq>
>-      <packagereq type="conditional" requires="xorg-x11-server-Xorg">scim-m17n</packagereq>
>-      <packagereq type="conditional" requires="qt">scim-qtimm</packagereq>
>     </packagelist>
>   </group>
>   <group>
>@@ -1893,6 +1877,7 @@
>       <packagereq type="default">kdenetwork</packagereq>
>       <packagereq type="default">kdepim</packagereq>
>       <packagereq type="default">kdeutils</packagereq>
>+      <packagereq type="default">scim-qtimm</packagereq>
>       <packagereq type="optional">basket</packagereq>
>       <packagereq type="optional">crystal</packagereq>
>       <packagereq type="optional">gtk-qt-engine</packagereq>
>@@ -1977,9 +1962,7 @@
>       <packagereq type="conditional" requires="kdelibs">kde-i18n-Korean</packagereq>
>       <packagereq type="conditional" requires="man-pages">man-pages-ko</packagereq>
>       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-ko_KR</packagereq>
>-      <packagereq type="conditional" requires="xorg-x11-server-Xorg">scim-bridge-gtk</packagereq>
>       <packagereq type="conditional" requires="xorg-x11-server-Xorg">scim-hangul</packagereq>
>-      <packagereq type="conditional" requires="qt">scim-qtimm</packagereq>
>       <packagereq type="optional">lv</packagereq>
>     </packagelist>
>   </group>
>@@ -2102,9 +2085,6 @@
>       <packagereq type="mandatory">fonts-malayalam</packagereq>
>       <packagereq type="mandatory">m17n-db-malayalam</packagereq>
>       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-ml_IN</packagereq>
>-      <packagereq type="conditional" requires="xorg-x11-server-Xorg">scim-bridge-gtk</packagereq>
>-      <packagereq type="conditional" requires="xorg-x11-server-Xorg">scim-m17n</packagereq>
>-      <packagereq type="conditional" requires="qt">scim-qtimm</packagereq>
>     </packagelist>
>   </group>
>   <group>
>@@ -2118,9 +2098,6 @@
>       <packagereq type="mandatory">fonts-hindi</packagereq>
>       <packagereq type="mandatory">m17n-db-marathi</packagereq>
>       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-mr_IN</packagereq>
>-      <packagereq type="conditional" requires="xorg-x11-server-Xorg">scim-bridge-gtk</packagereq>
>-      <packagereq type="conditional" requires="xorg-x11-server-Xorg">scim-m17n</packagereq>
>-      <packagereq type="conditional" requires="qt">scim-qtimm</packagereq>
>     </packagelist>
>   </group>
>   <group>
>@@ -2298,9 +2275,6 @@
>       <packagereq type="mandatory">fonts-oriya</packagereq>
>       <packagereq type="mandatory">m17n-db-oriya</packagereq>
>       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-or_IN</packagereq>
>-      <packagereq type="conditional" requires="xorg-x11-server-Xorg">scim-bridge-gtk</packagereq>
>-      <packagereq type="conditional" requires="xorg-x11-server-Xorg">scim-m17n</packagereq>
>-      <packagereq type="conditional" requires="qt">scim-qtimm</packagereq>
>     </packagelist>
>   </group>
>   <group>
>@@ -2364,9 +2338,6 @@
>       <packagereq type="mandatory">m17n-db-punjabi</packagereq>
>       <packagereq type="conditional" requires="kdelibs">kde-i18n-Punjabi</packagereq>
>       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-pa_IN</packagereq>
>-      <packagereq type="conditional" requires="xorg-x11-server-Xorg">scim-bridge-gtk</packagereq>
>-      <packagereq type="conditional" requires="xorg-x11-server-Xorg">scim-m17n</packagereq>
>-      <packagereq type="conditional" requires="qt">scim-qtimm</packagereq>
>     </packagelist>
>   </group>
>   <group>
>@@ -2407,13 +2378,13 @@
>     <packagelist>
>       <packagereq type="mandatory">fonts-KOI8-R</packagereq>
>       <packagereq type="mandatory">fonts-KOI8-R-100dpi</packagereq>
>+      <packagereq type="default">fonts-KOI8-R-75dpi</packagereq>
>       <packagereq type="conditional" requires="aspell">aspell-ru</packagereq>
>       <packagereq type="conditional" requires="kdelibs">kde-i18n-Russian</packagereq>
>-      <packagereq type="conditional" requires="scim-m17n">m17n-db-russian</packagereq>
>       <packagereq type="conditional" requires="man-pages">man-pages-ru</packagereq>
>       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-ru</packagereq>
>       <packagereq type="conditional" requires="xorg-x11-server-Xorg">xorg-x11-fonts-cyrillic</packagereq>
>-      <packagereq type="default">fonts-KOI8-R-75dpi</packagereq>
>+      <packagereq type="optional">m17n-db-russian</packagereq>
>     </packagelist>
>   </group>
>   <group>
>@@ -2429,8 +2400,8 @@
>       <packagereq type="conditional" requires="xorg-x11-server-Xorg">fonts-ISO8859-2-100dpi</packagereq>
>       <packagereq type="conditional" requires="xorg-x11-server-Xorg">fonts-ISO8859-2-75dpi</packagereq>
>       <packagereq type="conditional" requires="kdelibs">kde-i18n-Serbian</packagereq>
>-      <packagereq type="conditional" requires="scim-m17n">m17n-db-serbian</packagereq>
>       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-sr_CS</packagereq>
>+      <packagereq type="optional">m17n-db-serbian</packagereq>
>     </packagelist>
>   </group>
>   <group>
>@@ -2461,9 +2432,6 @@
>     <packagelist>
>       <packagereq type="mandatory">fonts-sinhala</packagereq>
>       <packagereq type="mandatory">m17n-db-sinhala</packagereq>
>-      <packagereq type="conditional" requires="xorg-x11-server-Xorg">scim-bridge-gtk</packagereq>
>-      <packagereq type="conditional" requires="xorg-x11-server-Xorg">scim-m17n</packagereq>
>-      <packagereq type="conditional" requires="qt">scim-qtimm</packagereq>
>       <packagereq type="conditional" requires="xorg-x11-server-Xorg">scim-sinhala</packagereq>
>     </packagelist>
>   </group>
>@@ -2479,8 +2447,8 @@
>       <packagereq type="conditional" requires="xorg-x11-server-Xorg">fonts-ISO8859-2-100dpi</packagereq>
>       <packagereq type="conditional" requires="xorg-x11-server-Xorg">fonts-ISO8859-2-75dpi</packagereq>
>       <packagereq type="conditional" requires="kdelibs">kde-i18n-Slovak</packagereq>
>-      <packagereq type="conditional" requires="scim-m17n">m17n-db-slovak</packagereq>
>       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-sk_SK</packagereq>
>+      <packagereq type="optional">m17n-db-slovak</packagereq>
>     </packagelist>
>   </group>
>   <group>
>@@ -2675,8 +2643,8 @@
>     <packagelist>
>       <packagereq type="conditional" requires="aspell">aspell-sv</packagereq>
>       <packagereq type="conditional" requires="kdelibs">kde-i18n-Swedish</packagereq>
>-      <packagereq type="conditional" requires="scim-m17n">m17n-db-swedish</packagereq>
>       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-sv</packagereq>
>+      <packagereq type="optional">m17n-db-swedish</packagereq>
>     </packagelist>
>   </group>
>   <group>
>@@ -2845,9 +2813,6 @@
>       <packagereq type="mandatory">m17n-db-tamil</packagereq>
>       <packagereq type="conditional" requires="kdelibs">kde-i18n-Tamil</packagereq>
>       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-ta_IN</packagereq>
>-      <packagereq type="conditional" requires="xorg-x11-server-Xorg">scim-bridge-gtk</packagereq>
>-      <packagereq type="conditional" requires="xorg-x11-server-Xorg">scim-m17n</packagereq>
>-      <packagereq type="conditional" requires="qt">scim-qtimm</packagereq>
>     </packagelist>
>   </group>
>   <group>
>@@ -2861,9 +2826,6 @@
>       <packagereq type="mandatory">fonts-telugu</packagereq>
>       <packagereq type="mandatory">m17n-db-telugu</packagereq>
>       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-te_IN</packagereq>
>-      <packagereq type="conditional" requires="xorg-x11-server-Xorg">scim-bridge-gtk</packagereq>
>-      <packagereq type="conditional" requires="xorg-x11-server-Xorg">scim-m17n</packagereq>
>-      <packagereq type="conditional" requires="qt">scim-qtimm</packagereq>
>     </packagelist>
>   </group>
>   <group>
>@@ -2916,9 +2878,6 @@
>     <packagelist>
>       <packagereq type="mandatory">m17n-db-thai</packagereq>
>       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-th_TH</packagereq>
>-      <packagereq type="conditional" requires="xorg-x11-server-Xorg">scim-bridge-gtk</packagereq>
>-      <packagereq type="conditional" requires="xorg-x11-server-Xorg">scim-m17n</packagereq>
>-      <packagereq type="conditional" requires="qt">scim-qtimm</packagereq>
>     </packagelist>
>   </group>
>   <group>
>@@ -2931,9 +2890,6 @@
>     <packagelist>
>       <packagereq type="mandatory">tibetan-machine-uni-fonts</packagereq>
>       <packagereq type="mandatory">m17n-db-tibetan</packagereq>
>-      <packagereq type="conditional" requires="xorg-x11-server-Xorg">scim-bridge-gtk</packagereq>
>-      <packagereq type="conditional" requires="xorg-x11-server-Xorg">scim-m17n</packagereq>
>-      <packagereq type="conditional" requires="qt">scim-qtimm</packagereq>
>     </packagelist>
>   </group>
>   <group>
>@@ -2998,9 +2954,6 @@
>       <packagereq type="mandatory">fonts-arabic</packagereq>
>       <packagereq type="mandatory">m17n-db-urdu</packagereq>
>       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-ur_IN</packagereq>
>-      <packagereq type="conditional" requires="xorg-x11-server-Xorg">scim-bridge-gtk</packagereq>
>-      <packagereq type="conditional" requires="xorg-x11-server-Xorg">scim-m17n</packagereq>
>-      <packagereq type="conditional" requires="qt">scim-qtimm</packagereq>
>     </packagelist>
>   </group>
>   <group>

Actions: View | Diff

Attachments on bug 229742: 152257