Hello community,
here is the log from the commit of package scim-uim for openSUSE:Factory
checked in at Thu Jul 9 11:04:18 CEST 2009.
--------
--- scim-uim/scim-uim.changes 2007-11-08 14:32:33.000000000 +0100
+++ scim-uim/scim-uim.changes 2009-07-07 14:27:20.000000000 +0200
@@ -1,0 +2,6 @@
+Tue Jul 7 14:26:41 CEST 2009 - tiwai@suse.de
+
+- fix build with uim-1.5.6
+- minor cleanup of spec file
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
New:
----
scim-uim-1.5.6-build-fixes.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ scim-uim.spec ++++++
--- /var/tmp/diff_new_pack.vYm3Ic/_old 2009-07-09 11:02:47.000000000 +0200
+++ /var/tmp/diff_new_pack.vYm3Ic/_new 2009-07-09 11:02:47.000000000 +0200
@@ -21,7 +21,7 @@
Name: scim-uim
BuildRequires: gcc-c++ scim-devel uim-devel
Version: 0.2.0
-Release: 201
+Release: 202
License: GPL v2 or later
Group: System/I18n/Japanese
AutoReqProv: on
@@ -30,11 +30,12 @@
Source0: http://mesh.dl.sourceforge.net/sourceforge/scim/scim-uim-0.2.0.tar.bz2
Patch0: commit-when-focus-out.patch
Patch1: missing-includes.patch
+Patch2: scim-uim-1.5.6-build-fixes.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Summary: UIM Input Method Engine for SCIM
%description
-UIM Input Method Engine for SCIM
+UIM Input Method Engine for SCIM.
@@ -43,10 +44,10 @@
James Su
%prep
-%define scim_binary_version %(pkg-config --variable=scim_binary_version scim)
-%setup -q -n %{name}-%{version}
+%setup -q
#%patch0 -p1
%patch1 -p1
+%patch2 -p1
%build
libtoolize --force
@@ -57,11 +58,11 @@
--libdir=%{_libdir} \
--disable-static \
--enable-debug
-make
+make %{?jobs:-j %jobs}
%install
make DESTDIR=${RPM_BUILD_ROOT} install
-rm -f $RPM_BUILD_ROOT/%{_libdir}/scim-1.0/%{scim_binary_version}/IMEngine/uim.{a,la}
+rm -f $RPM_BUILD_ROOT/%{_libdir}/scim-1.0/*/IMEngine/uim.*a
# %find_lang scim-uim
%clean
@@ -69,50 +70,8 @@
%files
%defattr(-, root, root)
-%doc AUTHORS COPYING NEWS README ChangeLog
-%dir %{_libdir}/scim-1.0/
-%dir %{_libdir}/scim-1.0/%{scim_binary_version}/
-%dir %{_libdir}/scim-1.0/%{scim_binary_version}/IMEngine/
-%{_libdir}/scim-1.0/%{scim_binary_version}/IMEngine/uim.so
-%dir %{_datadir}/scim/icons/
-%{_datadir}/scim/icons/scim-uim.png
+%doc AUTHORS COPYING README ChangeLog
+%{_libdir}/scim-1.0
+%{_datadir}/scim/icons
%changelog
-* Thu Nov 08 2007 mfabian@suse.de
-- add missing includes to fix build with gcc 4.3.0.
-* Fri Aug 03 2007 mfabian@suse.de
-- update to 0.2.0:
- • Replace scim-uim's icon with uim's one.
- • Don't show the uim's im-list button.
- • Now scim-uim requires uim-1.1.0 or later.
- • Follow uim's new property mechanism (since uim-1.1.0).
- • Remove surrounding text functions completely.
-* Thu Oct 12 2006 mfabian@suse.de
-- fix to build with scim 1.4.5.
-* Mon Jul 17 2006 mfabian@suse.de
-- add "#!BuildIgnore: NX" to make it build for the
- xorg7-SUSE_Factory in the openSUSE build service.
-* Fri Feb 24 2006 zsu@suse.de
-- add Provides: locale(scim:ja)
-* Wed Jan 25 2006 mls@suse.de
-- converted neededforbuild to BuildRequires
-* Wed Jan 18 2006 zsu@suse.de
-- Add AC_SUBST(LIBTOOL_EXPORT_OPTIONS) in configure.ac,in order to
- expand it correctly in Makefile.
-* Mon Aug 08 2005 mfabian@suse.de
-- update to 0.1.4
- (supports surrounding text feature and therefore requires
- uim 0.4.8).
-* Thu Aug 04 2005 mfabian@suse.de
-- Bugzilla #97962: add configure option "--enable-debug" to
- the .spec file.
-* Fri Jul 29 2005 mfabian@suse.de
-- use RPM_OPT_FLAGS.
-* Fri Sep 03 2004 mfabian@suse.de
-- update to 0.1.3.
-* Mon Aug 16 2004 mfabian@suse.de
-- update to 0.1.2.
-* Sat Aug 14 2004 mfabian@suse.de
-- remove superfluous stuff from "# neededforbuild".
-* Sat Aug 14 2004 mfabian@suse.de
-- new package: scim-uim, version 0.1.1.
++++++ scim-uim-1.5.6-build-fixes.diff ++++++
---
src/scim_uim_imengine.cpp | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--- a/src/scim_uim_imengine.cpp
+++ b/src/scim_uim_imengine.cpp
@@ -36,7 +36,8 @@
#include
#include "scim_uim_imengine.h"
-#include
+#include
+#include
#define scim_module_init uim_LTX_scim_module_init
#define scim_module_exit uim_LTX_scim_module_exit
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org