[packages/imsettings] - updated to 1.7.0 - updated no-bash patch

Sun Feb 28 16:42:38 CET 2016

commit 9c9b1f79bc4f49d9b839c8eeaf2c14f1af1027f1
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sun Feb 28 16:46:02 2016 +0100

    - updated to 1.7.0
    - updated no-bash patch

 imsettings-no-bash.patch | 46 +++++++++++++++++++++++-----------------------
 imsettings.spec          | 16 ++++++++++------
 2 files changed, 33 insertions(+), 29 deletions(-)
---

diff --git a/imsettings.spec b/imsettings.spec
index fe6f005..aa67926 100644
--- a/imsettings.spec
+++ b/imsettings.spec
@@ -7,12 +7,12 @@
 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.6.8
-Release:	3
+Version:	1.7.0
+Release:	1
 License:	LGPL v2+
 Group:		Applications/System
 Source0:	https://bitbucket.org/tagoh/imsettings/downloads/%{name}-%{version}.tar.bz2
-# Source0-md5:	c31429f1d60e36d7f811f871c75b6c41
+# Source0-md5:	decc1e438da81bcf84fa4156529475e4
 Patch0:		%{name}-constraint-of-language.patch
 Patch1:		%{name}-no-bash.patch
 URL:		https://tagoh.bitbucket.org/imsettings/
@@ -336,6 +336,8 @@ rm -rf $RPM_BUILD_ROOT
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/imsettings/*.a
 %endif
 
+%{__mv} $RPM_BUILD_ROOT%{_localedir}/{eu_ES,eu}
+
 %find_lang %{name}
 
 %clean
@@ -349,7 +351,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc AUTHORS ChangeLog NEWS README
 
 %attr(755,root,root) %{_sysconfdir}/X11/xinit/xinitrc.d/50-xinput.sh
-%{_sysconfdir}/X11/xinit/xinput.d/*.conf
+%{_sysconfdir}/X11/xinit/xinput.d/none.conf
+%{_sysconfdir}/X11/xinit/xinput.d/xcompose.conf
+%{_sysconfdir}/X11/xinit/xinput.d/xim.conf
 %{_sysconfdir}/xdg/autostart/imsettings-start.desktop
 
 %attr(755,root,root) %{_bindir}/imsettings-reload
@@ -372,14 +376,14 @@ rm -rf $RPM_BUILD_ROOT
 %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.3.typelib
+%{_libdir}/girepository-1.0/IMSettings-1.7.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.3.gir
+%{_datadir}/gir-1.0/IMSettings-1.7.gir
 %{_gtkdocdir}/imsettings
 
 %if %{with static_libs}
diff --git a/imsettings-no-bash.patch b/imsettings-no-bash.patch
index e4add7a..8895092 100644
--- a/imsettings-no-bash.patch
+++ b/imsettings-no-bash.patch
@@ -1,15 +1,15 @@
---- imsettings-1.5.0/data/imsettings-functions.in.orig	2012-11-25 18:33:02.248463652 +0100
-+++ imsettings-1.5.0/data/imsettings-functions.in	2012-11-25 18:47:20.531779098 +0100
-@@ -11,7 +11,7 @@
- #
- # X Input method setup script
+--- imsettings-1.7.0/data/imsettings-functions.in.orig	2016-02-22 07:30:18.000000000 +0100
++++ imsettings-1.7.0/data/imsettings-functions.in	2016-02-28 15:24:33.962090210 +0100
+@@ -23,7 +23,7 @@
+ LOGDIR="${XDG_CACHE_HOME:-$HOME/.cache}/imsettings"
+ LOGFILE="$LOGDIR/log"
  
 -function log_init() {
 +log_init() {
      if [ ! -n "$DRY_RUN" ]; then
  	if [ -f $HOME/.imsettings.log ]; then
  	    mv $HOME/.imsettings.log $LOGFILE.bak
-@@ -21,20 +21,20 @@
+@@ -33,20 +33,20 @@
      fi
  }
  
@@ -34,7 +34,7 @@
      mod=$1
      @libexecdir[@]/imsettings-check --check-modules >/dev/null
      ret=$?
-@@ -45,7 +45,7 @@
+@@ -57,7 +57,7 @@
      return $ret
  }
  
@@ -42,17 +42,17 @@
 +lookup_desktop() {
      ret=$(cat $1)
      case $ret in
- 	gnome*)
-@@ -69,7 +69,7 @@
+ 	cinnamon*)
+@@ -84,7 +84,7 @@
      esac
  }
  
 -function get_desktop() {
 +get_desktop() {
-     if [ -n "$GDMSESSION" ]; then
- 	GUESS_DESKTOP="\$GDMSESSION"
- 	echo "$GDMSESSION"
-@@ -96,7 +96,7 @@
+     if [ -n "$IMSETTINGS_DESKTOP" ]; then
+ 	GUESS_DESKTOP="\$IMSETTINGS_DESKTOP"
+ 	echo "$IMSETTINGS_DESKTOP"
+@@ -114,7 +114,7 @@
      fi
  }
  
@@ -60,8 +60,8 @@
 +is_gtk_supported() {
      [ -n "$IMSETTINGS_DISABLE_DESKTOP_CHECK" ] && return 0
      case "$(get_desktop|tr '[A-Z]' '[a-z]')" in
- 	*gnome|openbox)
-@@ -126,7 +126,7 @@
+ 	cinnamon*)
+@@ -149,7 +149,7 @@
      return 1
  }
  
@@ -70,7 +70,7 @@
      [ -n "$IMSETTINGS_DISABLE_DESKTOP_CHECK" ] && return 0
      case "$(get_desktop|tr '[A-Z]' '[a-z]')" in
  	*)
-@@ -139,7 +139,7 @@
+@@ -162,7 +162,7 @@
      return 1
  }
  
@@ -79,7 +79,7 @@
      [ -n "$IMSETTINGS_DISABLE_DESKTOP_CHECK" ] && return 0
      if check_imsettings_capability xim; then
  	return 0
-@@ -148,7 +148,7 @@
+@@ -171,7 +171,7 @@
      return 1
  }
  
@@ -88,7 +88,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
-@@ -158,7 +158,7 @@
+@@ -181,7 +181,7 @@
      fi
  }
  
@@ -97,7 +97,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.
-@@ -168,7 +168,7 @@
+@@ -191,7 +191,7 @@
      fi
  }
  
@@ -106,7 +106,7 @@
      if is_imsettings_enabled && is_xim_supported; then
  	# setup XMODIFIERS
  	XMODIFIERS="@im=imsettings"
-@@ -179,7 +179,7 @@
+@@ -202,7 +202,7 @@
      fi
  }
  
@@ -115,7 +115,7 @@
      print_info
      if [ -n "$DRY_RUN" ]; then
  	log "*** DRY RUN MODE: running IM through imsettings"
-@@ -194,7 +194,7 @@
+@@ -217,7 +217,7 @@
      fi
  }
  
@@ -124,7 +124,7 @@
      print_info
      if [ -n "$DRY_RUN" ]; then
  	log "*** DRY RUN MODE: running IM without imsettings"
-@@ -207,7 +207,7 @@
+@@ -230,7 +230,7 @@
      fi
  }
  
@@ -133,7 +133,7 @@
      $1
      if [ $? -eq 0 ]; then
  	log yes
-@@ -216,7 +216,7 @@
+@@ -239,7 +239,7 @@
      fi
  }
  
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/imsettings.git/commitdiff/9c9b1f79bc4f49d9b839c8eeaf2c14f1af1027f1

