rpms/qalculate-kde/devel qalculate-kde-cln12.patch, 1.2, 1.3 qalculate-kde.spec, 1.21, 1.22

[Deji Akingunola (deji)]

Author: deji

Update of /cvs/extras/rpms/qalculate-kde/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12638

Modified Files:
	qalculate-kde-cln12.patch qalculate-kde.spec 
Log Message:
Remove the -fno-exceptions flag


qalculate-kde-cln12.patch:

Index: qalculate-kde-cln12.patch
===================================================================
RCS file: /cvs/extras/rpms/qalculate-kde/devel/qalculate-kde-cln12.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- qalculate-kde-cln12.patch	28 Feb 2008 05:22:17 -0000	1.2
+++ qalculate-kde-cln12.patch	29 Feb 2008 05:07:03 -0000	1.3
@@ -49,14 +49,13 @@
  KDE_CREATE_SUBDIRSLIST
  AC_CONFIG_FILES([ Makefile ])
  AC_CONFIG_FILES([ doc/Makefile ])
---- acinclude.m4	2007-06-17 07:33:57.000000000 -0400
-+++ acinclude.m4.new	2008-02-28 00:13:49.000000000 -0500
-@@ -3231,7 +3231,7 @@
+--- admin/acinclude.m4.in	2007-06-17 07:33:57.000000000 -0400
++++ admin/acinclude.m4.in.new	2008-02-28 22:30:00.000000000 -0500
+@@ -3231,7 +3231,6 @@
            CXXFLAGS="$CXXFLAGS -fno-reorder-blocks"
            CFLAGS="$CFLAGS -fno-reorder-blocks"
      fi
 -    KDE_CHECK_COMPILER_FLAG(fno-exceptions,[CXXFLAGS="$CXXFLAGS -fno-exceptions"])
-+    KDE_CHECK_COMPILER_FLAG(fno-exceptions,[CXXFLAGS="$CXXFLAGS"])
      KDE_CHECK_COMPILER_FLAG(fno-check-new, [CXXFLAGS="$CXXFLAGS -fno-check-new"])
      KDE_CHECK_COMPILER_FLAG(fno-common, [CXXFLAGS="$CXXFLAGS -fno-common"])
      KDE_CHECK_COMPILER_FLAG(fexceptions, [USE_EXCEPTIONS="-fexceptions"], USE_EXCEPTIONS=	)


Index: qalculate-kde.spec
===================================================================
RCS file: /cvs/extras/rpms/qalculate-kde/devel/qalculate-kde.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- qalculate-kde.spec	28 Feb 2008 06:19:56 -0000	1.21
+++ qalculate-kde.spec	29 Feb 2008 05:07:03 -0000	1.22
@@ -10,7 +10,7 @@
 Patch1:		qalculate-kde-cln12.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	libqalculate-devel, kdelibs3-devel, gettext
-BuildRequires:	automake16, autoconf, automake, intltool, libtool, pkgconfig
+BuildRequires:	automake16, autoconf, intltool, libtool, pkgconfig
 Requires:	gnuplot
 
 %description
@@ -30,7 +30,6 @@
 unset QTDIR || : ; . %{_sysconfdir}/profile.d/qt.sh
 export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include
 %configure --disable-rpath
-export CXXFLAGS="`echo $CXXFLAGS | sed s/-fno-exceptions//`"
 make %{?_smp_mflags}
 										
 %install