Accepting request 199010 from home:ftake:ibus-fedora

fix regression caused by the previous update.

OBS-URL: https://build.opensuse.org/request/show/199010
OBS-URL: https://build.opensuse.org/package/show/M17N/ibus?expand=0&rev=74

ibus.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Sep 13 13:49:44 UTC 2013 - ftake@geeko.jp
+
+- Fix dconf schema was not updated for automatic configuration
+- Fix 00-upstream-settings was wrongly marked as %config
+- Fix /etc/dconf/db/ibus was not owned by package
+- Add %if %endif for automatic configuration 
+
 -------------------------------------------------------------------
 Thu Sep 12 17:29:24 UTC 2013 - ftake@geeko.jp
 

ibus.spec

@@ -16,6 +16,8 @@
 #
 
 
+%define with_automatic_config 1
+
 Name:           ibus
 Version:        1.5.3
 Release:        0
@@ -28,16 +30,21 @@ Source:         http://ibus.googlecode.com/files/%{name}-%{version}.tar.gz
 Source2:        ibus-README.suse  
 Source3:        xim.ibus.suse.template
 Source4:        xim.d-ibus-121
+%if %{with_automatic_config}
 Patch0:         ibus-python-install-dir.patch
 # PATCH-FEATURE-UPSTREAM add-libgnomekbd-and-load-preload-engines-69171c9c.patch Issue 1641 ftake@geeko.jp
 Patch1:         add-libgnomekbd-and-load-preload-engines-69171c9c.patch
 # PATCH-FEATURE-UPSTREAM reload-preload-engines-until-users-customize-the-list-95fd937e.patch Issue 1641 ftake@geeko.jp
 Patch2:         reload-preload-engines-until-users-customize-the-list-95fd937e.patch
+%endif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 PreReq:         /usr/bin/touch
 Provides:       locale(ja;ko;zh)
 BuildRequires:  dbus-1-glib-devel
 BuildRequires:  dbus-1-python-devel >= 0.83.0
+%if %{with_automatic_config}
+BuildRequires:  dbus-1-x11
+%endif
 BuildRequires:  dconf-devel >= 0.7.5
 BuildRequires:  fdupes
 BuildRequires:  gconf2-devel
@@ -48,7 +55,9 @@ BuildRequires:  gtk-doc >= 1.9
 BuildRequires:  gtk2-devel
 BuildRequires:  intltool
 BuildRequires:  iso-codes-devel
+%if %{with_automatic_config}
 BuildRequires:  libgnomekbd-devel
+%endif
 BuildRequires:  libnotify-devel >= 0.7
 BuildRequires:  libtool
 BuildRequires:  pkg-config
@@ -147,8 +156,13 @@ docs for ibus.
 %prep
 %setup -q
 %patch0 -p1
+
+%if %{with_automatic_config}
 %patch1 -p1
 %patch2 -p1
+rm -f bindings/vala/ibus-1.0.vapi
+rm -f data/dconf/00-upstream-settings
+%endif
 
 %build
 autoreconf -fi
@@ -161,9 +175,16 @@ intltoolize -f
            --disable-gconf \
            --enable-dconf \
            --enable-gtk-doc \
+%if %{with_automatic_config}
            --enable-libgnomekbd \
+%endif
            --enable-surrounding-text \
-           --libexecdir=%{_prefix}/%{_lib}/ibus 
+           --libexecdir=%{_prefix}/%{_lib}/ibus
+
+%if %{with_automatic_config}
+make -C ui/gtk3 maintainer-clean-generic
+%endif
+
 make %{?jobs:-j %jobs}
 
 %install
@@ -195,6 +216,11 @@ mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
 ln -sf %{_datadir}/icons/hicolor/48x48/apps/ibus-keyboard.png \
   $RPM_BUILD_ROOT%{_datadir}/pixmaps/ibus-keyboard.png
 
+%if 0%{suse_version} <= 1220
+# touch for %%ghost
+touch $RPM_BUILD_ROOT/%{_sysconfdir}/dconf/db/ibus
+%endif
+
 %suse_update_desktop_file  %name-setup System Utility settings
 
 %fdupes %buildroot/%_prefix
@@ -249,7 +275,11 @@ dconf update
 %{_datadir}/pixmaps/*
 %{_prefix}/%{_lib}/ibus
 %{_datadir}/bash-completion
-%config %{_sysconfdir}/dconf/
+%dir %config %{_sysconfdir}/dconf/db/ibus.d
+# These files are not config files. Users must not modify them.
+%{_sysconfdir}/dconf/db/ibus.d/00-upstream-settings
+%ghost %{_sysconfdir}/dconf/db/ibus
+%{_sysconfdir}/dconf/profile/ibus
 %{_mandir}/man1/ibus*
 
 %files lang -f ibus10.lang