Hello community,
here is the log from the commit of package scim for openSUSE:Factory checked in
at 2014-02-19 18:56:16
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/scim (Old)
and /work/SRC/openSUSE:Factory/.scim.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "scim"
Changes:
--------
--- /work/SRC/openSUSE:Factory/scim/scim.changes 2013-12-09
07:19:22.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.scim.new/scim.changes 2014-02-19
18:56:17.000000000 +0100
@@ -1,0 +2,12 @@
+Fri Feb 14 12:10:13 CET 2014 - ti...@suse.de
+
+- Fix *-32bit post and postun calls for gtk-query-immodules-2 on
+ openSUSE 13.1 and later (bnc#845860)
+
+-------------------------------------------------------------------
+Fri Feb 14 05:59:46 UTC 2014 - ty...@suse.com
+
+- fate #313546 Get rid of SuSEconfig.scim
+ rename the SuSEconfig.scim into scim.config
+
+-------------------------------------------------------------------
Old:
----
SuSEconfig.scim
New:
----
scim.config
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ scim.spec ++++++
--- /var/tmp/diff_new_pack.vhGEnm/_old 2014-02-19 18:56:18.000000000 +0100
+++ /var/tmp/diff_new_pack.vhGEnm/_new 2014-02-19 18:56:18.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package scim
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -48,11 +48,9 @@
Source0: scim-%{version}.tar.gz
Source1: baselibs.conf
Source10: etc-x11-xim.d-scim
-Source11: SuSEconfig.scim
+Source11: scim.config
Patch1: configs.patch
Patch2: scim-no-setpwent.diff
-#FIX-FOR-UPSTREAM fix build im-scim.version-script
-# Patch3: scim-1.4.13-ld-version-script.patch
#FIX-FOR-UPSTREAM fix an upstream typo error in panel/*.cpp
Patch4: sle-11-gtk-widget-get-visible.patch
Requires(pre): /usr/bin/touch
@@ -158,6 +156,13 @@
%if 0%{?suse_version} < 1100
sed -i -e'/supplements/d' $RPM_SOURCE_DIR/baselibs.conf
%endif
+# hack to fix incompatibility of gtk-query-immodules-2.0 (bnc#845860)
+%if %suse_version < 1310
+sed -i \
+ -e's@\(gtk-query-immodules-2.0-64\) --update-cache@\1 >
<prefix>%{_sysconfdir}/gtk-2.0/gtk64.immodules@g' \
+ -e's@\(gtk-query-immodules-2.0\) --update-cache@\1 >
<prefix>%{_sysconfdir}/gtk-2.0/gtk.immodules@g' \
+ $RPM_SOURCE_DIR/baselibs.conf
+%endif
%build
%if 0%{?suse_version} <= 1100
@@ -250,7 +255,7 @@
popd
done
popd
-install -m 755 $RPM_SOURCE_DIR/SuSEconfig.scim \
+install -m 755 $RPM_SOURCE_DIR/scim.config \
%{buildroot}/%{_datadir}/scim
%find_lang scim
%suse_update_desktop_file scim-setup System SystemSetup
@@ -275,7 +280,7 @@
%gtk3_immodule_post
%endif
# Update KeyboardLayout
-%{_datadir}/scim/SuSEconfig.scim
+%{_datadir}/scim/scim.config
%postun
/sbin/ldconfig
++++++ baselibs.conf ++++++
--- /var/tmp/diff_new_pack.vhGEnm/_old 2014-02-19 18:56:18.000000000 +0100
+++ /var/tmp/diff_new_pack.vhGEnm/_new 2014-02-19 18:56:18.000000000 +0100
@@ -1,13 +1,13 @@
scim-gtk
post "%if "%_lib" == "lib64""
- post "<prefix>%{_bindir}/gtk-query-immodules-2.0-64 >
<prefix>%{_sysconfdir}/gtk-2.0/gtk64.immodules"
+ post "<prefix>%{_bindir}/gtk-query-immodules-2.0-64 --update-cache"
post "%else"
- post "<prefix>%{_bindir}/gtk-query-immodules-2.0 >
<prefix>%{_sysconfdir}/gtk-2.0/gtk.immodules"
+ post "<prefix>%{_bindir}/gtk-query-immodules-2.0 --update-cache"
post "%endif"
postun "%if "%_lib" == "lib64""
- postun "<prefix>%{_bindir}/gtk-query-immodules-2.0-64 >
<prefix>%{_sysconfdir}/gtk-2.0/gtk64.immodules"
+ postun "<prefix>%{_bindir}/gtk-query-immodules-2.0-64 --update-cache"
postun "%else"
- postun "<prefix>%{_bindir}/gtk-query-immodules-2.0 >
<prefix>%{_sysconfdir}/gtk-2.0/gtk.immodules"
+ postun "<prefix>%{_bindir}/gtk-query-immodules-2.0 --update-cache"
postun "%endif"
supplements "packageand(scim:gtk2-<targettype>)"
scim-gtk3
++++++ scim.config ++++++
#! /bin/sh
# scim.config : this script will set the default KeyboardLayout setting of scim
according to the system keyboard setting.
#
# check if we are started as root
# only one of UID and USER must be set correctly
if test "$UID" != 0 -a "$USER" != root; then
echo "You must be root to start $0."
exit 1
fi
test -n "$ROOT" && exit 0
CONFIG_FILE="/etc/scim/global"
CONFIG_KEY="/DefaultKeyboardLayout"
test ! -e $CONFIG_FILE && exit 0
# Read system keyboard setting
test -e /etc/sysconfig/keyboard && . /etc/sysconfig/keyboard
case ${YAST_KEYBOARD%%,*} in
english-us)
SCIM_KEYBOARD="US_Default"
;;
english-uk)
SCIM_KEYBOARD="UK"
;;
german)
SCIM_KEYBOARD="German"
;;
german-deadkey)
SCIM_KEYBOARD="German_Deadkeys"
;;
german-ch)
SCIM_KEYBOARD="German_Swiss"
;;
french)
SCIM_KEYBOARD="French"
;;
french-ch)
SCIM_KEYBOARD="French_Switzerland"
;;
french-ca)
SCIM_KEYBOARD="French_Canadian"
;;
spanish)
SCIM_KEYBOARD="Spanish"
;;
spanish-lat)
SCIM_KEYBOARD="Spanish_Latin_America"
;;
spanish-lat-cp850)
SCIM_KEYBOARD="Spanish_CP850"
;;
italian)
SCIM_KEYBOARD="Italian"
;;
portugese)
SCIM_KEYBOARD="Portuguese"
;;
portugese-br)
SCIM_KEYBOARD="Portuguese_Brazil"
;;
portugese-br-usa)
SCIM_KEYBOARD="Portuguese_Brazil_US_Accents"
;;
greek)
SCIM_KEYBOARD="Greek"
;;
dutch)
SCIM_KEYBOARD="Dutch"
;;
danish)
SCIM_KEYBOARD="Danish"
;;
norwegian)
SCIM_KEYBOARD="Norwegian"
;;
swedish)
SCIM_KEYBOARD="Swedish"
;;
finnish)
SCIM_KEYBOARD="Finnish"
;;
czech)
SCIM_KEYBOARD="Czech"
;;
czech-qwerty)
SCIM_KEYBOARD="Czech_Qwerty"
;;
slovak)
SCIM_KEYBOARD="Slovak"
;;
slovak-qwerty)
SCIM_KEYBOARD="Slovak_Qwerty"
;;
slovene)
SCIM_KEYBOARD="Slovene"
;;
hungarian)
SCIM_KEYBOARD="Hungarian"
;;
polish)
SCIM_KEYBOARD="Polish"
;;
russian)
SCIM_KEYBOARD="Russian"
;;
estonian)
SCIM_KEYBOARD="Estonian"
;;
lithuanian)
SCIM_KEYBOARD="Lithuanian"
;;
turkish)
SCIM_KEYBOARD="Turkish"
;;
croatian)
SCIM_KEYBOARD="Croatian"
;;
japanese)
SCIM_KEYBOARD="Japanese"
;;
belgian)
SCIM_KEYBOARD="Belgian"
;;
dvorak)
SCIM_KEYBOARD="Dvorak"
;;
icelandic)
SCIM_KEYBOARD="Icelandic"
;;
ukrainian)
SCIM_KEYBOARD="Ukrainian"
;;
*)
SCIM_KEYBOARD="Unknown"
esac
cat $CONFIG_FILE | grep -v $CONFIG_KEY > ${CONFIG_FILE}.new
echo "$CONFIG_KEY = $SCIM_KEYBOARD" >> ${CONFIG_FILE}.new
mv -f ${CONFIG_FILE}.new ${CONFIG_FILE}
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
