rpms/imsettings/devel imsettings-log.patch, NONE, 1.1 imsettings.spec, 1.33, 1.34

[Akira TAGOH]

Author: tagoh

Update of /cvs/pkgs/rpms/imsettings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1501

Modified Files:
	imsettings.spec 
Added Files:
	imsettings-log.patch 
Log Message:
* Fri Aug 14 2009 Akira TAGOH <tagoh at redhat.com> - 0.107.1-2
- export the certain environment variables.

imsettings-log.patch:
 xinput.sh.in.in |   94 ++++++++++++++++++++++++++------------------------------
 1 file changed, 44 insertions(+), 50 deletions(-)

--- NEW FILE imsettings-log.patch ---
Index: data/xinput.sh.in.in
===================================================================
--- data/xinput.sh.in.in	(リビジョン 315)
+++ data/xinput.sh.in.in	(作業コピー)
@@ -10,6 +10,17 @@
 #
 # X Input method setup script
 
+function log_init() {
+    if [ ! -n "$DRY_RUN" ]; then
+	rm -rf $HOME/.imsettings.log
+	touch $HOME/.imsettings.log
+    fi
+}
+
+function log() {
+    echo $* >> $HOME/.imsettings.log
+}
+
 function is_dbus_enabled() {
     [ -n "$DBUS_SESSION_BUS_ADDRESS" ]
 }
