rpms/uim/devel .cvsignore, 1.24, 1.25 sources, 1.23, 1.24 uim.spec, 1.73, 1.74 uim-1.5.5-applet.patch, 1.1, NONE uim-qt-destdir.patch, 1.1, NONE

[Akira TAGOH]

Author: tagoh

Update of /cvs/pkgs/rpms/uim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6063

Modified Files:
	.cvsignore sources uim.spec 
Removed Files:
	uim-1.5.5-applet.patch uim-qt-destdir.patch 
Log Message:
* Fri Aug 14 2009 Akira TAGOH <tagoh at redhat.com> - 1.5.6-1
- New upstream release.
- Remove patches because it has been applied in this release.
  - uim-qt-destdir.patch
  - uim-1.5.5-applet.patch
- Update the usage of alternatives according to PackagingDrafts/UsingAlternatives.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/uim/devel/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- .cvsignore	27 Feb 2009 12:07:14 -0000	1.24
+++ .cvsignore	14 Aug 2009 08:48:45 -0000	1.25
@@ -24,3 +24,4 @@ uim-1.5.0.tar.bz2
 uim-1.5.2.tar.bz2
 uim-1.5.3.tar.bz2
 uim-1.5.5.tar.bz2
+uim-1.5.6.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/uim/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- sources	27 Feb 2009 12:07:14 -0000	1.23
+++ sources	14 Aug 2009 08:48:45 -0000	1.24
@@ -1 +1 @@
-b7403fa4ae78229f31ca49df283502da  uim-1.5.5.tar.bz2
+2bd5a9095d6354a2a23c908b0d6e7861  uim-1.5.6.tar.bz2


Index: uim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/uim/devel/uim.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -p -r1.73 -r1.74
--- uim.spec	27 Jul 2009 06:28:58 -0000	1.73
+++ uim.spec	14 Aug 2009 08:48:45 -0000	1.74
@@ -1,9 +1,9 @@
-%define inst_xinput alternatives --install %{_sysconfdir}/X11/xinit/xinputrc xinputrc %{_sysconfdir}/X11/xinit/xinput.d/uim.conf 50
-%define uninst_xinput alternatives --remove xinputrc %{_sysconfdir}/X11/xinit/xinput.d/uim.conf
+%define inst_xinput %{_sbindir}/update-alternatives --install %{_sysconfdir}/X11/xinit/xinputrc xinputrc %{_sysconfdir}/X11/xinit/xinput.d/uim.conf 50
+%define uninst_xinput %{_sbindir}/update-alternatives --remove xinputrc %{_sysconfdir}/X11/xinit/xinput.d/uim.conf
 
 Name:		uim
-Version:	1.5.5
-Release:	2%{?dist}
+Version:	1.5.6
+Release:	1%{?dist}
 # uim itself is licensed under BSD
 # scm/py.scm, helper/eggtrayicon.[ch], qt/pref-kseparator.{cpp,h}
 #   and qt/chardict/chardict-kseparator.{cpp,h} is licensed under LGPLv2+
@@ -28,14 +28,12 @@ Source0:	http://uim.googlecode.com/files
 Source1:	xinput.d-uim
 Source2:	uim-init.el
 Patch0:		uim-1.4.2-emacs23.patch
-Patch1:		uim-qt-destdir.patch
-Patch2:		uim-1.5.5-applet.patch
 
 
 Summary:	A multilingual input method library
 Group:		System Environment/Libraries
-Requires(post): %{_sbindir}/alternatives /sbin/ldconfig
-Requires(postun): %{_sbindir}/alternatives /sbin/ldconfig
+Requires(post): %{_sbindir}/update-alternatives /sbin/ldconfig
+Requires(postun): %{_sbindir}/update-alternatives /sbin/ldconfig
 Requires:	imsettings im-chooser
 
 %package	devel
@@ -215,12 +213,6 @@ many languages using the input table map
 %prep
 %setup -q -n %{name}-%{version}
 %patch0 -p1 -b .emacs23
-%patch1 -p1 -b .qt-destdir
-%patch2 -p1 -b .applet
-libtoolize -f
-aclocal -Im4
-automake --add-missing
-autoconf
 
 
 %build
@@ -282,6 +274,8 @@ touch $RPM_BUILD_ROOT%{_localstatedir}/l
 ln -sf %{_localstatedir}/lib/uim/installed-modules.scm $RPM_BUILD_ROOT%{_datadir}/uim/
 ln -sf %{_localstatedir}/lib/uim/loader.scm $RPM_BUILD_ROOT%{_datadir}/uim/
 
+# https://fedoraproject.org/wiki/packagingDrafts/UsingAlternatives
+touch $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinputrc
 %find_lang %{name}
 
 find $RPM_BUILD_ROOT -name "*.scm" -type f | egrep -v "^(anthy|canna|m17n|mana|prime|scim|sj3|skk|wnn|installed-modules|loader)" > scm.list
@@ -403,6 +397,7 @@ fi
 %exclude %{_datadir}/uim/pixmaps/wnn.png
 %exclude %{_datadir}/uim/pixmaps/wnn.svg
 %{_sysconfdir}/X11/xinit/xinput.d
+%ghost %{_sysconfdir}/X11/xinit/xinputrc
 %{_libdir}/uim/plugin/libuim-custom-enabler.so
 %{_libdir}/uim/plugin/libuim-look.so
 %{_libexecdir}/uim-helper-server
@@ -518,6 +513,13 @@ fi
 %dir %{_datadir}/uim
 
 %changelog
+* Fri Aug 14 2009 Akira TAGOH <tagoh at redhat.com> - 1.5.6-1
+- New upstream release.
+- Remove patches because it has been applied in this release.
+  - uim-qt-destdir.patch
+  - uim-1.5.5-applet.patch
+- Update the usage of alternatives according to PackagingDrafts/UsingAlternatives.
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5.5-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


--- uim-1.5.5-applet.patch DELETED ---


--- uim-qt-destdir.patch DELETED ---