[rmol/el6] clog

Wed Oct 26 22:09:46 UTC 2011

commit f93b8a40c9fd6a8d14d80a5d9e135fa7b01315d5
Author: Denis Arnaud <denis.arnaud_fedora at m4x.org>
Date:   Thu Oct 27 00:09:41 2011 +0200

    clog

 rmol.spec |  107 +++++++++++++++++++++++++-----------------------------------
 sources   |    3 +-
 2 files changed, 46 insertions(+), 64 deletions(-)
---

diff --git a/rmol.spec b/rmol.spec
index 19f44a4..8bb656f 100644
--- a/rmol.spec
+++ b/rmol.spec
@@ -2,27 +2,24 @@
 %global mydocs __tmp_docdir
 #
 Name:           rmol
-Version:        0.23.0
-Release:        3%{?dist}
+Version:        0.25.0
+Release:        1%{?dist}
 
 Summary:        C++ library of Revenue Management and Optimisation classes and functions
 
 Group:          System Environment/Libraries 
-License:        LGPLv2
+License:        LGPLv2+
 URL:            http://%{name}.sourceforge.net
-Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
+BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
-# Patch for g++ 4.5 compatibility. Already fixed by upstream.
-Patch0:         rmol_fix_gcc_45_compilation_error.patch
+BuildRequires:  cmake, python-devel
+BuildRequires:  boost-devel, soci-mysql-devel, zeromq-devel
+BuildRequires:  readline-devel, stdair-devel, airrac-devel
 
-BuildRequires:  gsl-devel
-BuildRequires:  boost-devel
-BuildRequires:  cppunit-devel
-#Requires:       
 
 %description
-RMOL is a C++ library of Revenue Management and Optimisation classes 
+%{name} is a C++ library of Revenue Management and Optimisation classes 
 and functions. Typically, that library may be used by service providers
 (e.g., airlines offering flight seats, hotels offering rooms, rental car
 companies offering rental days, broadcasting company offering advertisement 
@@ -33,68 +30,58 @@ book:
 The Theory and practice of Revenue Management, by Kalyan T. Talluri and
 Garrett J. van Ryzin, Kluwer Academic Publishers, 2004, ISBN 1-4020-7701-7
 
-Install the %{name} package if you need a library for high-level
-revenue management functionality.
+%{name} makes an extensive use of existing open-source libraries for
+increased functionality, speed and accuracy. In particular the
+Boost (C++ Standard Extensions: http://www.boost.org) library is used.
+
+Install the %{name} package if you need a library of basic C++ objects
+for Airline Revenue Management (RM), mainly for simulation purpose.
 
 %package        devel
-Summary:        Header files, libraries and development documentation for %{name}
+Summary:        Header files, libraries and development helper tools for %{name}
 Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}
+Requires:       %{name}%{?_isa} = %{version}-%{release}
 Requires:       pkgconfig
-Requires(post): info
-Requires(preun): info
 
 %description    devel
-This package contains the header files, static libraries and
-development documentation for %{name}. If you would like to develop
+This package contains the header files, shared libraries and
+development helper tools for %{name}. If you would like to develop
 programs using %{name}, you will need to install %{name}-devel.
 
-%package doc
-Summary:        HTML documentation for the RMOL library
+%package        doc
+Summary:        HTML documentation for the %{name} library
 Group:          Documentation
-%if 0%{?fedora} >= 10
+%if 0%{?fedora} || 0%{?rhel} > 5
 BuildArch:      noarch
-BuildRequires:  texlive-latex
-%endif
-%if 0%{?fedora} < 10
-BuildRequires:  tetex-latex
 %endif
-%{?el5:BuildRequires: tetex-latex}
+BuildRequires:  tex(latex)
 BuildRequires:  doxygen, ghostscript
 
-%description doc
-This package contains the documentation in the HTML format of the RMOL
-library. The documentation is the same as at the RMOL web page.
+%description    doc
+This package contains HTML pages, as well as a PDF reference manual,
+for %{name}. All that documentation is generated thanks to Doxygen
+(http://doxygen.org). The content is the same as what can be browsed
+online (http://%{name}.org).
 
 
 %prep
 %setup -q
 
-# Apply the g++ 4.5 compatibility patch
-%patch0 -p0
-
-# find ./doc -type f -perm 755 -exec chmod 644 {} \;
-# Fix some permissions and formats
-rm -f INSTALL
-chmod -x ABOUT-NLS AUTHORS ChangeLog COPYING NEWS README TODO
-find . -type f -name '*.[hc]pp' -exec chmod 644 {} \;
-
 
 %build
-%configure --disable-static
+%cmake .
 make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-%find_lang %{name}
-# remove unpackaged files from the buildroot
-#rm -f $RPM_BUILD_ROOT%{_includedir}/%{name}/config.h
-rm -f $RPM_BUILD_ROOT%{_infodir}/dir
-rm -f $RPM_BUILD_ROOT%{_libdir}/lib%{name}.la
-# chmod 644 doc/html/installdox doc/html/*.png doc/html/*.ico
-rm -rf %{mydocs} && mkdir -p %{mydocs}
+
+mkdir -p %{mydocs}
 mv $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/html %{mydocs}
+rm -f %{mydocs}/html/installdox
+
+%check
+#ctest
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -103,22 +90,13 @@ rm -rf $RPM_BUILD_ROOT
 
 %postun -p /sbin/ldconfig
 
-%post devel
-/sbin/install-info %{_infodir}/%{name}-ref.info.* %{_infodir}/dir || :
 
-%preun devel 
-if [ "$1" = 0 ]; then
-   /sbin/install-info --delete %{_infodir}/%{name}-ref.info.* %{_infodir}/dir || :
-fi
-
-%files -f %{name}.lang
+%files
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING NEWS README
 %{_bindir}/%{name}
-%{_libdir}/lib*.so.*
-%{_mandir}/man3/%{name}.3.*
-%dir %{_datadir}/%{name}
-%{_datadir}/%{name}/samples/*.csv
+%{_libdir}/lib%{name}.so.*
+%{_mandir}/man1/%{name}.1.*
 
 %files devel
 %defattr(-,root,root,-)
@@ -127,16 +105,21 @@ fi
 %{_libdir}/lib%{name}.so
 %{_libdir}/pkgconfig/%{name}.pc
 %{_datadir}/aclocal/%{name}.m4
-%{_infodir}/%{name}-ref.info.*
+%dir %{_datadir}/%{name}
+%{_datadir}/%{name}/CMake
 %{_mandir}/man1/%{name}-config.1.*
+%{_mandir}/man3/%{name}-library.3.*
 
 %files doc
 %defattr(-,root,root,-)
 %doc %{mydocs}/html
-%doc AUTHORS ChangeLog COPYING NEWS README
+%doc COPYING
 
 
 %changelog
+* Wed Oct 26 2011 Denis Arnaud <denis.arnaud_fedora at m4x.org> 0.25.0-1
+- Upstream integration
+
 * Wed Jul 28 2010 Denis Arnaud <denis.arnaud_fedora at m4x.org> 0.23.0-3
 - Added a patch to fix Rawhide build error
 
diff --git a/sources b/sources
index 41515d6..4124dfb 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-4efd1c6a4edff1a0e35decabb2e1e6ef  rmol-0.23.0.tar.gz
-7f48936f4066868b55d368e761195f13  rmol_fix_gcc_45_compilation_error.patch
+b0054ffdf16d9a74770af63b10eceeef  rmol-0.25.0.tar.bz2
