rpms/scim/EL-4 factory-menu-singlet-submenus-187027.patch, NONE, 1.1 scim-system-default-config.patch, NONE, 1.1 scim-xim-arch-byte-swap-LTC23920.patch, NONE, 1.1 scim.spec, 1.19, 1.20
Jens Petersen (petersen)
fedora-extras-commits at redhat.com
Thu Apr 26 08:35:15 UTC 2007
- Previous message: rpms/crystal/devel .cvsignore, 1.3, 1.4 crystal.spec, 1.4, 1.5 sources, 1.3, 1.4
- Next message: rpms/transmission/FC-5 transmission-0.71-manpath.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 transmission.spec, 1.2, 1.3 transmission-0.6.1-gtk.patch, 1.1, NONE transmission-0.6.1-install.patch, 1.1, NONE transmission.png, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: petersen
Update of /cvs/extras/rpms/scim/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17485
Modified Files:
scim.spec
Added Files:
factory-menu-singlet-submenus-187027.patch
scim-system-default-config.patch
scim-xim-arch-byte-swap-LTC23920.patch
Log Message:
- initial build for EPEL el4
- backport filelist cleanup from fc6 package
* Tue Jun 20 2006 Jens Petersen <petersen at redhat.com> - 1.4.4-9.7.fc5
- ignore update-gtk-immodules errors in %%post and %%postun
* Tue Jun 20 2006 Jens Petersen <petersen at redhat.com> - 1.4.4-9.5.fc5
- use _host not _target_platform for update-gtk-immodules in scripts (#195763)
- make scim explicitly require scim-libs with same ver-rel
- backport factory-menu-singlet-submenus-187027.patch to avoid having language
submenus with a single IME
* Wed Mar 1 2006 Jens Petersen <petersen at redhat.com> - 1.4.4-8
- add scim-system-default-config.patch
- add Zenkaku_Hankaku as trigger hotkey for Japanese users
- use static XIM event flow so deadkeys work under XIM in off state (#169975)
- add alternatives as prereq for %%post and %%postun (pknirsch, #182853)
factory-menu-singlet-submenus-187027.patch:
--- NEW FILE factory-menu-singlet-submenus-187027.patch ---
2006-06-05 Jens Petersen <petersen at redhat.com>
* extras/panel/scim_panel_gtk.cpp (slot_show_factory_menu): Change
the menu to put a single factory for a language on the main menu.
Add variables `engines', `lang', `ime' and `text'. `engines'
holds number of factories for `lang'. `ime' is the factory name.
Label factories of miscellaneous `lang' with just the `ime' name.
Add a tooltip to main menu entries with the `ime' name.
Index: extras/panel/scim_panel_gtk.cpp
===================================================================
RCS file: /cvsroot/scim/scim/extras/panel/scim_panel_gtk.cpp,v
retrieving revision 1.118.2.6
diff -u -r1.118.2.6 scim_panel_gtk.cpp
--- extras/panel/scim_panel_gtk.cpp 16 Feb 2006 05:49:54 -0000 1.118.2.6
+++ extras/panel/scim_panel_gtk.cpp 5 Jun 2006 11:18:11 -0000
@@ -2561,27 +2563,52 @@
GtkWidget *menu_item;
GtkWidget *icon_image;
gint width, height;
+ int engines;
+ String lang, ime, text;
gtk_icon_size_lookup (GTK_ICON_SIZE_MENU, &width, &height);
for (MapStringVectorSizeT::iterator it = groups.begin (); it != groups.end (); ++ it) {
- menu_item = gtk_menu_item_new_with_label (scim_get_language_name (it->first).c_str ());
- submenu = gtk_menu_new ();
- for (i = 0; i < it->second.size (); ++i) {
- submenu_item = gtk_image_menu_item_new_with_label (menu [it->second [i]].name.c_str ());
- icon_image = ui_create_icon (menu [it->second [i]].icon, NULL, width, height, false);
-
- if (icon_image)
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (submenu_item), icon_image);
-
- gtk_menu_shell_append (GTK_MENU_SHELL (submenu), submenu_item);
- g_signal_connect (G_OBJECT (submenu_item), "activate",
- G_CALLBACK (ui_factory_menu_activate_cb),
- GINT_TO_POINTER ((int)it->second [i]));
- gtk_widget_show (submenu_item);
- }
- gtk_menu_item_set_submenu (GTK_MENU_ITEM (menu_item), submenu);
- gtk_widget_show (submenu);
+ engines = (it->second.size ());
+ if (engines == 1) {
+ lang = it->first;
+ ime = menu [it->second [0]].name;
+ if (lang == "C" || lang == "~other")
+ text = ime;
+ else
+ text = scim_get_language_name (lang);
+ menu_item = gtk_image_menu_item_new_with_label (text.c_str ());
+
+ icon_image = ui_create_icon (menu [it->second [0]].icon, NULL, width, height, false);
+ if (icon_image)
+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_item), icon_image);
+
+ gtk_tooltips_set_tip (_tooltips, menu_item, ime.c_str (), NULL);
+
+ g_signal_connect (G_OBJECT (menu_item), "activate",
+ G_CALLBACK (ui_factory_menu_activate_cb),
+ GINT_TO_POINTER ((int)it->second [0]));
+ gtk_widget_show (menu_item);
+ }
+ else {
+ menu_item = gtk_menu_item_new_with_label (scim_get_language_name (it->first).c_str ());
+ submenu = gtk_menu_new ();
+ for (i = 0; i < engines; ++i) {
+ submenu_item = gtk_image_menu_item_new_with_label (menu [it->second [i]].name.c_str ());
+
+ icon_image = ui_create_icon (menu [it->second [i]].icon, NULL, width, height, false);
+ if (icon_image)
+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (submenu_item), icon_image);
+
+ gtk_menu_shell_append (GTK_MENU_SHELL (submenu), submenu_item);
+ g_signal_connect (G_OBJECT (submenu_item), "activate",
+ G_CALLBACK (ui_factory_menu_activate_cb),
+ GINT_TO_POINTER ((int)it->second [i]));
+ gtk_widget_show (submenu_item);
+ }
+ gtk_menu_item_set_submenu (GTK_MENU_ITEM (menu_item), submenu);
+ gtk_widget_show (submenu);
+ }
gtk_menu_shell_append (GTK_MENU_SHELL (_factory_menu), menu_item);
gtk_widget_show (menu_item);
}
scim-system-default-config.patch:
--- NEW FILE scim-system-default-config.patch ---
diff -u scim-1.4.4/configs/config.orig scim-1.4.4/configs/config
--- scim-1.4.4/configs/config.orig 2006-03-01 20:23:33.000000000 +0900
+++ scim-1.4.4/configs/config 2006-03-01 20:23:33.000000000 +0900
@@ -4,13 +4,13 @@
/FrontEnd/Socket/ConfigReadOnly = false
/FrontEnd/Socket/MaxClients = 512
/FrontEnd/X11/BrokenWchar = true
-/FrontEnd/X11/Dynamic = true
+/FrontEnd/X11/Dynamic = false
/FrontEnd/X11/OnTheSpot = true
/FrontEnd/X11/ServerName = SCIM
/Hotkeys/FrontEnd/NextFactory = Control+Alt+Down,Shift+Control+KeyRelease+Shift_L,Shift+Control+KeyRelease+Shift_R
/Hotkeys/FrontEnd/PreviousFactory = Control+Alt+Up,Shift+Control+KeyRelease+Control_L,Shift+Control+KeyRelease+Control_R
/Hotkeys/FrontEnd/ShowFactoryMenu = Control+Alt+Right
-/Hotkeys/FrontEnd/Trigger = Control+space
+/Hotkeys/FrontEnd/Trigger = Control+space,Zenkaku_Hankaku
/Hotkeys/FrontEnd/ValidKeyMask = Shift+Control+Alt+CapsLock+Meta
/Panel/Gtk/Color/ActiveBackground = light sky blue
/Panel/Gtk/Color/ActiveText = black
scim-xim-arch-byte-swap-LTC23920.patch:
--- NEW FILE scim-xim-arch-byte-swap-LTC23920.patch ---
diff -upr scim-1.4.4.orig/modules/FrontEnd/IMdkit/i18nIMProto.c scim-1.4.4/modules/FrontEnd/IMdkit/i18nIMProto.c
--- scim-1.4.4.orig/modules/FrontEnd/IMdkit/i18nIMProto.c 2002-07-02 12:55:38.000000000 +0900
+++ scim-1.4.4/modules/FrontEnd/IMdkit/i18nIMProto.c 2006-03-24 11:56:39.000000000 +0900
@@ -511,6 +511,23 @@ xim_externaldef XimFrameRec forward_even
_FRAME(EOL),
};
+xim_externaldef XimFrameRec wire_keyevent_fr[] = {
+ _FRAME(BIT8), /* type */
+ _FRAME(BIT8), /* detail */
+ _FRAME(BIT16), /* serial number */
+ _FRAME(BIT32), /* time */
+ _FRAME(BIT32), /* root */
+ _FRAME(BIT32), /* window */
+ _FRAME(BIT32), /* subwindow */
+ _FRAME(BIT16), /* rootX */
+ _FRAME(BIT16), /* rootY */
+ _FRAME(BIT16), /* X */
+ _FRAME(BIT16), /* Y */
+ _FRAME(BIT16), /* state */
+ _FRAME(BIT8), /* sameScreen */
+ _FRAME(EOL),
+};
+
xim_externaldef XimFrameRec sync_fr[] =
{
_FRAME(BIT16), /* input-method-ID */
diff -upr scim-1.4.4.orig/modules/FrontEnd/IMdkit/i18nIc.c scim-1.4.4/modules/FrontEnd/IMdkit/i18nIc.c
--- scim-1.4.4.orig/modules/FrontEnd/IMdkit/i18nIc.c 2004-08-14 12:26:38.000000000 +0900
+++ scim-1.4.4/modules/FrontEnd/IMdkit/i18nIc.c 2006-03-24 11:56:39.000000000 +0900
@@ -571,6 +571,54 @@ static int GetICValue (Xi18n i18n_core,
return n;
}
+static void SwapAttributes (XICAttribute *list,
+ int number){
+ FrameMgr fm;
+ CARD16 c16;
+ extern XimFrameRec short_fr[];
+ CARD32 c32;
+ extern XimFrameRec long_fr[];
+ XPoint xpoint;
+ extern XimFrameRec xpoint_fr[];
+ XRectangle xrect;
+ extern XimFrameRec xrectangle_fr[];
+ int i;
+
+ for (i = 0; i < number; ++i, ++list) {
+ if (list->value == NULL)
+ continue;
+ switch (list->type) {
+ case XimType_CARD16:
+ fm = FrameMgrInit (short_fr, (char *)list->value, 1);
+ FrameMgrGetToken (fm, c16);
+ memmove(list->value, &c16, sizeof(CARD16));
+ FrameMgrFree (fm);
+ break;
+ case XimType_CARD32:
+ case XimType_Window:
+ fm = FrameMgrInit (long_fr, (char *)list->value, 1);
+ FrameMgrGetToken (fm, c32);
+ memmove(list->value, &c32, sizeof(CARD32));
+ FrameMgrFree (fm);
+ break;
+ case XimType_XRectangle:
+ fm = FrameMgrInit (xrectangle_fr, (char *)list->value, 1);
+ FrameMgrGetToken (fm, xrect);
+ memmove(list->value, &xrect, sizeof(XRectangle));
+ FrameMgrFree (fm);
+ break;
+ case XimType_XPoint:
+ fm = FrameMgrInit (xpoint_fr, (char *)list->value, 1);
+ FrameMgrGetToken (fm, xpoint);
+ memmove(list->value, &xpoint, sizeof(XPoint));
+ FrameMgrFree (fm);
+ break;
+ default:
+ break;
+ }
+ }
+}
+
/* called from CreateICMessageProc and SetICValueMessageProc */
void _Xi18nChangeIC (XIMS ims,
IMProtocol *call_data,
@@ -928,6 +976,8 @@ void _Xi18nGetIC (XIMS ims, IMProtocol *
if (!(i18n_core->address.improto (ims, call_data)))
return;
/*endif*/
+ if (_Xi18nNeedSwap (i18n_core, connect_id))
+ SwapAttributes(getic->ic_attr, getic->ic_attr_num);
}
/*endif*/
iter_count = getic->ic_attr_num;
diff -upr scim-1.4.4.orig/modules/FrontEnd/IMdkit/i18nMethod.c scim-1.4.4/modules/FrontEnd/IMdkit/i18nMethod.c
--- scim-1.4.4.orig/modules/FrontEnd/IMdkit/i18nMethod.c 2004-08-14 11:28:07.000000000 +0900
+++ scim-1.4.4/modules/FrontEnd/IMdkit/i18nMethod.c 2006-03-24 12:12:40.000000000 +0900
@@ -816,38 +816,54 @@ static char *xi18n_getIMValues (XIMS ims
return NULL;
}
-static void EventToWireEvent (XEvent *ev, xEvent *event, CARD16 *serial)
+static void EventToWireEvent (XEvent *ev, xEvent *event,
+ CARD16 *serial, Bool byte_swap)
{
- *serial = (CARD16) (ev->xany.serial >> 16);
- event->u.u.sequenceNumber =
- (CARD16) (ev->xany.serial & (unsigned long) 0xFFFF);
-
- switch (ev->type)
- {
- case KeyPress:
- case KeyRelease:
- {
- XKeyEvent *kev = (XKeyEvent *) ev;
-
- event->u.u.type = ev->type;
- event->u.keyButtonPointer.root = kev->root;
- event->u.keyButtonPointer.state = kev->state;
- event->u.keyButtonPointer.time = kev->time;
- event->u.keyButtonPointer.event = kev->window;
- event->u.keyButtonPointer.child = kev->subwindow;
- event->u.keyButtonPointer.eventX = kev->x;
- event->u.keyButtonPointer.eventY = kev->y;
- event->u.keyButtonPointer.rootX = kev->x_root;
- event->u.keyButtonPointer.rootY = kev->y_root;
- event->u.keyButtonPointer.sameScreen = kev->same_screen;
- event->u.u.detail = kev->keycode;
- }
+ FrameMgr fm;
+ extern XimFrameRec wire_keyevent_fr[];
+ extern XimFrameRec short_fr[];
+ BYTE b;
+ CARD16 c16;
+ CARD32 c32;
+
+ *serial = (CARD16)(ev->xany.serial >> 16);
+ switch (ev->type) {
+ case KeyPress:
+ case KeyRelease:
+ {
+ XKeyEvent *kev = (XKeyEvent*)ev;
+ /* create FrameMgr */
+ fm = FrameMgrInit(wire_keyevent_fr, (char *)(&(event->u)), byte_swap);
+
+ /* set values */
+ b = (BYTE)kev->type; FrameMgrPutToken(fm, b);
+ b = (BYTE)kev->keycode; FrameMgrPutToken(fm, b);
+ c16 = (CARD16)(kev->serial & (unsigned long)0xffff);
+ FrameMgrPutToken(fm, c16);
+ c32 = (CARD32)kev->time; FrameMgrPutToken(fm, c32);
+ c32 = (CARD32)kev->root; FrameMgrPutToken(fm, c32);
+ c32 = (CARD32)kev->window; FrameMgrPutToken(fm, c32);
+ c32 = (CARD32)kev->subwindow; FrameMgrPutToken(fm, c32);
+ c16 = (CARD16)kev->x_root; FrameMgrPutToken(fm, c16);
+ c16 = (CARD16)kev->y_root; FrameMgrPutToken(fm, c16);
+ c16 = (CARD16)kev->x; FrameMgrPutToken(fm, c16);
+ c16 = (CARD16)kev->y; FrameMgrPutToken(fm, c16);
+ c16 = (CARD16)kev->state; FrameMgrPutToken(fm, c16);
+ b = (BYTE)kev->same_screen; FrameMgrPutToken(fm, b);
+ }
+ break;
+ default:
+ /* create FrameMgr */
+ fm = FrameMgrInit(short_fr, (char *)(&(event->u.u.sequenceNumber)),
+ byte_swap);
+ c16 = (CARD16)(ev->xany.serial & (unsigned long)0xffff);
+ FrameMgrPutToken(fm, c16);
+ break;
}
- /*endswitch*/
+ /* free FrameMgr */
+ FrameMgrFree(fm);
}
-#define Swap16(n) (((n) << 8 & 0xff00) | ((n) >> 8 & 0xff))
-
static Status xi18n_forwardEvent (XIMS ims, XPointer xp)
{
Xi18n i18n_core = ims->protocol;
@@ -894,10 +910,10 @@ static Status xi18n_forwardEvent (XIMS i
FrameMgrPutToken (fm, call_data->sync_bit);
replyp += total_size;
- if (_Xi18nNeedSwap(i18n_core, call_data->connect_id) != 0) {
- call_data->event.xkey.state = Swap16(call_data->event.xkey.state);
- }
- EventToWireEvent (&(call_data->event), (xEvent *) replyp, &serial);
+ EventToWireEvent (&(call_data->event),
+ (xEvent *) replyp,
+ &serial,
+ _Xi18nNeedSwap (i18n_core, call_data->connect_id));
FrameMgrPutToken (fm, serial);
diff -upr scim-1.4.4.orig/modules/FrontEnd/IMdkit/i18nPtHdr.c scim-1.4.4/modules/FrontEnd/IMdkit/i18nPtHdr.c
--- scim-1.4.4.orig/modules/FrontEnd/IMdkit/i18nPtHdr.c 2004-08-14 12:26:38.000000000 +0900
+++ scim-1.4.4/modules/FrontEnd/IMdkit/i18nPtHdr.c 2006-03-24 12:13:24.000000000 +0900
@@ -51,8 +51,6 @@ static void DebugLog(char * msg)
}
#endif
-#define Swap16(n) (((n) << 8 & 0xff00) | ((n) >> 8 & 0xff))
-
extern Xi18nClient *_Xi18nFindClient (Xi18n, CARD16);
static void GetProtocolVersion (CARD16 client_major,
@@ -1055,29 +1053,61 @@ static int WireEventToEvent (Xi18n i18n_
XEvent *ev,
Bool byte_swap)
{
- if (byte_swap != 0) {
- event->u.keyButtonPointer.state = Swap16(event->u.keyButtonPointer.state);
- }
- ev->xany.serial = event->u.u.sequenceNumber & ((unsigned long) 0xFFFF);
+ FrameMgr fm;
+ extern XimFrameRec wire_keyevent_fr[];
+ BYTE b;
+ CARD16 c16;
+ CARD32 c32;
+ int ret = False;
+
+ /* create FrameMgr */
+ fm = FrameMgrInit(wire_keyevent_fr, (char *)(&(event->u)), byte_swap);
+
+
+ /* get & set type */
+ FrameMgrGetToken(fm, b);
+ ev->type = (unsigned int)b;
+ /* get detail */
+ FrameMgrGetToken(fm, b);
+ /* get & set serial */
+ FrameMgrGetToken(fm, c16);
+ ev->xany.serial = (unsigned long)c16;
ev->xany.serial |= serial << 16;
ev->xany.send_event = False;
ev->xany.display = i18n_core->address.dpy;
- switch (ev->type = event->u.u.type & 0x7F)
- {
- case KeyPress:
- case KeyRelease:
- ((XKeyEvent *) ev)->keycode = event->u.u.detail;
- ((XKeyEvent *) ev)->window = event->u.keyButtonPointer.event;
- ((XKeyEvent *) ev)->state = event->u.keyButtonPointer.state;
- ((XKeyEvent *) ev)->time = event->u.keyButtonPointer.time;
- ((XKeyEvent *) ev)->root = event->u.keyButtonPointer.root;
- ((XKeyEvent *) ev)->x = event->u.keyButtonPointer.eventX;
- ((XKeyEvent *) ev)->y = event->u.keyButtonPointer.eventY;
- ((XKeyEvent *) ev)->x_root = 0;
- ((XKeyEvent *) ev)->y_root = 0;
- return True;
- }
- return False;
+
+ /* Remove SendEvent flag from event type to emulate KeyPress/Release */
+ ev->type &= 0x7F;
+
+ switch (ev->type) {
+ case KeyPress:
+ case KeyRelease:
+ {
+ XKeyEvent *kev = (XKeyEvent*)ev;
+
+ /* set keycode (detail) */
+ kev->keycode = (unsigned int)b;
+
+ /* get & set values */
+ FrameMgrGetToken(fm, c32); kev->time = (Time)c32;
+ FrameMgrGetToken(fm, c32); kev->root = (Window)c32;
+ FrameMgrGetToken(fm, c32); kev->window = (Window)c32;
+ FrameMgrGetToken(fm, c32); kev->subwindow = (Window)c32;
+ FrameMgrGetToken(fm, c16); kev->x_root = (int)c16;
+ FrameMgrGetToken(fm, c16); kev->y_root = (int)c16;
+ FrameMgrGetToken(fm, c16); kev->x = (int)c16;
+ FrameMgrGetToken(fm, c16); kev->y = (int)c16;
+ FrameMgrGetToken(fm, c16); kev->state = (unsigned int)c16;
+ FrameMgrGetToken(fm, b); kev->same_screen = (Bool)b;
+ }
+ ret = True;
+ break;
+ default:
+ break;
+ }
+ /* free FrameMgr */
+ FrameMgrFree(fm);
+ return ret;
}
static void ForwardEventMessageProc (XIMS ims,
Index: scim.spec
===================================================================
RCS file: /cvs/extras/rpms/scim/EL-4/scim.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- scim.spec 24 Feb 2006 02:57:59 -0000 1.19
+++ scim.spec 26 Apr 2007 08:34:40 -0000 1.20
@@ -2,8 +2,8 @@
Name: scim
Version: 1.4.4
-# must be less than the release number of scim in Core
-Release: 1%{?dist}
+# must be less than the release number of scim in el5
+Release: 2%{?dist}
Summary: Smart Common Input Method platform
License: LGPL
@@ -13,15 +13,20 @@
Source1: xinput-scim
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-PreReq: %{_bindir}/update-gtk-immodules
BuildRequires: gtk2-devel, desktop-file-utils
# for autoreconf
-Buildrequires: gettext-devel
+Buildrequires: autoconf automake gettext libtool
+Requires: %{name}-libs = %{version}-%{release}
+Requires(post): %{_sbindir}/alternatives
+Requires(postun): %{_sbindir}/alternatives
Patch1: scim-add-restart.patch
Patch2: gtkimm-clear-preedit-on-reset-174143.patch
Patch3: rawcode-unicode-maxlength.patch
Patch4: scim.pc-versioned-moduledir-179706.patch
Patch5: scim-panjabi-punjabi.patch
+Patch6: scim-system-default-config.patch
+Patch7: factory-menu-singlet-submenus-187027.patch
+Patch8: scim-xim-arch-byte-swap-LTC23920.patch
%description
SCIM is a user friendly and full featured input method user interface and
@@ -50,6 +55,8 @@
%package libs
Summary: Smart Common Input Method libraries
Group: System Environment/Libraries
+Requires(post): %{_bindir}/update-gtk-immodules
+Requires(postun): %{_bindir}/update-gtk-immodules
%description libs
This package provides the libraries and GTK input method module for SCIM.
@@ -62,6 +69,10 @@
%patch3 -p0 -b .3-unicode
%patch4 -p1 -b .4-moduledir
%patch5 -p0 -b .5-panjabi
+%patch6 -p1 -b .6-config
+%patch7 -p0 -b .7-submenu
+%patch8 -p1 -b .8-byteswap~
+
# patch1 touches configure.ac and src/Makefile.am
autoreconf
@@ -74,8 +85,9 @@
%install
rm -rf ${RPM_BUILD_ROOT}
-make DESTDIR=${RPM_BUILD_ROOT} install
+make install DESTDIR=${RPM_BUILD_ROOT}
+# to be deprecated after FC5
mkdir -pm 755 ${RPM_BUILD_ROOT}/%{_libdir}/scim-1.0/{Config,FrontEnd,IMEngine,SetupUI,Helper}
# remove .la files
@@ -92,7 +104,7 @@
# remove capplet
rm ${RPM_BUILD_ROOT}/%{_datadir}/control-center-2.0/capplets/scim-setup.desktop
-# install xinput config file.
+# install xinput config file
mkdir -pm 755 ${RPM_BUILD_ROOT}/%{_sysconfdir}/X11/xinit/xinput.d
install -pm 644 %{SOURCE1} ${RPM_BUILD_ROOT}/%{_sysconfdir}/X11/xinit/xinput.d/scim
@@ -115,7 +127,7 @@
%post libs
/sbin/ldconfig
-%{_bindir}/update-gtk-immodules %{_target_platform}
+%{_bindir}/update-gtk-immodules %{_host} || :
%postun
@@ -127,9 +139,10 @@
done
fi
+
%postun libs
/sbin/ldconfig
-%{_bindir}/update-gtk-immodules %{_target_platform}
+%{_bindir}/update-gtk-immodules %{_host} || :
%files -f %{name}.lang
@@ -137,13 +150,24 @@
%doc AUTHORS COPYING NEWS README ChangeLog TODO
%dir %{_sysconfdir}/scim
%config(noreplace) %{_sysconfdir}/scim/*
-%{_sysconfdir}/X11/xinit/xinput.d
%{_bindir}/*
-%{_libdir}/scim-1.0
-%exclude %{_libdir}/scim-1.0/%{scim_api}
+%dir %{_libdir}/scim-1.0
+%{_libdir}/scim-1.0/scim-helper-launcher
+%{_libdir}/scim-1.0/scim-helper-manager
+%{_libdir}/scim-1.0/scim-launcher
+%{_libdir}/scim-1.0/scim-panel-gtk
+%dir %{_libdir}/scim-1.0/%{scim_api}
+%{_libdir}/scim-1.0/%{scim_api}/Filter
+%{_libdir}/scim-1.0/%{scim_api}/FrontEnd
+%{_libdir}/scim-1.0/%{scim_api}/Helper
+%dir %{_libdir}/scim-1.0/%{scim_api}/IMEngine
+%{_libdir}/scim-1.0/%{scim_api}/IMEngine/rawcode.so
+%{_libdir}/scim-1.0/%{scim_api}/SetupUI
%{_datadir}/scim
%{_datadir}/pixmaps/*
%{_datadir}/applications/fedora-scim-setup.desktop
+%{_sysconfdir}/X11/xinit/xinput.d
+
%files devel
%defattr(-,root,root,-)
@@ -152,19 +176,43 @@
%{_libdir}/libscim*.so
%{_libdir}/pkgconfig/*.pc
+
%files doc
%defattr(-,root,root,-)
%doc docs/html
+
%files libs
%defattr(-,root,root,-)
%{_libdir}/libscim-*.so.*
%{_libdir}/gtk-2.0/immodules
-%{_libdir}/scim-1.0/%{scim_api}
+%dir %{_libdir}/scim-1.0/%{scim_api}
+%{_libdir}/scim-1.0/%{scim_api}/Config
+%dir %{_libdir}/scim-1.0/%{scim_api}/IMEngine
+%{_libdir}/scim-1.0/%{scim_api}/IMEngine/socket.so
%changelog
-* Fri Feb 24 2006 Jens Petersen <petersen at redhat.com> - 1.4.4-1%{?dist}
+* Thu Apr 26 2007 Jens Petersen <petersen at redhat.com> - 1.4.4-2
+- initial build for EPEL el4
+- backport filelist cleanup from fc6 package
+
+* Tue Jun 20 2006 Jens Petersen <petersen at redhat.com> - 1.4.4-9.7.fc5
+- ignore update-gtk-immodules errors in %%post and %%postun
+
+* Tue Jun 20 2006 Jens Petersen <petersen at redhat.com> - 1.4.4-9.5.fc5
+- use _host not _target_platform for update-gtk-immodules in scripts (#195763)
+- make scim explicitly require scim-libs with same ver-rel
+- backport factory-menu-singlet-submenus-187027.patch to avoid having language
+ submenus with a single IME
+
+* Wed Mar 1 2006 Jens Petersen <petersen at redhat.com> - 1.4.4-8
+- add scim-system-default-config.patch
+ - add Zenkaku_Hankaku as trigger hotkey for Japanese users
+ - use static XIM event flow so deadkeys work under XIM in off state (#169975)
+- add alternatives as prereq for %%post and %%postun (pknirsch, #182853)
+
+* Fri Feb 24 2006 Jens Petersen <petersen at redhat.com> - 1.4.4-1.fc3
- update to 1.4.4 release
- sync with core devel package:
@@ -189,21 +237,21 @@
- move scim dl modules to scim-libs for multilib to work correctly
- define %%scim_api
-* Tue Nov 1 2005 Jens Petersen <petersen at redhat.com> - 1.4.2-5%{?dist}
+* Tue Nov 1 2005 Jens Petersen <petersen at redhat.com> - 1.4.2-5.fc3
- avoid errors in postun script when uninstalling
-* Thu Oct 6 2005 Jens Petersen <petersen at redhat.com> - 1.4.2-4%{?dist}
+* Thu Oct 6 2005 Jens Petersen <petersen at redhat.com> - 1.4.2-4.fc3
- fixing quoting in scim-restart
- make post and postun scripts for scim-libs
-* Thu Sep 22 2005 Jens Petersen <petersen at redhat.com> - 1.4.2-3%{?dist}
+* Thu Sep 22 2005 Jens Petersen <petersen at redhat.com> - 1.4.2-3.fc3
- make scim-devel require scim-libs
- add xinput.d entries for Indic langs
* Thu Sep 15 2005 Jens Petersen <petersen at redhat.com>
- move libs and the gtk immodule to scim-libs for multilib
-* Fri Sep 9 2005 Jens Petersen <petersen at redhat.com> - 1.4.2-1%{?dist}
+* Fri Sep 9 2005 Jens Petersen <petersen at redhat.com> - 1.4.2-1.fc3
- improve scim-restart script to take account of the config module in use
(Liu Cougar)
@@ -216,7 +264,7 @@
* Thu Aug 25 2005 Warren Togami <wtogami at redhat.com>
- configure with --enable-ld-version-script (#166041)
-* Mon Aug 22 2005 Jens Petersen <petersen at redhat.com> - 1.4.2-0%{?dist}
+* Mon Aug 22 2005 Jens Petersen <petersen at redhat.com> - 1.4.2-0.fc3
- update to 1.4.2 release
- source scim-qtimm script if present from scim xinput script
- reduce xinput.d alternatives priority to 81
- Previous message: rpms/crystal/devel .cvsignore, 1.3, 1.4 crystal.spec, 1.4, 1.5 sources, 1.3, 1.4
- Next message: rpms/transmission/FC-5 transmission-0.71-manpath.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 transmission.spec, 1.2, 1.3 transmission-0.6.1-gtk.patch, 1.1, NONE transmission-0.6.1-install.patch, 1.1, NONE transmission.png, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list