[QuantLib/f17] 1.2

[Tom Callaway]

commit 0bf3f4bb9e3994296a827831b85a7643410ae0df
Author: Tom Callaway <spot at fedoraproject.org>
Date:   Tue Apr 3 10:21:10 2012 -0400

    1.2

 QuantLib.spec |   39 ++++++++++++++-------------------------
 sources       |    2 +-
 2 files changed, 15 insertions(+), 26 deletions(-)
---
diff --git a/QuantLib.spec b/QuantLib.spec
index 8d14d2a..b3dee69 100644
--- a/QuantLib.spec
+++ b/QuantLib.spec
@@ -1,8 +1,8 @@
 %define docdir %{_datadir}/doc/QuantLib-%{version}
 
 Name:		QuantLib
-Version:	1.1
-Release:	5%{?dist}
+Version:	1.2
+Release:	1%{?dist}
 Summary:	A software framework for quantitative finance
 License:	BSD
 Group:		System Environment/Libraries
@@ -17,7 +17,7 @@ risk management in real-life.
 %package devel
 Summary:	QuantLib development files
 Group:		Development/Libraries
-Requires:	%{name} = %{version}-%{release}
+Requires:	%{name}%{?_isa} = %{version}-%{release}
 
 %description devel
 Static libraries and headers for QuantLib.
@@ -25,7 +25,7 @@ Static libraries and headers for QuantLib.
 %package test
 Summary:	The test-suite to check the setup of QuantLib
 Group:		Development/Tools
-Requires:	%{name} = %{version}-%{release}
+Requires:	%{name}%{?_isa} = %{version}-%{release}
 
 %description test
 The QuantLib-test-suite will validate the compiled code against 
@@ -64,23 +64,10 @@ cp -p man/*.1 $RPM_BUILD_ROOT/%{_mandir}/man1/
 cp -pr Docs/man/man3 $RPM_BUILD_ROOT/%{_mandir}/
 rm -rf $RPM_BUILD_ROOT/%{_libdir}/*.la
 rm -rf $RPM_BUILD_ROOT/%{_libdir}/*.a
-# generic names already used by other packages
-mv $RPM_BUILD_ROOT/%{_mandir}/man3/Constraint.3 $RPM_BUILD_ROOT/%{_mandir}/man3/ql-Constraint.3
-mv $RPM_BUILD_ROOT/%{_mandir}/man3/history.3 $RPM_BUILD_ROOT/%{_mandir}/man3/ql-history.3
-mv $RPM_BUILD_ROOT/%{_mandir}/man3/format.3 $RPM_BUILD_ROOT/%{_mandir}/man3/ql-format.3
-mv $RPM_BUILD_ROOT/%{_mandir}/man3/gamma.3 $RPM_BUILD_ROOT/%{_mandir}/man3/ql-gamma.3
-mv $RPM_BUILD_ROOT/%{_mandir}/man3/manips.3 $RPM_BUILD_ROOT/%{_mandir}/man3/ql-manips.3
-mv $RPM_BUILD_ROOT/%{_mandir}/man3/engines.3 $RPM_BUILD_ROOT/%{_mandir}/man3/ql-engines.3
-mv $RPM_BUILD_ROOT/%{_mandir}/man3/rate.3 $RPM_BUILD_ROOT/%{_mandir}/man3/ql-rate.3
-mv $RPM_BUILD_ROOT/%{_mandir}/man3/floor.3 $RPM_BUILD_ROOT/%{_mandir}/man3/ql-floor.3
-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/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
-
+# So many of the names in the Quantlib manpages are generic, so we rename them to avoid conflicts.
+for i in Constraint history format gamma manips engines rate floor group license todo error y0 end deprecated attachment description domain init length method next setup state value; do
+	mv $RPM_BUILD_ROOT/%{_mandir}/man3/$i.3 $RPM_BUILD_ROOT/%{_mandir}/man3/ql-$i.3
+done
 
 # 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
@@ -112,12 +99,10 @@ touch -r News.txt $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/quantlib.elc
 %postun -p /sbin/ldconfig
 
 %files
-%defattr(-,root,root)
 %doc LICENSE.TXT
 %{_libdir}/libQuantLib.so.*
 
 %files devel
-%defattr(-,root,root)
 %{_includedir}/ql/
 %{_libdir}/libQuantLib.so
 %{_bindir}/quantlib-config
@@ -127,12 +112,10 @@ touch -r News.txt $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/quantlib.elc
 %{_datadir}/emacs/site-lisp/*
 
 %files test
-%defattr(-,root,root)
 %{_bindir}/quantlib-test-suite
 %{_mandir}/man1/quantlib-test-suite.*
 
 %files doc
-%defattr(-,root,root)
 %doc Authors.txt ChangeLog.txt Readme.txt News.txt Contributors.txt
 %{_mandir}/man3/*
 %{_mandir}/man1/Bonds.*
@@ -152,6 +135,12 @@ touch -r News.txt $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/quantlib.elc
 #%{docdir}/QuantLib-%{version}-docs-refman.ps
 
 %changelog
+* Tue Apr  3 2012 Tom Callaway <spot at fedoraproject.org> - 1.2-1
+- update to 1.2
+
+* Mon Apr  2 2012 Tom Callaway <spot at fedoraproject.org> - 1.1-6
+- fix more manpage conflicts
+
 * Tue Feb 28 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1-5
 - Rebuilt for c++ ABI breakage
 
diff --git a/sources b/sources
index e08f150..6ee87b2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-bca1281b64677edab96cc97d2b1a6678  QuantLib-1.1.tar.gz
+b7d13feb6c24671e171a28dc1898a0d2  QuantLib-1.2.tar.gz