rpms/scim-fcitx/devel scim-fcitx.spec,1.6,1.7

[Jens Petersen (petersen)]

Author: petersen

Update of /cvs/pkgs/rpms/scim-fcitx/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30047

Modified Files:
	scim-fcitx.spec 
Log Message:
- update license field to GPLv2+
- remove with_libstdc_preview macro



Index: scim-fcitx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/scim-fcitx/devel/scim-fcitx.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- scim-fcitx.spec	27 Sep 2006 07:58:01 -0000	1.6
+++ scim-fcitx.spec	24 Sep 2007 02:34:19 -0000	1.7
@@ -1,20 +1,15 @@
-%define with_libstdc_preview 0
-
 Name:           scim-fcitx
 Version:        3.1.1
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        FCITX Input Method Engine for SCIM
 
 Group:          System Environment/Libraries
-License:        GPL
+License:        GPLv2+
 URL:            http://www.scim-im.org/projects/imengines/
 Source0:        http://dl.sourceforge.net/scim/%{name}.%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  scim-devel
-%if %{with_libstdc_preview}
-Buildrequires:  libstdc++so7-devel
-%endif
 Requires:	scim
 
 %description
@@ -35,23 +30,13 @@
 
 
 %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
 # doesn't build with %{?_smp_mflags}
 make
 
 
 %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/fcitx.la
@@ -75,6 +60,10 @@
 
 
 %changelog
+* Mon Sep 24 2007 Jens Petersen <petersen at redhat.com> - 3.1.1-7
+- update license field to GPLv2+
+- remove with_libstdc_preview macro
+
 * Wed Sep 27 2006 Jens Petersen <petersen at redhat.com> - 3.1.1-6
 - rebuild for FE6