rpms/im-chooser/devel im-chooser.spec, 1.43, 1.44 im-chooser-0.99.6-check-if-im-is-running.patch, 1.1, NONE im-chooser-0.99.6-correct-build-order.patch, 1.1, NONE im-chooser-0.99.6-sanity-check-on-dbus-conn.patch, 1.1, NONE im-chooser-0.99.6-validate-pid.patch, 1.1, NONE im-chooser-constraint-of-language.patch, 1.3, NONE im-chooser-fix-window-border.patch, 1.1, NONE imsettings-ignore-error-on-check-running.patch, 1.1, NONE

[Akira TAGOH (tagoh)]

Author: tagoh

Update of /cvs/pkgs/rpms/im-chooser/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32685

Modified Files:
	im-chooser.spec 
Removed Files:
	im-chooser-0.99.6-check-if-im-is-running.patch 
	im-chooser-0.99.6-correct-build-order.patch 
	im-chooser-0.99.6-sanity-check-on-dbus-conn.patch 
	im-chooser-0.99.6-validate-pid.patch 
	im-chooser-constraint-of-language.patch 
	im-chooser-fix-window-border.patch 
	imsettings-ignore-error-on-check-running.patch 
Log Message:
* Thu Jun 12 2008 Akira TAGOH <tagoh at redhat.com> - 1.1.0-1
- New upstream release.


Index: im-chooser.spec
===================================================================
RCS file: /cvs/pkgs/rpms/im-chooser/devel/im-chooser.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- im-chooser.spec	26 May 2008 01:44:51 -0000	1.43
+++ im-chooser.spec	16 Jun 2008 03:30:51 -0000	1.44
@@ -1,86 +1,28 @@
 Name:		im-chooser
-Version:	0.99.6
-Release:	5%{?dist}
+Version:	1.1.0
+Release:	1%{?dist}
 License:	GPLv2+
 URL:		http://fedorahosted.org/im-chooser/
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	gtk2-devel intltool gettext libgnomeui-devel dbus-devel dbus-glib-devel gamin-devel xfce-mcs-manager-devel libxfce4mcs-devel
-BuildRequires:  desktop-file-utils libtool
+BuildRequires:	gtk2-devel desktop-file-utils
+BuildRequires:	imsettings-devel >= 0.101.0
 
-Source0:	http://fedorahosted.org/releases/i/m/%{name}/%{name}-%{version}.tar.gz
-Patch0:		im-chooser-constraint-of-language.patch
-Patch1:		im-chooser-0.99.6-check-if-im-is-running.patch
-Patch2:		im-chooser-0.99.6-correct-build-order.patch
-Patch3:		im-chooser-0.99.6-sanity-check-on-dbus-conn.patch
-Patch4:		im-chooser-0.99.6-validate-pid.patch
-Patch5:		im-chooser-fix-window-border.patch
-Patch6:		imsettings-ignore-error-on-check-running.patch
+Source0:	http://fedorahosted.org/releases/i/m/%{name}/%{name}-%{version}.tar.bz2
 
 Summary:	Desktop Input Method configuration tool
 Group:		Applications/System
-Requires(post):	%{_sbindir}/alternatives
-Requires(postun): %{_sbindir}/alternatives
-Requires:	imsettings = %{version}-%{release}
 Obsoletes:	system-switch-im
 
 %description
 im-chooser is a GUI configuration tool to choose the Input Method
 to be used or disable Input Method usage on the desktop.
 
