packages: imsettings/imsettings-no-bash.patch, imsettings/imsettings.spec -...

qboosh qboosh at pld-linux.org
Fri Jan 20 19:57:09 CET 2012 

Author: qboosh                       Date: Fri Jan 20 18:57:09 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 1.2.7
- updated nobash patch

---- Files affected:
packages/imsettings:
   imsettings-no-bash.patch (1.1 -> 1.2) , imsettings.spec (1.5 -> 1.6) 

---- Diffs:

================================================================
Index: packages/imsettings/imsettings-no-bash.patch
diff -u packages/imsettings/imsettings-no-bash.patch:1.1 packages/imsettings/imsettings-no-bash.patch:1.2
--- packages/imsettings/imsettings-no-bash.patch:1.1	Sun Jul 17 23:02:13 2011
+++ packages/imsettings/imsettings-no-bash.patch	Fri Jan 20 19:57:04 2012
@@ -1,9 +1,9 @@
---- imsettings-1.2.4/data/xinput.sh.in.in.orig	2011-07-17 22:59:00.385360415 +0200
-+++ imsettings-1.2.4/data/xinput.sh.in.in	2011-07-17 22:55:53.000000000 +0200
+--- imsettings-1.2.7/data/xinput.sh.in.in.orig	2012-01-20 19:30:14.868541977 +0100
++++ imsettings-1.2.7/data/xinput.sh.in.in	2012-01-20 19:46:38.011908229 +0100
 @@ -1,4 +1,4 @@
 -#!/bin/bash
 +#!/bin/sh
- # Copyright (C) 1999-2004,2007-2009 Red Hat, Inc. All rights reserved. This
+ # Copyright (C) 1999-2004,2007-2011 Red Hat, Inc. All rights reserved. This
  # copyrighted material is made available to anyone wishing to use, modify,
  # copy, or redistribute it subject to the terms and conditions of the
 @@ -10,27 +10,27 @@
@@ -43,21 +43,39 @@
      return $ret
  }
  
+-function lookup_desktop() {
++lookup_desktop() {
+     ret=$(cat $1)
+     case $ret in
+ 	gnome*)
+@@ -62,7 +62,7 @@
+     esac
+ }
+ 
+-function get_desktop() {
++get_desktop() {
+     if [ -n "$GDMSESSION" ]; then
+ 	GUESS_DESKTOP="\$GDMSESSION"
+ 	echo "$GDMSESSION"
+@@ -89,7 +89,7 @@
+     fi
+ }
+ 
 -function is_gtk_supported() {
 +is_gtk_supported() {
      [ -n "$IMSETTINGS_DISABLE_DESKTOP_CHECK" ] && return 0
-     case "$DESKTOP_SESSION" in
+     case "$(get_desktop|tr '[A-Z]' '[a-z]')" in
  	*gnome|openbox)
-@@ -66,7 +66,7 @@
+@@ -114,7 +114,7 @@
      return 1
  }
  
 -function is_qt_supported() {
 +is_qt_supported() {
      [ -n "$IMSETTINGS_DISABLE_DESKTOP_CHECK" ] && return 0
-     case "$DESKTOP_SESSION" in
+     case "$(get_desktop|tr '[A-Z]' '[a-z]')" in
  	*)
-@@ -79,7 +79,7 @@
+@@ -127,7 +127,7 @@
      return 1
  }
  
@@ -66,7 +84,7 @@
      [ -n "$IMSETTINGS_DISABLE_DESKTOP_CHECK" ] && return 0
      if check_imsettings_capability xim; then
  	return 0
-@@ -88,7 +88,7 @@
+@@ -136,7 +136,7 @@
      return 1
  }
  
@@ -75,7 +93,7 @@
      if is_imsettings_enabled && is_gtk_supported; then
  	# Ensure GTK_IM_MODULE is empty. otherwise GTK+ doesn't pick up immodule through XSETTINGS
  	unset GTK_IM_MODULE
-@@ -98,7 +98,7 @@
+@@ -146,7 +146,7 @@
      fi
  }
  
@@ -84,7 +102,7 @@
      if is_imsettings_enabled && is_qt_supported; then
  	# FIXME: Qt doesn't support XSETTINGS for immodule yet.
  	#        We still need to go with the older way.
-@@ -108,7 +108,7 @@
+@@ -156,7 +156,7 @@
      fi
  }
  
@@ -93,7 +111,7 @@
      if is_imsettings_enabled && is_xim_supported; then
  	# setup XMODIFIERS
  	XMODIFIERS="@im=imsettings"
-@@ -119,7 +119,7 @@
+@@ -167,7 +167,7 @@
      fi
  }
  
@@ -102,7 +120,7 @@
      print_info
      if [ -n "$DRY_RUN" ]; then
  	log "*** DRY RUN MODE: running IM through imsettings"
-@@ -134,7 +134,7 @@
+@@ -182,7 +182,7 @@
      fi
  }
  
