rpms/QuantLib/devel QuantLib.spec,1.30,1.31

[Tom Callaway]

Author: spot

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

Modified Files:
	QuantLib.spec 
Log Message:
fix file conflicts


Index: QuantLib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/QuantLib/devel/QuantLib.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- QuantLib.spec	21 Nov 2008 00:09:34 -0000	1.30
+++ QuantLib.spec	24 Nov 2008 18:12:49 -0000	1.31
@@ -2,7 +2,7 @@
 
 Name:		QuantLib
 Version:	0.9.7
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	A software framework for quantitative finance
 License:	BSD
 Group:		System Environment/Libraries
@@ -80,6 +80,9 @@
 mv $RPM_BUILD_ROOT/%{_mandir}/man3/todo.3 $RPM_BUILD_ROOT/%{_mandir}/man3/ql-todo.3
 mv $RPM_BUILD_ROOT/%{_mandir}/man3/error.3 $RPM_BUILD_ROOT/%{_mandir}/man3/ql-error.3
 mv $RPM_BUILD_ROOT/%{_mandir}/man3/y0.3 $RPM_BUILD_ROOT/%{_mandir}/man3/ql-y0.3
+mv $RPM_BUILD_ROOT/%{_mandir}/man3/end.3 $RPM_BUILD_ROOT/%{_mandir}/man3/ql-end.3
+mv $RPM_BUILD_ROOT/%{_mandir}/man3/deprecated.3 $RPM_BUILD_ROOT/%{_mandir}/man3/ql-deprecated.3
+
 
 # Get rid of spaces in man page names
 mv "$RPM_BUILD_ROOT/%{_mandir}/man3/Singleton_ ExchangeRateManager _.3" $RPM_BUILD_ROOT/%{_mandir}/man3/Singleton_ExchangeRateManager.3
@@ -155,6 +158,9 @@
 #%{docdir}/QuantLib-%{version}-docs-refman.ps
 
 %changelog
+* Mon Nov 24 2008 Tom "spot" Callaway <tcallawa at redhat.com> 0.9.7-3
+- rename conflicting man pages (bz 472615)
+
 * Thu Nov 20 2008 Tom "spot" Callaway <tcallawa at redhat.com> 0.9.7-2
 - missing man pages