-%package -n imsettings
-Summary:	Input Method settings framework
-Group:		Applications/System
-Requires:	xorg-x11-xinit >= 1.0.2-22.fc8
-Requires:	imsettings-libs = %{version}-%{release}
-Requires(post):	/bin/dbus-send
-Requires(postun): /bin/dbus-send
-
-%description -n imsettings
-imsettings is a framework to deal with IM configuration through D-Bus.
-
-%package -n imsettings-xfce
-Summary:	Xfce support on imsettings
-Group:		Applications/System
-Requires:	imsettings-libs = %{version}-%{release}
-
-%description -n imsettings-xfce
-imsettings is a framework to deal with IM configuration through D-Bus.
-This package contains a plugin to get this working on Xfce.
-
-%package -n imsettings-libs
-Summary:	Libraries for imsettings
-Group:		Development/Libraries
-
-%description -n imsettings-libs
-imsettings is a framework to deal with IM configuration through D-Bus.
-This package contains a library for imsettings.
-
-%package  -n imsettings-devel
-Summary:	Development files for imsettings
-Group:		Development/Libraries
-Requires:	imsettings-libs = %{version}-%{release}
-
-%description -n imsettings-devel
-imsettings is a framework to deal with IM configuration through D-Bus.
-This package contains the development files to make any applications with imsettings.
 
 %prep
 %setup -q
-%patch0 -p1 -b .language
-%patch1 -p0 -b .is_running
-%patch2 -p1 -b .build_order
-%patch3 -p0 -b .dbusconn
-%patch4 -p0 -b .pid
-%patch5 -p0 -b .border
-pushd imsettings
-%patch6 -p0 -b .ignore-error
-popd
-autoreconf
 
 %build
-%configure	--with-xinput-suffix=.conf \
-		--with-xinputsh=50-xinput.sh \
-		--disable-static
+%configure
 make %{?_smp_mflags}
 
 %install
@@ -94,33 +36,11 @@
         --dir=$RPM_BUILD_ROOT%{_datadir}/applications           \
         $RPM_BUILD_ROOT%{_datadir}/applications/im-chooser.desktop
 
-rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
-rm -f $RPM_BUILD_ROOT%{_libdir}/xfce4/mcs-plugins/*.la
-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 -n imsettings
-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 || :
-imsettings-reload -f > /dev/null 2>&1 || :
-
-%postun -n imsettings
-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
-imsettings-reload -f > /dev/null 2>&1 || :
-
-%post -n imsettings-libs -p /sbin/ldconfig
-
-%postun -n imsettings-libs -p /sbin/ldconfig
 
 %files -f %{name}.lang
 %defattr (-, root, root)
@@ -129,36 +49,11 @@
 %{_datadir}/applications/fedora-im-chooser.desktop
 %{_datadir}/pixmaps/im-chooser.png
 
-%files -n imsettings
-%defattr (-, root, root, -)
-%doc AUTHORS COPYING imsettings/ChangeLog 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 -n imsettings-xfce
-%defattr (-, root, root, -)
-%doc AUTHORS COPYING imsettings/ChangeLog README
-%{_libdir}/xfce4/mcs-plugins/imsettings_plugin.so
-
-%files -n imsettings-libs
-%defattr (-, root, root, -)
-%doc AUTHORS COPYING imsettings/ChangeLog README
-%{_libdir}/libimsettings.so.*
-
-%files -n imsettings-devel
-%defattr (-, root, root, -)
-%doc AUTHORS COPYING imsettings/ChangeLog README
-%{_includedir}/imsettings
-%{_libdir}/libimsettings.so
-%{_libdir}/pkgconfig/imsettings.pc
 
 %changelog
+* Thu Jun 12 2008 Akira TAGOH <tagoh at redhat.com> - 1.1.0-1
+- New upstream release.
+
 * Mon May 26 2008 Akira TAGOH <tagoh at redhat.com> - 0.99.6-5
 - Fix a typo in the package group of imsettings-xfce. (#448037)
 


--- im-chooser-0.99.6-check-if-im-is-running.patch DELETED ---


--- im-chooser-0.99.6-correct-build-order.patch DELETED ---


--- im-chooser-0.99.6-sanity-check-on-dbus-conn.patch DELETED ---


--- im-chooser-0.99.6-validate-pid.patch DELETED ---


--- im-chooser-constraint-of-language.patch DELETED ---


--- im-chooser-fix-window-border.patch DELETED ---


--- imsettings-ignore-error-on-check-running.patch DELETED ---