new upstream release

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@6919 ec354946-7b23-47d6-9f5a-488ba84defc7

g/gnome-tweak-tool/gnome-tweak-tool-vl.spec

@@ -1,11 +1,11 @@
 Name:           gnome-tweak-tool
-Version:        3.5.5
+Version:        3.6.0
 Release:        1%{?_dist_release}
 Summary:        A tool to customize advanced GNOME 3 options
 
 License:        GPLv3
 URL:            http://live.gnome.org/GnomeTweakTool
-Source0:        http://ftp.gnome.org/pub/gnome/sources/%{name}/3.5/%{name}-%{version}.tar.xz
+Source0:        http://ftp.gnome.org/pub/gnome/sources/%{name}/3.6/%{name}-%{version}.tar.xz
 
 Patch101:	gnome-tweak-tool-vine-customize.patch
 
@@ -83,6 +83,10 @@ fi
 
 
 %changelog
+* Thu Oct 11 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.6.0-1
+- new upstream release
+- update Patch101
+
 * Tue Oct 02 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.5.5-1
 - new upstream release
 - update Patch101

i/ibus/ibus-vl.spec

@@ -1,6 +1,6 @@
 %define build_compat32 %{?_with_compat32:1}%{!?_with_compat32:0}
 
-%define	ver 1.4.99.20120822
+%define	ver 1.4.99.20121006
 %define	rel 1
 
 %define gjsver 3.4.1.20120815
@@ -32,11 +32,7 @@ Patch2:  ibus-541492-xkb.patch
 Patch3:  ibus-530711-preload-sys.patch
 Patch4:  ibus-xx-setup-frequent-lang.patch
 
-# Workaround to disable preedit on gnome-shell until bug 658420 is fixed.
-# https://bugzilla.gnome.org/show_bug.cgi?id=658420
-Patch5: ibus-xx-g-s-disable-preedit.patch
 Patch6: ibus-xx-no-use.diff
-Patch7: ibus-xx-f18-build.patch
 
 # add Shift+space as trigger key instead of Ctrl+space
 Patch20: ibus-1.3.9-vine.patch
@@ -146,8 +142,6 @@ zcat %SOURCE1 | tar xf -
 %endif
 
 # %patch0 -p1
-%patch5 -p1 -b .g-s-preedit
-cp client/gtk2/ibusimcontext.c client/gtk3/ibusimcontext.c ||
 %patch1 -p1 -b .noswitch
 %if %have_libxkbfile
 %patch2 -p1 -b .xkb
@@ -158,15 +152,11 @@ rm -f data/dconf/00-upstream-settings
 %patch4 -p1 -b .setup-frequent-lang
 
 %patch6 -p1 -b .no-used
-%patch7 -p1 -b .f18
 
 %patch20 -p1 -b .vine
 
 %if %have_libxkbfile
-aclocal -I m4
-autoheader
-autoconf -f
-automake -a -c -f
+autoreconf -if
 %endif
 %configure \
 	--disable-static \
@@ -266,10 +256,17 @@ fi
 touch --no-create %{_datadir}/icons/hicolor || :
 [ -x %{_bindir}/gtk-update-icon-cache ] && \
   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
+if [ "$1" -eq 0 ]; then
+  glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
+  dconf update
+  if [ -f %{_sysconfdir}/dconf/db/ibus ] ; then
+      rm -f %{_sysconfdir}/dconf/db/ibus
+  fi
+fi
 
 %posttrans
 glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
+dconf update
 
 %post gtk3
 %{_bindir}/gtk-query-immodules-3.0 --update-cache
@@ -309,7 +306,6 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
 %{_datadir}/glib-2.0/schemas/org.freedesktop.ibus.gschema.xml
 %{_datadir}/applications/*
 %{_datadir}/ibus
-%{_datadir}/gtk-doc/html/ibus
 %{_datadir}/icons/hicolor/*/apps/*
 %{_sysconfdir}/bash_completion.d/ibus.bash
 %{_sysconfdir}/dconf/db/ibus.d/00-upstream-settings
@@ -327,6 +323,7 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
 %{_datadir}/vala/vapi/ibus-1.0.vapi
 %{_datadir}/vala/vapi/ibus-1.0.deps
 %{_datadir}/gir-1.0/IBus-1.0.gir
+%{_datadir}/gtk-doc/html/ibus
 
 %files gtk3
 %defattr(-,root,root,-)
@@ -353,6 +350,16 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
 %endif
 
 %changelog
+* Sat Sep 29 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.4.99.20121006-1
+- update to ibus-1.4.99.20121006-1
+- update following source and patches from fedora
+  - Patch2: ibus-541492-xkb.patch
+  - Patch3: ibus-530711-preload-sys.patch
+  - Patch4: ibus-xx-setup-frequent-lang.patch
+  - Patch6: ibus-xx-no-use.diff
+- remove Patch5 (ibus-xx-g-s-disable-preedit.patch)
+- remove Patch7 (ibus-xx-f18-build.patch)
+
 * Sat Sep 29 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.4.99.20120822-1
 - update to ibus-1.4.99.20120822-1
 - update to ibus-gjs-3.4.1.20120815