@@ -111,7 +129,7 @@
      print_info
      if [ -n "$DRY_RUN" ]; then
  	log "*** DRY RUN MODE: running IM without imsettings"
-@@ -147,7 +147,7 @@
+@@ -195,7 +195,7 @@
      fi
  }
  
@@ -120,7 +138,7 @@
      $1
      if [ $? -eq 0 ]; then
  	log yes
-@@ -156,7 +156,7 @@
+@@ -204,7 +204,7 @@
      fi
  }
  
@@ -129,7 +147,7 @@
      log "imsettings information"
      log "=========================="
      log -n "Is DBus enabled: "
-@@ -187,13 +187,13 @@
+@@ -237,13 +237,13 @@
  unset TERM
  if [ -r /etc/profile.d/lang.sh ]; then
      # for Fedora etc
@@ -146,7 +164,7 @@
  fi
  [ -n "$oldterm" ] && export TERM=$oldterm
  
-@@ -205,7 +205,7 @@
+@@ -255,7 +255,7 @@
  [ -z "$IMSETTINGS_DISABLE_USER_XINPUTRC" ] && IMSETTINGS_DISABLE_USER_XINPUTRC=no
  
  if [ -r "$USER_XINPUTRC" -a "x$IMSETTINGS_DISABLE_USER_XINPUTRC" = "xno" ]; then
@@ -155,7 +173,7 @@
      if [ ! -h "$USER_XINPUTRC" ]; then
  	SHORT_DESC="User Specific"
      fi
-@@ -216,7 +216,7 @@
+@@ -266,7 +266,7 @@
      _sourced_xinputrc=0
      for i in $_im_language_list; do
          if echo $tmplang | grep -q -E "^$i"; then
@@ -164,7 +182,7 @@
              _sourced_xinputrc=1
              break
          fi
-@@ -227,7 +227,7 @@
+@@ -277,7 +277,7 @@
          _xcompose_language_list="am_ET el_GR fi_FI pt_BR ru_RU"
          for i in $_xcompose_language_list; do
              if echo $tmplang | grep -q -E "^$i"; then
@@ -173,7 +191,7 @@
                  _sourced_xinputrc=1
                  break
              fi
-@@ -235,7 +235,7 @@
+@@ -285,7 +285,7 @@
      fi
      if [ $_sourced_xinputrc -eq 0 ]; then
          # Read none.conf to set up properly for locales not listed the above.

================================================================
Index: packages/imsettings/imsettings.spec
diff -u packages/imsettings/imsettings.spec:1.5 packages/imsettings/imsettings.spec:1.6
--- packages/imsettings/imsettings.spec:1.5	Sun Nov 27 13:42:20 2011
+++ packages/imsettings/imsettings.spec	Fri Jan 20 19:57:04 2012
@@ -6,20 +6,22 @@
 Summary:	Delivery framework for general Input Method configuration
 Summary(pl.UTF-8):	Szkielet do ogólnej konfiguracji method wprowadzania znaków
 Name:		imsettings
-Version:	1.2.6
+Version:	1.2.7
 Release:	1
 License:	LGPL v2+
 Group:		Applications/System
 #Source0Download: http://code.google.com/p/imsettings/downloads/list
 Source0:	http://imsettings.googlecode.com/files/%{name}-%{version}.tar.bz2
-# Source0-md5:	7104a2b7413b4ba91d9e12317ec8ee6f
+# Source0-md5:	3ff0fdbf0c339fd34d440151684d10a3
 Patch0:		%{name}-constraint-of-language.patch
 Patch1:		%{name}-no-bash.patch
 URL:		http://code.google.com/p/imsettings/
 BuildRequires:	GConf2-devel >= 2.0
+BuildRequires:	dbus-devel
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext-devel
 BuildRequires:	glib2-devel >= 1:2.26.0
+BuildRequires:	gnome-introspection-devel >= 1.30.0
 BuildRequires:	gtk+2-devel >= 2:2.12.0
 BuildRequires:	gtk-doc >= 1.0
 BuildRequires:	libgxim-devel >= 0.3.1
@@ -284,12 +286,14 @@
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libimsettings.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libimsettings.so.5
+%{_libdir}/girepository-1.0/IMSettings-1.2.typelib
 
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libimsettings.so
 %{_pkgconfigdir}/imsettings.pc
 %{_includedir}/imsettings
+%{_datadir}/gir-1.0/IMSettings-1.2.gir
 %{_gtkdocdir}/imsettings
 
 %files static
@@ -329,6 +333,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.6  2012/01/20 18:57:04  qboosh
+- updated to 1.2.7
+- updated nobash patch
+
 Revision 1.5  2011/11/27 12:42:20  qboosh
 - updated to 1.2.6
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/imsettings/imsettings-no-bash.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/imsettings/imsettings.spec?r1=1.5&r2=1.6&f=u

More information about the pld-cvs-commit mailing list