[coin-or-Ipopt/f18: 2/2] Correct rawhide FTBFS and switch to unversioned docdir

[pcpa]

commit e885ac9a432a44d3f7804d0ed8e8667f6f9ea2cf
Author: pcpa <paulo.cesar.pereira.de.andrade at gmail.com>
Date:   Wed Aug 7 17:12:45 2013 -0300

    Correct rawhide FTBFS and switch to unversioned docdir

 coin-or-Ipopt-docdir.patch |    4 ++--
 coin-or-Ipopt.spec         |   19 ++++++++++++++-----
 2 files changed, 16 insertions(+), 7 deletions(-)
---
diff --git a/coin-or-Ipopt-docdir.patch b/coin-or-Ipopt-docdir.patch
index 5066e81..9f68d2d 100644
--- a/coin-or-Ipopt-docdir.patch
+++ b/coin-or-Ipopt-docdir.patch
@@ -6,10 +6,10 @@ diff -up Ipopt-3.11.0/Makefile.in.orig Ipopt-3.11.0/Makefile.in
  pkgconfiglibdir = $(libdir)/pkgconfig
  pkgconfiglib_DATA = ipopt.pc
 -addlibsdir = $(DESTDIR)$(datadir)/coin/doc/Ipopt
-+addlibsdir = $(DESTDIR)$(datadir)/doc/coin-or-$(PACKAGE_NAME)-$(PACKAGE_VERSION)
++addlibsdir = $(DESTDIR)$(datadir)/doc/coin-or-$(PACKAGE_NAME)
  DocFiles = README AUTHORS LICENSE
 -DocInstallDir = $(datadir)/coin/doc/$(PACKAGE_NAME)
-+DocInstallDir = $(datadir)/doc/coin-or-$(PACKAGE_NAME)-$(PACKAGE_VERSION)
++DocInstallDir = $(datadir)/doc/coin-or-$(PACKAGE_NAME)
  all: all-recursive
  
  .SUFFIXES:
diff --git a/coin-or-Ipopt.spec b/coin-or-Ipopt.spec
index 873d727..2dc803b 100644
--- a/coin-or-Ipopt.spec
+++ b/coin-or-Ipopt.spec
@@ -1,10 +1,15 @@
 %global		module		Ipopt
+%if 0%{?fedora} < 20
+%global		lmpi_f77	-lmpi_f77
+%else
+%global		lmpi_f77	-lmpi_mpifh
+%endif
 
 Name:		coin-or-%{module}
 Group:		Applications/Engineering
 Summary:	Interior Point OPTimizer
 Version:	3.11.0
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	EPL and GPLv2+
 URL:		https://projects.coin-or.org/%{module}
 Source0:	http://www.coin-or.org/download/pkgsource/%{module}/%{module}-%{version}.tgz
@@ -82,7 +87,7 @@ This package contains the documentation for %{name}.
 %build
 %_openmpi_load
 %configure							\
-	--with-mumps-lib="-ldmumps -L$MPI_LIB -lmpi -lscalapack -llapack -lmpiblacs -lmpi_f77 -lmpiblacsF77init -lmpiblacsCinit -lmpi_cxx"	\
+	--with-mumps-lib="-ldmumps -L$MPI_LIB -lmpi -lscalapack -llapack -lmpiblacs %{lmpi_f77} -lmpiblacsF77init -lmpiblacsCinit -lmpi_cxx"	\
 	--with-mumps-incdir=%{_includedir}/MUMPS
 
 # Kill rpaths
@@ -101,7 +106,7 @@ make %{?_smpflags}						\
 make install DESTDIR=%{buildroot}
 rm -f %{buildroot}%{_libdir}/*.la
 
-cp -far doxydoc/html %{buildroot}%{_docdir}/%{name}-%{version}
+cp -far doxydoc/html %{buildroot}%{_docdir}/%{name}
 
 # https://projects.coin-or.org/Ipopt/ticket/75
 %check
@@ -113,7 +118,7 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir}:$LD_LIBRARY_PATH make test
 %postun -p /sbin/ldconfig
 
 %files
-%doc %{_docdir}/%{name}-%{version}
+%doc %{_docdir}/%{name}
 %{_libdir}/*.so.*
 
 %files		devel
@@ -122,9 +127,13 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir}:$LD_LIBRARY_PATH make test
 %{_libdir}/pkgconfig/*
 
 %files		doc
-%{_docdir}/%{name}-%{version}/html
+%{_docdir}/%{name}/html
 
 %changelog
+* Wed Aug  7 2013 pcpa <paulo.cesar.pereira.de.andrade at gmail.com> - 3.11.0-3
+- Switch to unversioned docdir.
+- Correct rawhide FTBFS (#992075).
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.11.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild