rpms/imsettings/F-9 imsettings-constraint-of-language.patch, NONE, 1.1 imsettings-disable-xim.patch, NONE, 1.1 imsettings.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Akira TAGOH (tagoh)
fedora-extras-commits at redhat.com
Tue Jul 8 07:37:30 UTC 2008
Author: tagoh
Update of /cvs/pkgs/rpms/imsettings/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16261
Modified Files:
.cvsignore sources
Added Files:
imsettings-constraint-of-language.patch
imsettings-disable-xim.patch imsettings.spec
Log Message:
import to F-9
imsettings-constraint-of-language.patch:
--- NEW FILE imsettings-constraint-of-language.patch ---
diff -ruN imsettings-0.101.1.orig/data/xinput.sh.in.in imsettings-0.101.1/data/xinput.sh.in.in
--- imsettings-0.101.1.orig/data/xinput.sh.in.in 2008-06-03 20:53:49.000000000 +0900
+++ imsettings-0.101.1/data/xinput.sh.in.in 2008-06-12 23:03:51.000000000 +0900
@@ -43,7 +43,14 @@
SHORT_DESC="User Specific"
fi
elif [ -r "$SYS_XINPUTRC" ]; then
- source "$SYS_XINPUTRC"
+ # FIXME: This hardcoded list has to be gone in the future.
+ _language_list="as bn gu hi ja kn ko ml mr ne or pa si ta te th ur vi zh"
+ for i in $_language_list; do
+ if echo $tmplang | grep -q -E "^$i"; then
+ source "$SYS_XINPUTRC"
+ break
+ fi
+ done
fi
[ -z "$XIM" ] && XIM=none
imsettings-disable-xim.patch:
--- NEW FILE imsettings-disable-xim.patch ---
diff -pruN imsettings-0.101.2.orig/data/xinput.sh.in.in imsettings-0.101.2/data/xinput.sh.in.in
--- imsettings-0.101.2.orig/data/xinput.sh.in.in 2008-06-03 20:53:49.000000000 +0900
+++ imsettings-0.101.2/data/xinput.sh.in.in 2008-06-26 11:52:33.000000000 +0900
@@ -60,8 +60,8 @@ export GTK_IM_MODULE
[ -n "$QT_IM_MODULE" ] && export QT_IM_MODULE
# setup XMODIFIERS
-XMODIFIERS="@im=imsettings"
-export XMODIFIERS
+[ -z "$XMODIFIERS" -a -n "$XIM" ] && XMODIFIERS="@im=$XIM"
+[ -n "$XMODIFIERS" ] && export XMODIFIERS
# start IM via imsettings
IMSETTINGS_MODULE=${SHORT_DESC:-${XIM}}
--- NEW FILE imsettings.spec ---
Name: imsettings
Version: 0.101.3
Release: 1%{?dist}
License: LGPLv2+
URL: http://code.google.com/p/imsettings/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: intltool gettext
BuildRequires: dbus-devel >= 0.23, dbus-glib-devel >= 0.74, glib2 >= 2.16
BuildRequires: xfce-mcs-manager-devel libxfce4mcs-devel
BuildRequires: GConf2-devel
BuildRequires: libX11-devel
Source0: http://imsettings.googlecode.com/files/%{name}-%{version}.tar.bz2
Patch0: imsettings-constraint-of-language.patch
Patch1: imsettings-disable-xim.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(post): /bin/dbus-send %{_sbindir}/alternatives
Requires(postun): /bin/dbus-send %{_sbindir}/alternatives
%description
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 the core DBus services and some utilities.
%package libs
Summary: Libraries for imsettings
Group: Development/Libraries
%description libs
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 the shared library for imsettings.
%package devel
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
%description devel
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 the development files to make any
applications with imsettings.
%package xfce
Summary: Xfce support on imsettings
Group: Applications/System
Requires: %{name} = %{version}-%{release}
Requires: im-chooser
%description xfce
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 plugin to get this working on Xfce.
%prep
%setup -q
%patch0 -p1 -b .0-lang
%patch1 -p1 -b .1-xim
%build
%configure \
--with-xinputsh=50-xinput.sh \
--disable-static
make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
# change the file attributes
chmod 0755 $RPM_BUILD_ROOT%{_libexecdir}/xinputinfo.sh
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
# 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
%find_lang %{name}
%clean
rm -rf $RPM_BUILD_ROOT
%post
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/xim.conf 30
dbus-send --system --type=method_call --dest=org.freedesktop.DBus / org.freedesktop.DBus.ReloadConfig > /dev/null 2>&1 || :
%postun
if [ "$1" = 0 ]; then
alternatives --remove xinputrc %{_sysconfdir}/X11/xinit/xinput.d/none.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
%post libs -p /sbin/ldconfig
%postun libs -p /sbin/ldconfig
%files -f %{name}.lang
%defattr(-, root, root, -)
%doc AUTHORS COPYING ChangeLog NEWS README
%{_bindir}/imsettings-*
%{_libexecdir}/gconf-im-settings-daemon
%{_libexecdir}/im-info-daemon
%{_libexecdir}/im-settings-daemon
%{_libexecdir}/xinputinfo.sh
%{_datadir}/dbus-1/services/*.service
%{_sysconfdir}/X11/xinit/xinitrc.d/50-xinput.sh
%{_sysconfdir}/X11/xinit/xinput.d
%files libs
%defattr(-, root, root, -)
%doc AUTHORS COPYING ChangeLog NEWS README
%{_libdir}/libimsettings.so.*
%files devel
%defattr(-, root, root, -)
%doc AUTHORS COPYING ChangeLog NEWS README
%{_includedir}/imsettings
%{_libdir}/libimsettings.so
%{_libdir}/pkgconfig/imsettings.pc
%files xfce
%defattr(-, root, root, -)
%doc AUTHORS COPYING ChangeLog NEWS README
%{_libdir}/xfce4/mcs-plugins/imsettings_plugin.so
%changelog
* Thu Jul 3 2008 Akira TAGOH <tagoh at redhat.com> - 0.101.3-1
- New upstream release.
- Use the system-wide xinputrc if .xinputrc is a dangling
symlink. (#453358)
* Thu Jun 26 2008 Akira TAGOH <tagoh at redhat.com> - 0.101.2-3
- Disable XIM support so far. (#452849, #452870)
* Wed Jun 18 2008 Akira TAGOH <tagoh at redhat.com> - 0.101.2-2
- Backport patch from upstream to solve issues.
- always saying IM is running when no .xinputrc.
- workaround for a delay of that IM is ready for XIM.
* Tue Jun 17 2008 Akira TAGOH <tagoh at redhat.com> - 0.101.2-1
- New upstream release.
- Fix a typo in the help message. (#451739)
- Fix a invalid memory access. (#451753)
* Mon Jun 16 2008 Akira TAGOH <tagoh at redhat.com> - 0.101.1-2
- Add Reqruies: glib2-devel, dbus-glib-devel to -devel.
* Thu Jun 12 2008 Akira TAGOH <tagoh at redhat.com> - 0.101.1-1
- New upstream release.
- Add Requires pkgconfig to -devel.
* Wed Jun 11 2008 Akira TAGOH <tagoh at redhat.com> - 0.101.0-1
- New upstream release.
- Add Requires alternatives for %%post and %%postun.
- Improve summary.
- Remove imsettings-reload from %%post and %%postun. these are
no longer needed.
* Wed Jun 4 2008 Akira TAGOH <tagoh at redhat.com> - 0.100.0-1
- Initial package.
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/imsettings/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 13 Jun 2008 16:39:26 -0000 1.1
+++ .cvsignore 8 Jul 2008 07:36:44 -0000 1.2
@@ -0,0 +1,4 @@
+*.bz2
+*.gz
+*.rpm
+imsettings-0.101.3.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/imsettings/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 13 Jun 2008 16:39:26 -0000 1.1
+++ sources 8 Jul 2008 07:36:44 -0000 1.2
@@ -0,0 +1 @@
+1771eb4b4b9cf9a1bd2aeb2163306ebd imsettings-0.101.3.tar.bz2
More information about the fedora-extras-commits
mailing list