rpms/QuantLib/FC-3 QuantLib-0.3.11-installdatahookfix.patch, 1.1, 1.2 QuantLib.spec, 1.11, 1.12

[Tom Callaway (spot)]

Author: spot

Update of /cvs/extras/rpms/QuantLib/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27074/FC-3

Modified Files:
	QuantLib-0.3.11-installdatahookfix.patch QuantLib.spec 
Log Message:

Alright, lets get this thing building.


QuantLib-0.3.11-installdatahookfix.patch:

Index: QuantLib-0.3.11-installdatahookfix.patch
===================================================================
RCS file: /cvs/extras/rpms/QuantLib/FC-3/QuantLib-0.3.11-installdatahookfix.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- QuantLib-0.3.11-installdatahookfix.patch	17 Nov 2005 16:08:49 -0000	1.1
+++ QuantLib-0.3.11-installdatahookfix.patch	18 Nov 2005 16:25:23 -0000	1.2
@@ -24,3 +24,55 @@
  	rm .qldefines.hpp
  	$(SED) -e "s,PACKAGE,QL_PACKAGE," \
             -e "s,STDC,QL_STDC," \
+--- QuantLib-0.3.11/ql/Makefile.am.BAD	2005-11-17 11:43:49.000000000 -0600
++++ QuantLib-0.3.11/ql/Makefile.am	2005-11-17 11:47:19.000000000 -0600
+@@ -93,8 +93,8 @@
+ if ENABLE_STATIC
+ 
+ install-exec-hook:
+-	mv $(libdir)/libQuantLib.a $(libdir)/libQuantLib-$(PACKAGE_VERSION).a
+-	$(LN_S) $(libdir)/libQuantLib-$(PACKAGE_VERSION).a $(libdir)/libQuantLib.a
++	mv $(DESTDIR)$(libdir)/libQuantLib.a $(DESTDIR)$(libdir)/libQuantLib-$(PACKAGE_VERSION).a
++	$(LN_S) $(libdir)/libQuantLib-$(PACKAGE_VERSION).a $(DESTDIR)$(libdir)/libQuantLib.a
+ 
+ endif
+ 
+--- QuantLib-0.3.11/ql/Makefile.in.BAD	2005-11-17 11:42:33.000000000 -0600
++++ QuantLib-0.3.11/ql/Makefile.in	2005-11-17 11:43:39.000000000 -0600
+@@ -774,8 +774,8 @@
+ 	makedepend $(INCLUDES) -- $(CFLAGS) -- $(SOURCES)
+ 
+ @ENABLE_STATIC_TRUE at install-exec-hook:
+- at ENABLE_STATIC_TRUE@	mv $(libdir)/libQuantLib.a $(libdir)/libQuantLib-$(PACKAGE_VERSION).a
+- at ENABLE_STATIC_TRUE@	$(LN_S) $(libdir)/libQuantLib-$(PACKAGE_VERSION).a $(libdir)/libQuantLib.a
++ at ENABLE_STATIC_TRUE@	mv $(DESTDIR)$(libdir)/libQuantLib.a $(DESTDIR)$(libdir)/libQuantLib-$(PACKAGE_VERSION).a
++ at ENABLE_STATIC_TRUE@	$(LN_S) $(libdir)/libQuantLib-$(PACKAGE_VERSION).a $(DESTDIR)$(libdir)/libQuantLib.a
+ # 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:
+--- QuantLib-0.3.11/ql/Makefile.am.BAD	2005-11-17 16:13:41.000000000 -0600
++++ QuantLib-0.3.11/ql/Makefile.am	2005-11-17 16:14:05.000000000 -0600
+@@ -84,8 +84,8 @@
+            -e "s,STDC,QL_STDC," \
+            -e "s, HAVE, QL_HAVE," \
+            -e "s, VERSION, QL_AC_VERSION," \
+-           $(includedir)/config.hpp > .config.hpp
+-	$(INSTALL_DATA) .config.hpp $(includedir)/config.hpp
++           $(DESTDIR)$(includedir)/config.hpp > .config.hpp
++	$(INSTALL_DATA) .config.hpp $(DESTDIR)$(includedir)/config.hpp
+ 	rm .config.hpp
+ depend:
+ 	makedepend $(INCLUDES) -- $(CFLAGS) -- $(SOURCES)
+--- QuantLib-0.3.11/ql/Makefile.in.BAD	2005-11-17 16:14:56.000000000 -0600
++++ QuantLib-0.3.11/ql/Makefile.in	2005-11-17 16:15:21.000000000 -0600
+@@ -767,8 +767,8 @@
+            -e "s,STDC,QL_STDC," \
+            -e "s, HAVE, QL_HAVE," \
+            -e "s, VERSION, QL_AC_VERSION," \
+-           $(includedir)/config.hpp > .config.hpp
+-	$(INSTALL_DATA) .config.hpp $(includedir)/config.hpp
++           $(DESTDIR)$(includedir)/config.hpp > .config.hpp
++	$(INSTALL_DATA) .config.hpp $(DESTDIR)$(includedir)/config.hpp
+ 	rm .config.hpp
+ depend:
+ 	makedepend $(INCLUDES) -- $(CFLAGS) -- $(SOURCES)


Index: QuantLib.spec
===================================================================
RCS file: /cvs/extras/rpms/QuantLib/FC-3/QuantLib.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- QuantLib.spec	17 Nov 2005 16:08:49 -0000	1.11
+++ QuantLib.spec	18 Nov 2005 16:25:23 -0000	1.12
@@ -2,7 +2,7 @@
 
 Name:		QuantLib
 Version:	0.3.11
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	A software framework for quantitative finance
 License:	BSD
 Group:		System Environment/Libraries
@@ -48,7 +48,7 @@
 %patch0 -p1
 
 %build
-%configure
+%configure CFLAGS="$RPM_OPT_FLAGS -fpermissive" CPPFLAGS="$RPM_OPT_FLAGS -fpermissive"
 make %{?_smp_mflags}
 cd Docs
 make docs-all
@@ -81,8 +81,7 @@
 %files devel
 %defattr(-,root,root)
 %{_includedir}/ql/
-%{_libdir}/libQuantLib.a
-%{_libdir}/libQuantLibFunctions.a
+%{_libdir}/libQuantLib*.a
 %{_bindir}/quantlib-config
 %{_mandir}/man1/quantlib-config.*
 %{_datadir}/aclocal/quantlib.m4
@@ -106,6 +105,9 @@
 %{docdir}/QuantLib-%{version}-docs-refman.ps
 
 %changelog
+* Fri Nov 18 2005 Tom "spot" Callaway <tcallawa at redhat.com> 0.3.11-3
+- use -fpermissive to deal with icky c++ code
+
 * Thu Nov 17 2005 Tom "spot" Callaway <tcallawa at redhat.com> 0.3.11-2
 - fix patch