rpms/scim-m17n/devel .cvsignore, 1.4, 1.5 scim-m17n.spec, 1.12, 1.13 sources, 1.4, 1.5 scim-m17n-US-keyboard-211266.patch, 1.1, NONE

[Jens Petersen (petersen)]

Author: petersen

Update of /cvs/extras/rpms/scim-m17n/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1037

Modified Files:
	.cvsignore scim-m17n.spec sources 
Removed Files:
	scim-m17n-US-keyboard-211266.patch 
Log Message:
- update to 0.2.2
- scim-m17n-US-keyboard-211266.patch is no longer needed



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/scim-m17n/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	24 Oct 2006 03:48:00 -0000	1.4
+++ .cvsignore	21 May 2007 04:57:37 -0000	1.5
@@ -1 +1 @@
-scim-m17n-0.2.1.tar.gz
+scim-m17n-0.2.2.tar.gz


Index: scim-m17n.spec
===================================================================
RCS file: /cvs/extras/rpms/scim-m17n/devel/scim-m17n.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- scim-m17n.spec	24 Oct 2006 03:48:01 -0000	1.12
+++ scim-m17n.spec	21 May 2007 04:57:37 -0000	1.13
@@ -1,7 +1,5 @@
-%define with_libstdc_preview 0
-
 Name:           scim-m17n
-Version:        0.2.1
+Version:        0.2.2
 Release:        1%{?dist}
 Summary:        SCIM IMEngine for m17n-lib
 
@@ -12,12 +10,8 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Buildrequires:  scim-devel, m17n-lib-devel
 Obsoletes:      iiimf-le-unit <= 1:12.2
-%if %{with_libstdc_preview}
-Buildrequires: libstdc++so7-devel
-%endif
 Requires:       scim >= 1.4.4
 Patch1:         scim-m17n-no-M17N-prefix.patch
-Patch2:         scim-m17n-US-keyboard-211266.patch
 
 %description
 scim-m17n provides a SCIM IMEngine for m17n-lib, which allows
@@ -27,26 +21,15 @@
 %prep
 %setup -q
 %patch1 -p1 -b .1-name-prefix
-%patch2 -p0 -b .2-keyboard
 
 
 %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\.. /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 install DESTDIR=$RPM_BUILD_ROOT
 
 rm $RPM_BUILD_ROOT%{_libdir}/scim-1.0/*/IMEngine/m17n.la
@@ -64,6 +47,10 @@
 
 
 %changelog
+* Mon May 21 2007 Jens Petersen <petersen at redhat.com> - 0.2.2-1
+- update to 0.2.2
+- scim-m17n-US-keyboard-211266.patch is no longer needed
+
 * Tue Oct 24 2006 Jens Petersen <petersen at redhat.com> - 0.2.1-1
 - update to 0.2.1 release
 - scim-m17n-0.2.0-unique-uuid.patch no longer needed


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/scim-m17n/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	24 Oct 2006 03:48:01 -0000	1.4
+++ sources	21 May 2007 04:57:37 -0000	1.5
@@ -1 +1 @@
-473fe0793135f96f8230cb493521a6a0  scim-m17n-0.2.1.tar.gz
+17d43799d0df9838c1cd5886ea376105  scim-m17n-0.2.2.tar.gz


--- scim-m17n-US-keyboard-211266.patch DELETED ---