@@ -73,7 +84,7 @@
 function run_imsettings() {
     print_info
     if [ -n "$DRY_RUN" ]; then
-	echo "*** DRY RUN MODE: running IM through imsettings"
+	log "*** DRY RUN MODE: running IM through imsettings"
     else
 	if [ -n "$IMSETTINGS_INTEGRATE_DESKTOP" -a "x$IMSETTINGS_INTEGRATE_DESKTOP" = "xno" ]; then
 	    which imsettings-start > /dev/null 2>&1 && LANG="$tmplang" imsettings-start -n "$IMSETTINGS_MODULE" || :
@@ -88,56 +99,48 @@
 function run_xim() {
     print_info
     if [ -n "$DRY_RUN" ]; then
-	echo "*** DRY RUN MODE: running IM without imsettings"
+	log "*** DRY RUN MODE: running IM without imsettings"
     else
 	DISABLE_IMSETTINGS=true
 	export DISABLE_IMSETTINGS
 
 	# execute XIM_PROGRAM
-	[ -n "$XIM_PROGRAM" ] && which "$XIM_PROGRAM" > /dev/null 2>&1 && LANG="$tmplang" "$XIM_PROGRAM" $XIM_ARGS &
+	[ -n "$XIM_PROGRAM" ] && which "$XIM_PROGRAM" > /dev/null 2>&1 && LANG="$tmplang" "$XIM_PROGRAM" $XIM_ARGS > $HOME/.imsettings.log 2>&1 &
     fi
 }
 
 function print_result() {
     $1
     if [ $? -eq 0 ]; then
-	echo yes
+	log yes
     else
-	echo no
+	log no
     fi
 }
 
 function print_info() {
-    echo "imsettings information"
-    echo "=========================="
-    echo -n "Is DBus enabled: "
+    log "imsettings information"
+    log "=========================="
+    log -n "Is DBus enabled: "
     print_result is_dbus_enabled
-    echo -n "Is imsettings enabled: "
+    log -n "Is imsettings enabled: "
     print_result is_imsettings_enabled
-    echo -n "Is GTK+ supported: "
+    log -n "Is GTK+ supported: "
     print_result is_gtk_supported
-    echo -n "Is Qt supported: "
+    log -n "Is Qt supported: "
     print_result is_qt_supported
-    echo "DESKTOP_SESSION: $DESKTOP_SESSION"
-    echo "DISABLE_IMSETTINGS: $DISABLE_IMSETTINGS"
-    echo "IMSETTINGS_DISABLE_DESKTOP_CHECK: $IMSETTINGS_DISABLE_DESKTOP_CHECK"
-    echo "DBUS_SESSION_BUS_ADDRESS: $DBUS_SESSION_BUS_ADDRESS"
-    echo "GTK_IM_MODULE: $GTK_IM_MODULE"
-    echo "QT_IM_MODULE: $QT_IM_MODULE"
-    echo "XMODIFIERS: $XMODIFIERS"
-    echo "IMSETTINGS_MODULE: $IMSETTINGS_MODULE"
-    echo "IMSETTINGS_INTEGRATE_DESKTOP: $IMSETTINGS_INTEGRATE_DESKTOP"
-    echo ""
+    log "DESKTOP_SESSION: $DESKTOP_SESSION"
+    log "DISABLE_IMSETTINGS: $DISABLE_IMSETTINGS"
+    log "IMSETTINGS_DISABLE_DESKTOP_CHECK: $IMSETTINGS_DISABLE_DESKTOP_CHECK"
+    log "DBUS_SESSION_BUS_ADDRESS: $DBUS_SESSION_BUS_ADDRESS"
+    log "GTK_IM_MODULE: $GTK_IM_MODULE"
+    log "QT_IM_MODULE: $QT_IM_MODULE"
+    log "XMODIFIERS: $XMODIFIERS"
+    log "IMSETTINGS_MODULE: $IMSETTINGS_MODULE"
+    log "IMSETTINGS_INTEGRATE_DESKTOP: $IMSETTINGS_INTEGRATE_DESKTOP"
+    log ""
 }
 
-function output() {
-    OPTS=""
-    if [ -n "$DRY_RUN" ]; then
-	OPTS="-a"
-    fi
-    tee $OPTS $HOME/.imsettings.log
-}
-
 USER_XINPUTRC="$HOME/.xinputrc"
 SYS_XINPUTRC="@XINPUTRC_PATH@/xinputrc"
 
@@ -179,35 +182,26 @@
 [ -z "$IMSETTINGS_MODULE" ] && IMSETTINGS_MODULE="none"
 export IMSETTINGS_MODULE
 
+##
+log_init
+setup_gtk_immodule
+setup_qt_immodule
+setup_xim
+
 # NOTE: Please make sure the session bus is established before running this script.
-(
 if ! is_dbus_enabled; then
-    echo "***"
-    echo "*** No DBus session hasn't been established yet. giving up to deal with Input Method with imsettings."
-    echo "***"
+    log "***"
+    log "*** No DBus session hasn't been established yet. giving up to deal with Input Method with imsettings."
+    log "***"
 
-    setup_gtk_immodule
-    setup_qt_immodule
-    setup_xim
-
     run_xim
 elif ! is_imsettings_enabled; then
-    echo "***"
-    echo "*** imsettings is explicitly disabled."
-    echo "***"
+    log "***"
+    log "*** imsettings is explicitly disabled."
+    log "***"
 
-    setup_gtk_immodule
-    setup_qt_immodule
-    setup_xim
-
     run_xim
 else
     # Yes, we are in the dbus session
-    setup_gtk_immodule
-    setup_qt_immodule
-    setup_xim
-
     run_imsettings
 fi
-# redirect the output to $HOME/.imsettings.log too
-)|output


Index: imsettings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/imsettings/devel/imsettings.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- imsettings.spec	14 Aug 2009 06:54:55 -0000	1.33
+++ imsettings.spec	14 Aug 2009 12:56:12 -0000	1.34
@@ -1,6 +1,6 @@
 Name:		imsettings
 Version:	0.107.1
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	LGPLv2+
 URL:		http://code.google.com/p/imsettings/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -16,6 +16,7 @@ Source0:	http://imsettings.googlecode.co
 Source1: 	imsettings-kde.sh
 Patch0:		imsettings-constraint-of-language.patch
 Patch1:		imsettings-disable-xim.patch
+Patch2:		imsettings-log.patch
 
 Summary:	Delivery framework for general Input Method configuration
 Group:		Applications/System
@@ -82,6 +83,7 @@ This package contains a plugin to get th
 %setup -q
 %patch0 -p1 -b .0-lang
 %patch1 -p1 -b .1-xim
+%patch2 -p0 -b .2-log
 
 %build
 %configure	\
@@ -201,6 +203,9 @@ fi
 
 
 %changelog
+* Fri Aug 14 2009 Akira TAGOH <tagoh at redhat.com> - 0.107.1-2
+- export the certain environment variables.
+
 * Fri Aug 14 2009 Akira TAGOH <tagoh at redhat.com> - 0.107.1-1
 - New upstream release.
   - Fix memory leaks.