rpms/ibus/devel ibus.spec,1.23,1.24
Jens Petersen
petersen at fedoraproject.org
Tue Oct 7 01:55:53 UTC 2008
- Previous message: rpms/clutter/devel .cvsignore, 1.10, 1.11 clutter.spec, 1.11, 1.12 import.log, 1.2, 1.3 sources, 1.10, 1.11
- Next message: rpms/kernel/devel config-x86-generic, 1.49, 1.50 kernel.spec, 1.1021, 1.1022
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: petersen
Update of /cvs/pkgs/rpms/ibus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9762
Modified Files:
ibus.spec
Log Message:
add xinputrc alternative when installing or uninstalling
Index: ibus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/devel/ibus.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- ibus.spec 6 Oct 2008 08:18:49 -0000 1.23
+++ ibus.spec 7 Oct 2008 01:55:23 -0000 1.24
@@ -3,7 +3,7 @@
%define mod_path ibus-0.1
Name: ibus
Version: 0.1.1.20081006
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Intelligent Input Bus for Linux OS
License: LGPLv2+
Group: System Environment/Libraries
@@ -25,6 +25,8 @@
Requires: gnome-python2-gconf
Requires: pyxdg
Requires: iso-codes
+Requires(post): %{_sbindir}/alternatives
+Requires(postun): %{_sbindir}/alternatives
%description
IBus means Intelligent Input Bus. It is a new input framework for Linux OS. It provides
@@ -74,7 +76,9 @@
%clean
rm -rf $RPM_BUILD_ROOT
-%post -p /sbin/ldconfig
+%post
+/sbin/ldconfig
+%{_sbindir}/alternatives --install %{_sysconfdir}/X11/xinit/xinputrc xinputrc %{_xinputconf} 83 || :
%post gtk
%{_bindir}/update-gtk-immodules %{_host} || :
@@ -82,7 +86,13 @@
%postun gtk
%{_bindir}/update-gtk-immodules %{_host} || :
-%postun -p /sbin/ldconfig
+%postun
+/sbin/ldconfig
+if [ "$1" = "0" ]; then
+ %{_sbindir}/alternatives --remove xinputrc %{_xinputconf} || :
+ # if alternative was set to manual, reset to auto
+ [ -L %{_sysconfdir}/alternatives/xinputrc -a "`readlink %{_sysconfdir}/alternatives/xinputrc`" = "%{_xinputconf}" ] && %{_sbindir}/alternatives --auto xinputrc || :
+fi
%files -f %{name}.lang
%defattr(-,root,root,-)
@@ -123,6 +133,9 @@
%{_libdir}/qt4/plugins/inputmethods/libibus.so
%changelog
+* Tue Oct 7 2008 Jens Petersen <petersen at redhat.com> - 0.1.1.20081006-2
+- add xinputrc alternative when installing or uninstalling
+
* Mon Oct 06 2008 Huang Peng <shawn.p.huang at gmail.com> - 0.1.1.20081006-1
- Update to 0.1.1.20081006.
- Previous message: rpms/clutter/devel .cvsignore, 1.10, 1.11 clutter.spec, 1.11, 1.12 import.log, 1.2, 1.3 sources, 1.10, 1.11
- Next message: rpms/kernel/devel config-x86-generic, 1.49, 1.50 kernel.spec, 1.1021, 1.1022
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list