rpms/QuantLib/devel QuantLib.spec,1.22,1.23

[Tom Callaway (spot)]

Author: spot

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

Modified Files:
	QuantLib.spec 
Log Message:

fix conflicts (normal and multilib)



Index: QuantLib.spec
===================================================================
RCS file: /cvs/extras/rpms/QuantLib/devel/QuantLib.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- QuantLib.spec	20 Sep 2007 20:40:15 -0000	1.22
+++ QuantLib.spec	29 Oct 2007 19:56:51 -0000	1.23
@@ -2,7 +2,7 @@
 
 Name:		QuantLib
 Version:	0.8.1
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	A software framework for quantitative finance
 License:	BSD
 Group:		System Environment/Libraries
@@ -81,6 +81,8 @@
 mv $RPM_BUILD_ROOT/%{_mandir}/man3/group.3 $RPM_BUILD_ROOT/%{_mandir}/man3/ql-group.3
 mv $RPM_BUILD_ROOT/%{_mandir}/man3/license.3 $RPM_BUILD_ROOT/%{_mandir}/man3/ql-license.3
 mv $RPM_BUILD_ROOT/%{_mandir}/man3/std.3 $RPM_BUILD_ROOT/%{_mandir}/man3/ql-std.3
+mv $RPM_BUILD_ROOT/%{_mandir}/man3/deprecated.3 $RPM_BUILD_ROOT/%{_mandir}/man3/ql-deprecated.3
+mv $RPM_BUILD_ROOT/%{_mandir}/man3/todo.3 $RPM_BUILD_ROOT/%{_mandir}/man3/ql-todo.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
@@ -119,6 +121,10 @@
 recode $RPM_BUILD_ROOT%{_mandir}/man3/ql-history.3 iso-8859-1
 recode $RPM_BUILD_ROOT%{_mandir}/man3/ql-license.3 iso-8859-1
 
+# Fix multilib conflicts
+touch -r News.txt $RPM_BUILD_ROOT%{_bindir}/quantlib-config
+touch -r News.txt $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/quantlib.elc
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -163,6 +169,10 @@
 #%{docdir}/QuantLib-%{version}-docs-refman.ps
 
 %changelog
+* Mon Oct 29 2007 Tom "spot" Callaway <tcallawa at redhat.com> 0.8.1-4
+- fix more conflicting manpages (bz 322201)
+- fix multilib conflict (bz 343041)
+
 * Thu Sep 20 2007 Tom "spot" Callaway <tcallawa at redhat.com> 0.8.1-3
 - another conflicting man page (resolves bugzilla 297161)