rpms/uim/FC-5 .cvsignore, 1.13, 1.14 sources, 1.12, 1.13 uim.spec, 1.26, 1.27

Akira Tagoh (tagoh) fedora-extras-commits at redhat.com
Mon Jun 19 08:48:15 UTC 2006


Author: tagoh

Update of /cvs/extras/rpms/uim/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21966

Modified Files:
	.cvsignore sources uim.spec 
Log Message:
* Mon Jun 19 2006 Akira TAGOH <tagoh at redhat.com> - 1.1.0-1
- New upstream release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/uim/FC-5/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	27 Dec 2005 04:50:32 -0000	1.13
+++ .cvsignore	19 Jun 2006 08:48:15 -0000	1.14
@@ -12,3 +12,4 @@
 uim-1.0.0-alpha.tar.gz
 uim-1.0.0-beta.tar.gz
 uim-1.0.1.tar.gz
+uim-1.1.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/uim/FC-5/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	27 Dec 2005 04:50:32 -0000	1.12
+++ sources	19 Jun 2006 08:48:15 -0000	1.13
@@ -1 +1 @@
-1de96cb9ca0c570c0d04678a95f9c75a  uim-1.0.1.tar.gz
+a813cba1f6db0628db3b9abb0c989989  uim-1.1.0.tar.bz2


Index: uim.spec
===================================================================
RCS file: /cvs/extras/rpms/uim/FC-5/uim.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- uim.spec	2 Mar 2006 07:54:16 -0000	1.26
+++ uim.spec	19 Jun 2006 08:48:15 -0000	1.27
@@ -3,8 +3,8 @@
 %define uninst_xinput for llcc in %{uim_locale}; do alternatives --remove xinput-$llcc %{_sysconfdir}/X11/xinit/xinput.d/uim ; done
 
 Name:		uim
-Version:	1.0.1
-Release:	2%{?dist}
+Version:	1.1.0
+Release:	1%{?dist}
 License:	GPL/BSD
 URL:		http://uim.freedesktop.org/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -12,7 +12,7 @@
 BuildRequires:	gtk2-devel gnome-panel-devel qt-devel ncurses-devel
 BuildRequires:	anthy-devel Canna-devel m17n-lib-devel
 BuildRequires:	emacs
-Source0:	http://uim.freedesktop.org/release/%{name}-%{version}.tar.gz
+Source0:	http://uim.freedesktop.org/release/%{name}-%{version}.tar.bz2
 Source1:	xinput.d-uim
 Source2:	uim-init.el
 
@@ -157,6 +157,8 @@
 
 
 %build
+# assumes that this is built against qt-3.3.
+export QTDIR=%{_libdir}/qt-3.3
 %configure --with-x --with-xft --with-canna --with-anthy --with-m17nlib --without-scim --with-gtk2 --with-gnome2 --with-qt --with-qt-immodule
 make
 
@@ -165,6 +167,8 @@
 
 make install DESTDIR=$RPM_BUILD_ROOT
 
+rm -rf $RPM_BUILD_ROOT%{_libdir}/uim/plugin/*la
+
 install -d $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinput.d
 install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinput.d/uim
 install -d $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/site-start.d
@@ -179,9 +183,6 @@
 # compress large doc
 bzip2 ChangeLog
 
-# remove the unnecessary files
-rm $RPM_BUILD_ROOT%{_libdir}/uim/plugin/*.{a,la}
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -271,18 +272,15 @@
 %dir %{_datadir}/uim
 %{_includedir}/uim/
 %{_libdir}/gtk-2.0/2.*/immodules/im-uim.*a
-%{_libdir}/lib*.a
 %{_libdir}/lib*.la
 %{_libdir}/lib*.so
 %{_libdir}/pkgconfig/*
 
 %files	gtk2
 %defattr (-, root, root)
-%{_bindir}/uim-helper-toolbar-gtk
-%{_bindir}/uim-helper-toolbar-gtk-systray
-%{_bindir}/uim-pref-gtk
 %{_bindir}/uim-toolbar-gtk
 %{_bindir}/uim-toolbar-gtk-systray
+%{_bindir}/uim-pref-gtk
 %{_bindir}/uim-im-switcher-gtk
 %{_bindir}/uim-input-pad-ja
 %{_libdir}/gtk-2.0/2.*/immodules
@@ -293,7 +291,6 @@
 
 %files	gnome
 %defattr (-, root, root)
-%{_libexecdir}/uim-helper-applet
 %{_libexecdir}/uim-toolbar-applet
 %{_libdir}/bonobo/servers/GNOME_UimApplet.server
 
@@ -317,6 +314,7 @@
 %files el-common
 %defattr (-, root, root)
 %{_bindir}/uim-el-agent
+%{_bindir}/uim-el-helper-agent
 
 %files	anthy
 %defattr (-, root, root)
@@ -343,6 +341,9 @@
 %{_datadir}/uim/m17nlib.scm
 
 %changelog
+* Mon Jun 19 2006 Akira TAGOH <tagoh at redhat.com> - 1.1.0-1
+- New upstream release.
+
 * Thu Mar  2 2006 Akira TAGOH <tagoh at redhat.com> - 1.0.1-2
 - rebuilt.
 




More information about the fedora-extras-commits mailing list