[imsettings] - New upstream release. - fix a locale handling (#526205)
Akira TAGOH
tagoh at fedoraproject.org
Wed Jan 5 11:08:01 UTC 2011
commit 7ee66b59496c8aa99873511134e6a641bc3c9f30
Author: Akira TAGOH <tagoh at redhat.com>
Date: Wed Jan 5 20:07:50 2011 +0900
- New upstream release.
- fix a locale handling (#526205)
.gitignore | 1 +
imsettings-fix-build.patch | 11 ---
imsettings-kde.sh | 4 -
imsettings-libnotify07.patch | 24 -------
imsettings.spec | 158 ++++++++++++++++++++++--------------------
sources | 2 +-
6 files changed, 85 insertions(+), 115 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 03080c3..3cd0304 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,3 +20,4 @@ imsettings-0.107.3.tar.bz2
imsettings-0.107.4.tar.bz2
imsettings-0.108.0.tar.bz2
imsettings-0.108.1.tar.bz2
+/imsettings-1.0.0.tar.bz2
diff --git a/imsettings.spec b/imsettings.spec
index 7c4561c..0c12dbc 100644
--- a/imsettings.spec
+++ b/imsettings.spec
@@ -1,36 +1,30 @@
Name: imsettings
-Version: 0.108.1
-Release: 4%{?dist}
+Version: 1.0.0
+Release: 1%{?dist}
License: LGPLv2+
URL: http://code.google.com/p/imsettings/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: desktop-file-utils
BuildRequires: intltool gettext
BuildRequires: libtool automake autoconf
-BuildRequires: dbus-devel >= 0.23, dbus-glib-devel >= 0.74, glib2 >= 2.16
-BuildRequires: libgxim-devel >= 0.3.1, libnotify-devel
+BuildRequires: glib2 >= 2.26.0
+BuildRequires: libnotify-devel
+BuildRequires: libX11-devel, libgxim-devel >= 0.3.1
+BuildRequires: GConf2-devel
+BuildRequires: qt-devel
%if !0%{?rhel}
BuildRequires: xfconf-devel
%endif
-BuildRequires: GConf2-devel
-BuildRequires: libX11-devel
Source0: http://imsettings.googlecode.com/files/%{name}-%{version}.tar.bz2
-# workaround for KDE, it will be removed when we have a correct fix
-Source1: imsettings-kde.sh
Patch0: imsettings-constraint-of-language.patch
Patch1: imsettings-disable-xim.patch
Patch2: imsettings-xinput-xcompose.patch
-# https://bugzilla.redhat.com/show_bug.cgi?id=649063
-Patch3: imsettings-libnotify07.patch
-Patch4: imsettings-fix-build.patch
Summary: Delivery framework for general Input Method configuration
Group: Applications/System
Requires: xorg-x11-xinit >= 1.0.2-22.fc8
Requires: imsettings-libs = %{version}-%{release}
-Requires(pre): GConf2
-Requires(post): /bin/dbus-send %{_sbindir}/alternatives GConf2
-Requires(preun): GConf2
+Requires(post): /bin/dbus-send %{_sbindir}/alternatives
Requires(postun): /bin/dbus-send %{_sbindir}/alternatives
%description
@@ -58,8 +52,7 @@ Summary: Development files for imsettings
Group: Development/Libraries
Requires: %{name}-libs = %{version}-%{release}
Requires: pkgconfig
-Requires: glib2-devel >= 2.16.0
-Requires: dbus-glib-devel >= 0.74
+Requires: glib2-devel >= 2.26.0
%description devel
IMSettings is a framework that delivers Input Method
@@ -70,6 +63,50 @@ or the desktop.
This package contains the development files to make any
applications with imsettings.
+%package xim
+Summary: XIM support on imsettings
+Group: Applications/System
+Requires: %{name} = %{version}-%{release}
+Requires: im-chooser
+
+%description xim
+IMSettings is a framework that delivers Input Method
+settings and applies the changes so they take effect
+immediately without any need to restart applications
+or the desktop.
+
+This package contains a module to get this working with XIM.
+
+%package gnome
+Summary: GNOME support on imsettings
+Group: Applications/System
+Requires: %{name} = %{version}-%{release}
+Requires: im-chooser-gnome3
+
+%description gnome
+IMSettings is a framework that delivers Input Method
+settings and applies the changes so they take effect
+immediately without any need to restart applications
+or the desktop.
+
+This package contains a module to get this working on
+GNOME.
+
+%package qt
+Summary: Qt support on imsettings
+Group: Applications/System
+Requires: %{name} = %{version}-%{release}
+Requires: im-chooser
+
+%description qt
+IMSettings is a framework that delivers Input Method
+settings and applies the changes so they take effect
+immediately without any need to restart applications
+or the desktop.
+
+This package contains a module to get this working on Qt
+applications.
+
%if !0%{?rhel}
%package xfce
Summary: Xfce support on imsettings
@@ -84,7 +121,7 @@ settings and applies the changes so they take effect
immediately without any need to restart applications
or the desktop.
-This package contains a plugin to get this working on Xfce.
+This package contains a module to get this working on Xfce.
%package lxde
Summary: LXDE support on imsettings
@@ -98,7 +135,7 @@ settings and applies the changes so they take effect
immediately without any need to restart applications
or the desktop.
-This package contains a helper program to get this working on LXDE.
+This package contains a module to get this working on LXDE.
%endif
%prep
@@ -106,8 +143,6 @@ This package contains a helper program to get this working on LXDE.
%patch0 -p1 -b .0-lang
%patch1 -p1 -b .1-xim
%patch2 -p1 -b .2-xcompose
-%patch3 -p1 -b .3-libnotify07
-%patch4 -p1 -b .4-dbus-build
%build
%configure \
@@ -128,63 +163,27 @@ chmod 0755 $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinitrc.d/50-xinput.sh
# clean up the unnecessary files
rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
-rm -f $RPM_BUILD_ROOT%{_libdir}/xfce4/mcs-plugins/*.la
+rm -f $RPM_BUILD_ROOT%{_libdir}/imsettings/*.la
%if 0%{?rhel}
-rm -f $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/imsettings-xfce-helper.desktop
-rm -f $RPM_BUILD_ROOT%{_bindir}/imsettings-xfce-helper
-rm -f $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/imsettings-lxde-helper.desktop
-rm -f $RPM_BUILD_ROOT%{_bindir}/imsettings-lxde-helper
+rm -f $RPM_BUILD_ROOT%{_libdir}/imsettings/libimsettings-{lxde,xfce}.so
%endif
-# still not stable
-rm -f $RPM_BUILD_ROOT%{_datadir}/dbus-1/services/qt-im-settings-daemon.service
-rm -f $RPM_BUILD_ROOT%{_libexecdir}/qt-im-settings-daemon
-
-# workaround for KDE
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/kde/env
-install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/kde/env/
-
-# disable running applet by default
-rm -f $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/imsettings-applet.desktop
-
-#desktop-file-install \
-# --delete-original \
-# --dir=$RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart \
-# $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/imsettings-applet.desktop
-
%find_lang %{name}
%clean
rm -rf $RPM_BUILD_ROOT
-%pre
-%gconf_schema_prepare imsettings-applet
-#if [ "$1" -gt 1 ]; then
-# export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-# if [ -f %{_sysconfdir}/gconf/schemas/imsettings-applet.schemas ]; then
-# gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/imsettings-applet.schemas > /dev/null || :
-# fi
-#fi
-
%post
-%gconf_schema_upgrade imsettings-applet
-#export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-#gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/imsettings-applet.schemas > /dev/null || :
alternatives --install %{_sysconfdir}/X11/xinit/xinputrc xinputrc %{_sysconfdir}/X11/xinit/xinput.d/none.conf 10
+alternatives --install %{_sysconfdir}/X11/xinit/xinputrc xinputrc %{_sysconfdir}/X11/xinit/xinput.d/xcompose.conf 20
alternatives --install %{_sysconfdir}/X11/xinit/xinputrc xinputrc %{_sysconfdir}/X11/xinit/xinput.d/xim.conf 30
dbus-send --system --type=method_call --dest=org.freedesktop.DBus / org.freedesktop.DBus.ReloadConfig > /dev/null 2>&1 || :
-%preun
-%gconf_schema_remove imsettings-applet
-#if [ "$1" -eq 0 ]; then
-# export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-# gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/imsettings-applet.schemas > /dev/null || :
-#fi
-
%postun
if [ "$1" = 0 ]; then
alternatives --remove xinputrc %{_sysconfdir}/X11/xinit/xinput.d/none.conf
+ alternatives --remove xinputrc %{_sysconfdir}/X11/xinit/xinput.d/xcompose.conf
alternatives --remove xinputrc %{_sysconfdir}/X11/xinit/xinput.d/xim.conf
dbus-send --system --type=method_call --dest=org.freedesktop.DBus / org.freedesktop.DBus.ReloadConfig > /dev/null 2>&1 || :
fi
@@ -195,55 +194,64 @@ fi
%files -f %{name}.lang
%defattr(-, root, root, -)
%doc AUTHORS COPYING ChangeLog NEWS README
-%{_bindir}/imsettings-applet
%{_bindir}/imsettings-info
%{_bindir}/imsettings-list
%{_bindir}/imsettings-reload
-%{_bindir}/imsettings-restart
-%{_bindir}/imsettings-start
-%{_bindir}/imsettings-stop
-%{_bindir}/imsettings-xim
-%{_libexecdir}/gconf-im-settings-daemon
-%{_libexecdir}/im-settings-daemon
+%{_bindir}/imsettings-switch
+%{_libexecdir}/imsettings-daemon
%{_libexecdir}/xinputinfo.sh
%{_datadir}/dbus-1/services/*.service
%{_datadir}/pixmaps/*.png
%{_sysconfdir}/X11/xinit/xinitrc.d/50-xinput.sh
%{_sysconfdir}/X11/xinit/xinput.d
%{_sysconfdir}/xdg/autostart/imsettings-start.desktop
-%{_sysconfdir}/gconf/schemas/imsettings-applet.schemas
-%{_sysconfdir}/kde/env/*.sh
%files libs
%defattr(-, root, root, -)
%doc AUTHORS COPYING ChangeLog NEWS README
%{_libdir}/libimsettings.so.*
-%{_libdir}/libimsettings-xim.so.*
%files devel
%defattr(-, root, root, -)
%doc AUTHORS COPYING ChangeLog NEWS README
%{_includedir}/imsettings
%{_libdir}/libimsettings.so
-%{_libdir}/libimsettings-xim.so
%{_libdir}/pkgconfig/imsettings.pc
+%files xim
+%defattr(-, root, root, -)
+%doc AUTHORS COPYING ChangeLog NEWS README
+%{_bindir}/imsettings-xim
+%{_libdir}/imsettings/libimsettings-xim.so
+
+%files gnome
+%defattr(-, root, root, -)
+%doc AUTHORS COPYING ChangeLog NEWS README
+%{_libdir}/imsettings/libimsettings-gconf.so
+
+%files qt
+%defattr(-, root, root, -)
+%doc AUTHORS COPYING ChangeLog NEWS README
+%{_libdir}/imsettings/libimsettings-qt.so
+
%if !0%{?rhel}
%files xfce
%defattr(-, root, root, -)
%doc AUTHORS COPYING ChangeLog NEWS README
-%{_bindir}/imsettings-xfce-helper
-%{_sysconfdir}/xdg/autostart/imsettings-xfce-helper.desktop
+%{_libdir}/imsettings/libimsettings-xfce.so
%files lxde
%defattr(-, root, root, -)
%doc AUTHORS COPYING ChangeLog NEWS README
-%{_bindir}/imsettings-lxde-helper
-%{_sysconfdir}/xdg/autostart/imsettings-lxde-helper.desktop
+%{_libdir}/imsettings/libimsettings-lxde.so
%endif
%changelog
+* Wed Jan 5 2011 Akira TAGOH <tagoh at redhat.com> - 1.0.0-1
+- New upstream release.
+ - fix a locale handling (#526205)
+
* Thu Nov 4 2010 Akira TAGOH <tagoh at redhat.com> - 0.108.1-4
- Fix the build fail in the LXDE backend.
diff --git a/sources b/sources
index c52da9f..3d57b35 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4c403d86c774ca8fb0c9c582821de462 imsettings-0.108.1.tar.bz2
+7c80675cef059d435b477a33cd3218be imsettings-1.0.0.tar.bz2
More information about the scm-commits
mailing list