rpms/scim/FC-3 scim.spec,1.8,1.9

[Ryo Dairiki (ryo)]

Author: ryo

Update of /cvs/extras/rpms/scim/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29700

Modified Files:
	scim.spec 
Log Message:
Import Jens patch



Index: scim.spec
===================================================================
RCS file: /cvs/extras/rpms/scim/FC-3/scim.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- scim.spec	27 Jul 2005 22:21:10 -0000	1.8
+++ scim.spec	29 Jul 2005 13:55:49 -0000	1.9
@@ -1,6 +1,7 @@
 Name:      scim
 Version:   1.4.0
-Release:   2%{?dist}
+# must be less than the release number of scim in Core
+Release:   3%{?dist}
 Summary:   Smart Common Input Method platform
 
 License:   LGPL
@@ -10,7 +11,7 @@
 Source1:   xinput-scim
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-PreReq:        %{_bindir}/update-gtk-immodules
+PreReq:    %{_bindir}/update-gtk-immodules
 BuildRequires: gtk2-devel, desktop-file-utils
 
 %description
@@ -25,10 +26,16 @@
 Requires:   gtk2-devel
 
 %description devel
-The scim-devel package includes the static libraries and header files
-for the scim package.
-Install scim-devel if you want to develop programs which will use
-scim.
+The scim-devel package includes the header files for the scim package.
+Install scim-devel if you want to develop programs which will use scim.
+
+
+%package doc
+Summary:    Smart Common Input Method platform documentation
+Group:      Development/Libraries
+
+%description doc
+SCIM development documentation files generated from the sourcecode.
 
 
 %prep
@@ -43,9 +50,10 @@
 %install
 rm -rf ${RPM_BUILD_ROOT}
 make DESTDIR=${RPM_BUILD_ROOT} install
+
 mkdir -pm 755 ${RPM_BUILD_ROOT}/%{_libdir}/scim-1.0/{Config,FrontEnd,IMEngine,SetupUI,Helper}
 
-# Kill all .a and .la
+# remove .la files
 find ${RPM_BUILD_ROOT} -name '*.la' | xargs rm
 
 # install setup panel
@@ -59,16 +67,9 @@
 # remove capplet
 rm ${RPM_BUILD_ROOT}/%{_datadir}/control-center-2.0/capplets/scim-setup.desktop
 
-# install user manual
-mkdir -p docs/dist/manual/zh_CN/figures/
-cp -a docs/manual/zh_CN/user-manual.{html,xml} docs/dist/manual/zh_CN/
-cp -a docs/manual/zh_CN/figures/*.png docs/dist/manual/zh_CN/figures/
-
 # install xinput config file.
 mkdir -pm 755 ${RPM_BUILD_ROOT}/%{_sysconfdir}/X11/xinit/xinput.d
-install -pm 755 %{SOURCE1} \
-  ${RPM_BUILD_ROOT}/%{_sysconfdir}/X11/xinit/xinput.d/scim
-
+install -pm 644 %{SOURCE1} ${RPM_BUILD_ROOT}/%{_sysconfdir}/X11/xinit/xinput.d/scim
 
 %find_lang %{name}
 
@@ -80,39 +81,18 @@
 %post
 /sbin/ldconfig
 
-for llcc in ja_JP ko_KR zh_CN zh_TW
-do
-	%{_sbindir}/alternatives --install \
-	  %{_sysconfdir}/X11/xinit/xinput.d/$llcc xinput-$llcc \
-	  %{_sysconfdir}/X11/xinit/xinput.d/scim 85
-done
-
 %{_bindir}/update-gtk-immodules %{_target_platform}
 
 
 %postun
 /sbin/ldconfig
 
-if [ "$1" = "0" ]
-then
-   for llcc in ja_JP ko_KR zh_CN zh_TW
-	do
-		%{_sbindir}/alternatives --remove \
-                  xinput-$llcc %{_sysconfdir}/X11/xinit/xinput.d/scim
-		if [ `readlink %{_sysconfdir}/alternatives/xinput-$llcc` = "%{_sysconfdir}/X11/xinit/xinput.d/scim" ]
-		then
-			%{_sbindir}/alternatives --auto xinput-$llcc
-		fi
-	done
-fi
-
 %{_bindir}/update-gtk-immodules %{_target_platform}
 
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING NEWS README ChangeLog TODO
-%doc docs/dist/manual/zh_CN
 %dir %{_sysconfdir}/scim
 %config(noreplace) %{_sysconfdir}/scim/*
 %{_sysconfdir}/X11/xinit/xinput.d/scim
@@ -126,16 +106,27 @@
 
 %files devel
 %defattr(-,root,root,-)
-%doc docs/html
 %doc docs/developers
 %{_includedir}/scim-1.0
 %{_libdir}/libscim*.so
 %{_libdir}/pkgconfig/*.pc
 
-#--------------------------------------------------
+%files doc
+%defattr(-,root,root,-)
+%doc docs/html
+
 
 %changelog
-* Thu Jul 28 2005 Jens Petersen <petersen at redhat.com> -1.4.0-2
+* Fri Jul 29 2005 Jens Petersen <petersen at redhat.com> - 1.4.0-3
+- sync with Core
+  - remove xinput alternatives settings out to IME packages
+  - drop the old Chinese manual from docs for now
+  - update -devel description
+  - add doc subpackage for devel documentation
+  - don't set xinput.d script executable
+  - no need to set XMODIFIERS explicitly in xinput.d script
+
+* Thu Jul 28 2005 Ryo Dairiki <ryo-dairiki at mbm.nifty.com> - 1.4.0-2
 - create scim-1.0 dirs to be accessible (Jens Petersen)
 
 * Fri Jul 16 2005 Ryo Dairiki <ryo-dairiki at mbm.nifty.com> - 1.4.0-1
@@ -151,7 +142,10 @@
 - don't set xinput.d script executable
 - no need to set XMODIFIERS explicitly and QT_IM_MODULE in xinput.d script
 
-* Sat May 28 2005 Ryo Dairiki <ryo-dairiki at mbm.nifty.com> - 1.2.3-1
+* Mon Jun 20 2005 Ryo Dairiki <ryo-dairiki at users.sourceforge.net> - 1.2.3-2
+- Remove one of doubled capplets for setup.
+
+* Sat May 28 2005 Ryo Dairiki <ryo-dairiki at users.sourceforge.net> - 1.2.3-1
 - update to 1.2.3 release
 
 * Fri Mar 13 2005 Ryo Dairiki <ryo-dairiki at users.sourceforge.net> - 1.2.2-9