rpms/QuantLib/devel QuantLib-0.3.11-installdatahookfix.patch, NONE, 1.1 QuantLib.spec, 1.10, 1.11

[Tom Callaway (spot)]

Author: spot

Update of /cvs/extras/rpms/QuantLib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14256/devel

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

Fix patch.


QuantLib-0.3.11-installdatahookfix.patch:

--- NEW FILE QuantLib-0.3.11-installdatahookfix.patch ---
--- QuantLib-0.3.11/ql/Makefile.am.BAD	2005-11-17 10:02:14.000000000 -0600
+++ QuantLib-0.3.11/ql/Makefile.am	2005-11-17 10:02:50.000000000 -0600
@@ -77,8 +77,8 @@
 install-data-hook:
 	$(SED) -e "s,HAVE_CONFIG_H,QL_HAVE_CONFIG_H," \
            -e "s,/\* install-hook \*/,#define QL_HAVE_CONFIG_H," \
-           $(includedir)/qldefines.hpp > .qldefines.hpp
-	$(INSTALL_DATA) .qldefines.hpp $(includedir)/qldefines.hpp
+           $(DESTDIR)$(includedir)/qldefines.hpp > .qldefines.hpp
+	$(INSTALL_DATA) .qldefines.hpp $(DESTDIR)$(includedir)/qldefines.hpp
 	rm .qldefines.hpp
 	$(SED) -e "s,PACKAGE,QL_PACKAGE," \
            -e "s,STDC,QL_STDC," \
--- QuantLib-0.3.11/ql/Makefile.in.BAD	2005-11-17 10:02:54.000000000 -0600
+++ QuantLib-0.3.11/ql/Makefile.in	2005-11-17 10:03:29.000000000 -0600
@@ -760,8 +760,8 @@
 install-data-hook:
 	$(SED) -e "s,HAVE_CONFIG_H,QL_HAVE_CONFIG_H," \
            -e "s,/\* install-hook \*/,#define QL_HAVE_CONFIG_H," \
-           $(includedir)/qldefines.hpp > .qldefines.hpp
-	$(INSTALL_DATA) .qldefines.hpp $(includedir)/qldefines.hpp
+           $(DESTDIR)$(includedir)/qldefines.hpp > .qldefines.hpp
+	$(INSTALL_DATA) .qldefines.hpp $(DESTDIR)$(includedir)/qldefines.hpp
 	rm .qldefines.hpp
 	$(SED) -e "s,PACKAGE,QL_PACKAGE," \
            -e "s,STDC,QL_STDC," \


Index: QuantLib.spec
===================================================================
RCS file: /cvs/extras/rpms/QuantLib/devel/QuantLib.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- QuantLib.spec	16 Nov 2005 18:06:23 -0000	1.10
+++ QuantLib.spec	17 Nov 2005 16:09:08 -0000	1.11
@@ -2,13 +2,13 @@
 
 Name:		QuantLib
 Version:	0.3.11
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	A software framework for quantitative finance
 License:	BSD
 Group:		System Environment/Libraries
 URL:		http://www.quantlib.org
 Source0:	http://download.sourceforge.net/quantlib/QuantLib-%{version}.tar.gz
-Patch0:		QuantLib-0.3.8-installdatahookfix.patch
+Patch0:		QuantLib-0.3.11-installdatahookfix.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	boost-devel, tetex, tetex-latex, tetex-dvips, emacs
 
@@ -106,6 +106,9 @@
 %{docdir}/QuantLib-%{version}-docs-refman.ps
 
 %changelog
+* Thu Nov 17 2005 Tom "spot" Callaway <tcallawa at redhat.com> 0.3.11-2
+- fix patch
+
 * Wed Nov 16 2005 Tom "spot" Callaway <tcallawa at redhat.com> 0.3.11-1
 - bump for new release