rpms/scim-skk/FC-5 scim-skk-broken-iter.diff, NONE, 1.1 scim-skk.spec, 1.14, 1.15

[Ryo Dairiki (ryo)]

Author: ryo

Update of /cvs/extras/rpms/scim-skk/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17838

Modified Files:
	scim-skk.spec 
Added Files:
	scim-skk-broken-iter.diff 
Log Message:
Add a patch file.

scim-skk-broken-iter.diff:

--- NEW FILE scim-skk-broken-iter.diff ---
--- src/scim_skk_dictionary.cpp.orig	2006-04-29 13:24:36.000000000 +0900
+++ src/scim_skk_dictionary.cpp	2006-04-29 13:25:16.000000000 +0900
@@ -544,9 +544,11 @@
 {
     list<CandPair> &cl = m_dictdata[key];
-    for (list<CandPair>::iterator it = cl.begin(); it != cl.end(); it++) {
-        if (it->first == data.first) {
-            cl.erase(it);
-        }
+    for (list<CandPair>::iterator it = cl.begin(); it != cl.end();) {
+        if (it->first == data.first) {
+            it = cl.erase(it);
+        } else {
+            ++it;
+        }
     }
     cl.push_front(data);
     m_writeflag = true;


Index: scim-skk.spec
===================================================================
RCS file: /cvs/extras/rpms/scim-skk/FC-5/scim-skk.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- scim-skk.spec	2 Jun 2006 07:52:54 -0000	1.14
+++ scim-skk.spec	23 Jul 2006 03:36:36 -0000	1.15
@@ -1,8 +1,6 @@
-%define with_libstdc_preview 1 
-
-Name:		scim-skk
+Name:	    scim-skk
 Version:	0.5.2
-Release:	5%{?dist}
+Release:	4%{?dist}
 Summary:	SCIM IMEngine module for skk
 
 Group:		System Environment/Libraries
@@ -11,11 +9,10 @@
 Source0:	http://sourceforge.jp/projects/scim-imengine/files/%{name}-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Patch0: scim-skk-broken-iter.patch
+
+Requires:		scim skkdic
 BuildRequires:	scim-devel
-%if %{with_libstdc_preview}
-Buildrequires:  libstdc++so7-devel
-%endif
-Requires:	scim, skkdic
 
 %description
 Scim-skk is a SCIM IMEngine module for skk to support Japanese input
@@ -23,28 +20,19 @@
 
 %prep
 %setup -q
+%patch0 -p0
 
 
 %build
-%if %{with_libstdc_preview}
-export CXX=%{_bindir}/g++-libstdc++-so_7
-%endif
 %configure --disable-static
-%if %{with_libstdc_preview}
-# tweak libtool for libstdc++-so7
-sed -i -e "s/4.1.0 /4.2.0-`grep datestamp= %{_bindir}/g++-libstdc++-so_7 | sed -e "s/datestamp=//"` /" libtool
-%endif
 make  %{?_smp_mflags}
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%if %{with_libstdc_preview}
-export CXX=%{_bindir}/g++-libstdc++-so_7
-%endif
 make DESTDIR=${RPM_BUILD_ROOT} install
 
-rm $RPM_BUILD_ROOT%{_libdir}/scim-1.0/*/{IMEngine,SetupUI}/*.la
+rm -f $RPM_BUILD_ROOT%{_libdir}/scim-1.0/*/{IMEngine,SetupUI}/*.la
 
 %find_lang %{name}
 
@@ -59,25 +47,16 @@
 %{_libdir}/scim-1.0/*/IMEngine/skk.so
 %{_libdir}/scim-1.0/*/SetupUI/skk-imengine-setup.so
 %{_datadir}/scim/icons/scim-skk.png
+%{_datadir}/scim/icons/scim-skk.png
 
 
 %changelog
-* Mon May 29 2006 Ryo Dairiki <ryo-dairiki at users.sourceforge.net> - 0.5.2-5
-- rebuild against libstdc++so7 (0:4.2.0-0.3.20060428.fc5.2)
-
+* Sun Jul 23 2006 Ryo Diairki <ryo-dairiki at users.sourceforge.net> - 0.5.2-4
+- add a patch for the problem of broken iterators.
 
-* Sat May 20 2006 Ryo Dairiki <ryo-dairiki at users.sourceforge.net> - 0.5.2-4
-- rebuild against libstdc++so7 (0:4.2.0-0.3.20060428.fc5.1)
-
-* Mon Feb 13 2006 Jens Petersen <petersen at redhat.com> - 0.5.2-3
-- build conditionally with libstdc++so7 preview library (#166041)
-  - add with_libstdc_preview switch and tweak libtool to link against it
+* Wed Mar  1 2006 Ryo Diairki <ryo-dairiki at users.sourceforge.net> - 0.5.2-2
 - update filelist since moduledir is now api-versioned
 
-
-* Sun Feb 12 2006 Ryo Dairiki <ryo-dairiki at users.sourceforge.net> - 0.5.2-2
-- a little cleanup
-
 * Wed Jan 25 2006 Ryo Dairiki <ryo-dairiki at users.sourceforge.net> - 0.5.2-1
 - update to 0.5.2