rpms/kst/devel kst-except.diff,1.3,1.4 kst.spec,1.40,1.41

Thu Feb 18 21:56:25 UTC 2010

Author: mtruch

Update of /cvs/pkgs/rpms/kst/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13784

Modified Files:
	kst-except.diff kst.spec 
Log Message:
Properly build kst with exceptions on in C++.


kst-except.diff:
 configure |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: kst-except.diff
===================================================================
RCS file: /cvs/pkgs/rpms/kst/devel/kst-except.diff,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4

--- kst-except.diff	24 Jul 2009 23:46:22 -0000	1.3
+++ kst-except.diff	18 Feb 2010 21:56:24 -0000	1.4
@@ -1,488 +1,12 @@
-diff -u kst-1.8.0/kst/src/plugins/fits_nonlinear/general_levenberg_marquardt/Makefile.am kst-1.8.0-exceptions/kst/src/plugins/fits_nonlinear/general_levenberg_marquardt/Makefile.am
---- kst-1.8.0/kst/src/plugins/fits_nonlinear/general_levenberg_marquardt/Makefile.am	2009-07-02 15:09:51.000000000 -0400
-+++ kst-1.8.0-exceptions/kst/src/plugins/fits_nonlinear/general_levenberg_marquardt/Makefile.am	2009-07-21 23:04:32.000000000 -0400
-@@ -7,6 +7,7 @@
- kstfit_general_levenberg_marquardt_la_LIBADD = $(GSL_LIBS) $(MUPARSER_LIBS)
- kstfit_general_levenberg_marquardt_la_SOURCES = kstfit_general_levenberg_marquardt.cpp
- 
-+KDE_CXXFLAGS=$(USE_EXCEPTIONS)
- METASOURCES=AUTO
- 
- install_DATA=kstfit_general_levenberg_marquardt.xml
-diff -u kst-1.8.0/kst/src/plugins/fits_nonlinear/general_levenberg_marquardt/Makefile.in kst-1.8.0-exceptions/kst/src/plugins/fits_nonlinear/general_levenberg_marquardt/Makefile.in
---- kst-1.8.0/kst/src/plugins/fits_nonlinear/general_levenberg_marquardt/Makefile.in	2009-07-02 15:47:56.000000000 -0400
-+++ kst-1.8.0-exceptions/kst/src/plugins/fits_nonlinear/general_levenberg_marquardt/Makefile.in	2009-07-22 00:24:50.000000000 -0400
-@@ -18,8 +18,9 @@
- 
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
--pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
-+pkglibdir = $(libdir)/@PACKAGE@
-+pkglibexecdir = $(libexecdir)/@PACKAGE@
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
-@@ -46,67 +47,61 @@
- CONFIG_HEADER = $(top_builddir)/config.h \
- 	$(top_builddir)/kst/src/libkst/ksttimers.h
- CONFIG_CLEAN_FILES =
-+CONFIG_CLEAN_VPATH_FILES =
- am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
- am__vpath_adj = case $$p in \
-     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-     *) f=$$p;; \
-   esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-+am__install_max = 40
-+am__nobase_strip_setup = \
-+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-+am__nobase_strip = \
-+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-+am__nobase_list = $(am__nobase_strip_setup); \
-+  for p in $$list; do echo "$$p $$p"; done | \
-+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-+    if (++n[$$2] == $(am__install_max)) \
-+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-+    END { for (dir in files) print dir, files[dir] }'
-+am__base_list = \
-+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
- am__installdirs = "$(DESTDIR)$(installdir)" "$(DESTDIR)$(installdir)"
--installLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(install_LTLIBRARIES)
- am__DEPENDENCIES_1 =
- kstfit_general_levenberg_marquardt_la_DEPENDENCIES =  \
- 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
- am_kstfit_general_levenberg_marquardt_la_OBJECTS =  \
- 	kstfit_general_levenberg_marquardt.lo
--#>- kstfit_general_levenberg_marquardt_la_OBJECTS =  \
--#>- 	$(am_kstfit_general_levenberg_marquardt_la_OBJECTS)
--#>+ 1
--kstfit_general_levenberg_marquardt_la_OBJECTS = kstfit_general_levenberg_marquardt.lo
--#>- kstfit_general_levenberg_marquardt_la_LINK = $(LIBTOOL) --tag=CXX \
--#>- 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
--#>- 	$(AM_CXXFLAGS) $(CXXFLAGS) \
--#>- 	$(kstfit_general_levenberg_marquardt_la_LDFLAGS) $(LDFLAGS) -o \
--#>- 	$@
--#>+ 5
-+kstfit_general_levenberg_marquardt_la_OBJECTS =  \
-+	$(am_kstfit_general_levenberg_marquardt_la_OBJECTS)
- kstfit_general_levenberg_marquardt_la_LINK = $(LIBTOOL) --tag=CXX \
- 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
--	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-+	$(AM_CXXFLAGS) $(CXXFLAGS) \
- 	$(kstfit_general_levenberg_marquardt_la_LDFLAGS) $(LDFLAGS) -o \
- 	$@
- DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir) -I$(top_builddir)/kst/src/libkst
- depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
- am__depfiles_maybe = depfiles
--#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
--#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
--#>+ 2
-+am__mv = mv -f
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
--	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--#>- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
--#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
--#>+ 3
-+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
--	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--#>- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
--#>- 	$(LDFLAGS) -o $@
--#>+ 3
- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \
-+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
- 	$(LDFLAGS) -o $@
- SOURCES = $(kstfit_general_levenberg_marquardt_la_SOURCES)
- DIST_SOURCES = $(kstfit_general_levenberg_marquardt_la_SOURCES)
--installDATA_INSTALL = $(INSTALL_DATA)
- DATA = $(install_DATA)
- ETAGS = etags
- CTAGS = ctags
--#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
--#>+ 1
--DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
- AMTAR = @AMTAR@
- AR = @AR@
-@@ -377,6 +372,7 @@
- target_cpu = @target_cpu@
- target_os = @target_os@
- target_vendor = @target_vendor@
-+top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- x_includes = @x_includes@
-@@ -390,39 +386,25 @@
- kstfit_general_levenberg_marquardt_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
- kstfit_general_levenberg_marquardt_la_LIBADD = $(GSL_LIBS) $(MUPARSER_LIBS)
- kstfit_general_levenberg_marquardt_la_SOURCES = kstfit_general_levenberg_marquardt.cpp
--#>- METASOURCES = AUTO
-+KDE_CXXFLAGS = $(USE_EXCEPTIONS)
-+METASOURCES = AUTO
- install_DATA = kstfit_general_levenberg_marquardt.xml
--#>- all: all-am
--#>+ 1
--all: docs-am  all-am
-+all: all-am
- 
- .SUFFIXES:
- .SUFFIXES: .cpp .lo .o .obj
- $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
--#>- 	@for dep in $?; do \
--#>- 	  case '$(am__configure_deps)' in \
--#>- 	    *$$dep*) \
--#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
--#>- 		&& exit 0; \
--#>- 	      exit 1;; \
--#>- 	  esac; \
--#>- 	done; \
--#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kst/src/plugins/fits_nonlinear/general_levenberg_marquardt/Makefile'; \
--#>- 	cd $(top_srcdir) && \
--#>- 	  $(AUTOMAKE) --gnu  kst/src/plugins/fits_nonlinear/general_levenberg_marquardt/Makefile
--#>+ 12
- 	@for dep in $?; do \
- 	  case '$(am__configure_deps)' in \
- 	    *$$dep*) \
--	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
--		&& exit 0; \
-+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-+	        && { if test -f $@; then exit 0; else break; fi; }; \
- 	      exit 1;; \
- 	  esac; \
- 	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kst/src/plugins/fits_nonlinear/general_levenberg_marquardt/Makefile'; \
--	cd $(top_srcdir) && \
--	  $(AUTOMAKE) --gnu  kst/src/plugins/fits_nonlinear/general_levenberg_marquardt/Makefile
--	cd $(top_srcdir) && perl admin/am_edit kst/src/plugins/fits_nonlinear/general_levenberg_marquardt/Makefile.in
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kst/src/plugins/fits_nonlinear/general_levenberg_marquardt/Makefile'; \
-+	$(am__cd) $(top_srcdir) && \
-+	  $(AUTOMAKE) --gnu kst/src/plugins/fits_nonlinear/general_levenberg_marquardt/Makefile
- .PRECIOUS: Makefile
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- 	@case '$?' in \
-@@ -440,23 +422,28 @@
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+$(am__aclocal_m4_deps):
- install-installLTLIBRARIES: $(install_LTLIBRARIES)
- 	@$(NORMAL_INSTALL)
- 	test -z "$(installdir)" || $(MKDIR_P) "$(DESTDIR)$(installdir)"
--	@list='$(install_LTLIBRARIES)'; for p in $$list; do \
-+	@list='$(install_LTLIBRARIES)'; test -n "$(installdir)" || list=; \
-+	list2=; for p in $$list; do \
- 	  if test -f $$p; then \
--	    f=$(am__strip_dir) \
--	    echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(installLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(installdir)/$$f'"; \
--	    $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(installLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(installdir)/$$f"; \
-+	    list2="$$list2 $$p"; \
- 	  else :; fi; \
--	done
-+	done; \
-+	test -z "$$list2" || { \
-+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(installdir)'"; \
-+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(installdir)"; \
-+	}
- 
- uninstall-installLTLIBRARIES:
- 	@$(NORMAL_UNINSTALL)
--	@list='$(install_LTLIBRARIES)'; for p in $$list; do \
--	  p=$(am__strip_dir) \
--	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(installdir)/$$p'"; \
--	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(installdir)/$$p"; \
-+	@list='$(install_LTLIBRARIES)'; test -n "$(installdir)" || list=; \
-+	for p in $$list; do \
-+	  $(am__strip_dir) \
-+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(installdir)/$$f'"; \
-+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(installdir)/$$f"; \
- 	done
- 
- clean-installLTLIBRARIES:
-@@ -480,21 +467,21 @@
- 
- .cpp.o:
- @am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
- 
- .cpp.obj:
- @am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
- 
- .cpp.lo:
- @am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
-@@ -507,34 +494,37 @@
- install-installDATA: $(install_DATA)
- 	@$(NORMAL_INSTALL)
- 	test -z "$(installdir)" || $(MKDIR_P) "$(DESTDIR)$(installdir)"
--	@list='$(install_DATA)'; for p in $$list; do \
-+	@list='$(install_DATA)'; test -n "$(installdir)" || list=; \
-+	for p in $$list; do \
- 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
--	  f=$(am__strip_dir) \
--	  echo " $(installDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(installdir)/$$f'"; \
--	  $(installDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(installdir)/$$f"; \
-+	  echo "$$d$$p"; \
-+	done | $(am__base_list) | \
-+	while read files; do \
-+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(installdir)'"; \
-+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(installdir)" || exit $$?; \
- 	done
- 
- uninstall-installDATA:
- 	@$(NORMAL_UNINSTALL)
--	@list='$(install_DATA)'; for p in $$list; do \
--	  f=$(am__strip_dir) \
--	  echo " rm -f '$(DESTDIR)$(installdir)/$$f'"; \
--	  rm -f "$(DESTDIR)$(installdir)/$$f"; \
--	done
-+	@list='$(install_DATA)'; test -n "$(installdir)" || list=; \
-+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-+	test -n "$$files" || exit 0; \
-+	echo " ( cd '$(DESTDIR)$(installdir)' && rm -f" $$files ")"; \
-+	cd "$(DESTDIR)$(installdir)" && rm -f $$files
- 
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- 	unique=`for i in $$list; do \
- 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- 	  done | \
--	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
- 	mkid -fID $$unique
- tags: TAGS
- 
- TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
- 		$(TAGS_FILES) $(LISP)
--	tags=; \
-+	set x; \
- 	here=`pwd`; \
- 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
- 	unique=`for i in $$list; do \
-@@ -542,29 +532,34 @@
- 	  done | \
- 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
--	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+	shift; \
-+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
- 	  test -n "$$unique" || unique=$$empty_fix; \
--	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
--	    $$tags $$unique; \
-+	  if test $$# -gt 0; then \
-+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+	      "$$@" $$unique; \
-+	  else \
-+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+	      $$unique; \
-+	  fi; \
- 	fi
- ctags: CTAGS
- CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
- 		$(TAGS_FILES) $(LISP)
--	tags=; \
- 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
- 	unique=`for i in $$list; do \
- 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- 	  done | \
- 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
--	test -z "$(CTAGS_ARGS)$$tags$$unique" \
-+	test -z "$(CTAGS_ARGS)$$unique" \
- 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
--	     $$tags $$unique
-+	     $$unique
- 
- GTAGS:
- 	here=`$(am__cd) $(top_builddir) && pwd` \
--	  && cd $(top_srcdir) \
--	  && gtags -i $(GTAGS_ARGS) $$here
-+	  && $(am__cd) $(top_srcdir) \
-+	  && gtags -i $(GTAGS_ARGS) "$$here"
- 
- distclean-tags:
- 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-@@ -585,13 +580,17 @@
- 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- 	  if test -d $$d/$$file; then \
- 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-+	    if test -d "$(distdir)/$$file"; then \
-+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-+	    fi; \
- 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
--	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
- 	    fi; \
--	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
- 	  else \
--	    test -f $(distdir)/$$file \
--	    || cp -p $$d/$$file $(distdir)/$$file \
-+	    test -f "$(distdir)/$$file" \
-+	    || cp -p $$d/$$file "$(distdir)/$$file" \
- 	    || exit 1; \
- 	  fi; \
- 	done
-@@ -622,18 +621,14 @@
- 
- distclean-generic:
- 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
- 
- maintainer-clean-generic:
- 	@echo "This command is intended for maintainers to use"
- 	@echo "it deletes files that may require special tools to rebuild."
--#>- clean: clean-am
--#>+ 1
--clean: kde-rpo-clean  clean-am
--
--#>- clean-am: clean-generic clean-installLTLIBRARIES clean-libtool \
--#>- 	mostlyclean-am
--#>+ 2
--clean-am: clean-bcheck  clean-generic clean-installLTLIBRARIES clean-libtool \
-+clean: clean-am
-+
-+clean-am: clean-generic clean-installLTLIBRARIES clean-libtool \
- 	mostlyclean-am
- 
- distclean: distclean-am
-@@ -648,6 +643,8 @@
- 
- html: html-am
- 
-+html-am:
-+
- info: info-am
- 
- info-am:
-@@ -656,18 +653,28 @@
- 
- install-dvi: install-dvi-am
- 
-+install-dvi-am:
-+
- install-exec-am:
- 
- install-html: install-html-am
- 
-+install-html-am:
-+
- install-info: install-info-am
- 
-+install-info-am:
-+
- install-man:
- 
- install-pdf: install-pdf-am
- 
-+install-pdf-am:
-+
- install-ps: install-ps-am
- 
-+install-ps-am:
-+
- installcheck-am:
- 
- maintainer-clean: maintainer-clean-am
-@@ -707,74 +714,7 @@
- 	pdf pdf-am ps ps-am tags uninstall uninstall-am \
- 	uninstall-installDATA uninstall-installLTLIBRARIES
- 
-+
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
--
--#>+ 2
--KDE_DIST=test_fit.kst Makefile.in kstfit_general_levenberg_marquardt.xml Makefile.am 
--
--#>+ 2
--docs-am:
--
--#>+ 15
--force-reedit:
--		@for dep in $?; do \
--	  case '$(am__configure_deps)' in \
--	    *$$dep*) \
--	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
--		&& exit 0; \
--	      exit 1;; \
--	  esac; \
--	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kst/src/plugins/fits_nonlinear/general_levenberg_marquardt/Makefile'; \
--	cd $(top_srcdir) && \
--	  $(AUTOMAKE) --gnu  kst/src/plugins/fits_nonlinear/general_levenberg_marquardt/Makefile
--	cd $(top_srcdir) && perl admin/am_edit kst/src/plugins/fits_nonlinear/general_levenberg_marquardt/Makefile.in
--
--
--#>+ 21
--clean-bcheck: 
--	rm -f *.bchecktest.cc *.bchecktest.cc.class a.out
--
--bcheck: bcheck-am
--
--bcheck-am:
--	@for i in ; do \
--	    if test $(srcdir)/$$i -nt $$i.bchecktest.cc; then \
--	        echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
--	        echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
--	        echo "$$i"; \
--	        if ! $(CXXCOMPILE)  --dump-class-hierarchy -c $$i.bchecktest.cc; then \
--	            rm -f $$i.bchecktest.cc; exit 1; \
--	        fi ; \
--	        echo "" >> $$i.bchecktest.cc.class; \
--	        perl $(top_srcdir)/admin/bcheck.pl $$i.bchecktest.cc.class || { rm -f $$i.bchecktest.cc; exit 1; }; \
--	        rm -f a.out; \
--	    fi ; \
--	done
--
--
--#>+ 3
--final:
--	$(MAKE) all-am
--
--#>+ 3
--final-install:
--	$(MAKE) install-am
--
--#>+ 3
--no-final:
--	$(MAKE) all-am
--
--#>+ 3
--no-final-install:
--	$(MAKE) install-am
--
--#>+ 3
--kde-rpo-clean:
--	-rm -f *.rpo
--
--#>+ 3
--nmcheck: 
--nmcheck-am: nmcheck
+diff -ur kst-1.8.0/configure kst-1.8.0-exceptions/configure
+--- kst-1.8.0/configure	2009-07-03 07:54:34.000000000 -0400
++++ kst-1.8.0-exceptions/configure	2010-02-18 15:31:13.000000000 -0500
+@@ -6294,7 +6294,7 @@
+  { echo "$as_me:$LINENO: result: yes" >&5
+ echo "${ECHO_T}yes" >&6; }
+  :
+- CXXFLAGS="$CXXFLAGS -fno-exceptions"
++ CXXFLAGS="$CXXFLAGS"
+ else
+  { echo "$as_me:$LINENO: result: no" >&5
+ echo "${ECHO_T}no" >&6; }


Index: kst.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kst/devel/kst.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- kst.spec	25 Nov 2009 18:08:35 -0000	1.40
+++ kst.spec	18 Feb 2010 21:56:24 -0000	1.41
@@ -1,6 +1,6 @@
 Name:       kst
 Version:    1.8.0
-Release:    5%{?dist}
+Release:    6%{?dist}
 Summary:    A data viewing program for KDE
 
 Group:      Applications/Engineering
@@ -95,6 +95,12 @@ A plugin allowing kst to open and read d
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
 export KDEDIR=%{_prefix}
+#Libtool hack for 1.8.0 tarball.
+touch aclocal.m4
+touch Makefile.in
+touch configure
+touch config.h.in
+#End Hack.
 %configure --disable-dependency-tracking --disable-static \
   --disable-rpath \
   --with-qt-libraries=$QTDIR/lib \
@@ -253,6 +259,11 @@ rm -rf %{buildroot}
 %{_datadir}/services/kst/kstdata_dirfile.desktop
 
 %changelog
+* Fri Feb 12 2010 Matthew Truch <matt at truch.net> - 1.8.0-6
+- Hack to work around autotools build issue.
+-  Use the libtool in the tarball; do not generate a new one.
+- Modify kst-except.diff patch to *not* turn off exceptions in CXXFLAGS
+
 * Wed Nov 25 2009 Orion Poplawski <orion at cora.nwra.com> - 1.8.0-5
 - Rebuild for netcdf 4.1.0 and new cfitsio
 

