rpms/scim/devel scim.spec,1.97,1.98

[Jens Petersen (petersen)]

Author: petersen

Update of /cvs/extras/rpms/scim/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19328

Modified Files:
	scim.spec 
Log Message:
- drop %{_xinputdir}
- %{_sysconfdir}/X11/xinit/xinput.d is now owned by im-chooser
- no longer require xorg-x11-xinit



Index: scim.spec
===================================================================
RCS file: /cvs/extras/rpms/scim/devel/scim.spec,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- scim.spec	18 Sep 2007 04:14:54 -0000	1.97
+++ scim.spec	20 Sep 2007 07:27:20 -0000	1.98
@@ -3,7 +3,7 @@
 
 Name:      scim
 Version:   1.4.7
-Release:   4%{?dist}
+Release:   5%{?dist}
 Summary:   Smart Common Input Method platform
 
 License:   LGPLv2+
@@ -23,8 +23,6 @@
 BuildRequires: doxygen
 %endif
 Requires:  %{name}-libs = %{version}-%{release}
-# for xinputrc (fc6)
-Requires: xorg-x11-xinit >= 1.0.2-5
 Requires: im-chooser
 Requires(post): %{_sbindir}/alternatives
 Requires(postun): %{_sbindir}/alternatives
@@ -136,8 +134,7 @@
 
 %define scim_api 1.4.0
 
-%define _xinputdir %{_sysconfdir}/X11/xinit/xinput.d
-%define _xinputconf %{_xinputdir}/scim.conf
+%define _xinputconf %{_sysconfdir}/X11/xinit/xinput.d/scim.conf
 
 
 %prep
@@ -190,7 +187,7 @@
 rm ${RPM_BUILD_ROOT}/%{_datadir}/control-center-2.0/capplets/scim-setup.desktop
 
 # install xinput config file
-mkdir -pm 755 ${RPM_BUILD_ROOT}/%{_xinputdir}
+mkdir -pm 755 ${RPM_BUILD_ROOT}/%{_sysconfdir}/X11/xinit/xinput.d
 install -pm 644 %{SOURCE1} ${RPM_BUILD_ROOT}/%{_xinputconf}
 
 %find_lang %{name}
@@ -256,7 +253,6 @@
 %{_libdir}/scim-1.0/%{scim_api}/SetupUI
 %{_datadir}/scim
 %{_datadir}/pixmaps/*
-%dir %{_xinputdir}
 %config(noreplace) %{_xinputconf}
 
 %files devel
@@ -290,6 +286,10 @@
 
 
 %changelog
+* Thu Sep 20 2007 Jens Petersen <petersen at redhat.com> - 1.4.7-5
+- %{_sysconfdir}/X11/xinit/xinput.d is now owned by im-chooser
+- no longer require xorg-x11-xinit
+
 * Tue Sep 18 2007 Jens Petersen <petersen at redhat.com> - 1.4.7-4
 - source none.conf in xinput script when skipping scim startup