Upstream integration

rmol.spec

@@ -2,23 +2,23 @@
 %global mydocs __tmp_docdir
 #
 Name:           rmol
-Version:        0.23.1
+Version:        0.25.0
-Release:        5%{?dist}
+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.bz2
-%{?el5:BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)}
+BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+
+BuildRequires:  cmake, python-devel, boost-devel
+BuildRequires:  readline-devel, stdair-devel, airrac-devel
 
-BuildRequires:  gsl-devel
-BuildRequires:  boost-devel
-BuildRequires:  cppunit-devel
 
 %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 
@@ -29,47 +29,42 @@ 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
+%{name} makes an extensive use of existing open-source libraries for
-revenue management functionality.
+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
+This package contains the header files, shared libraries and
-development documentation for %{name}. If you would like to develop
+development helper tools for %{name}. If you would like to develop
 programs using %{name}, you will need to install %{name}-devel.
 
-%package doc
+%package        doc
-Summary:        HTML documentation for the RMOL library
+Summary:        HTML documentation for the %{name} library
 Group:          Documentation
-%if 0%{?fedora} >= 10
+%{?fedora:BuildArch:      noarch}
-BuildArch:      noarch
+BuildRequires:  tex(latex)
-BuildRequires:  texlive-latex
-%endif
-%if 0%{?fedora} < 10
-BuildRequires:  tetex-latex
-%endif
-%{?el5:BuildRequires: tetex-latex}
 BuildRequires:  doxygen, ghostscript
 
-%description doc
+%description    doc
-This package contains the documentation in the HTML format of the RMOL
+This package contains HTML pages, as well as a PDF reference manual,
-library. The documentation is the same as at the RMOL web page.
+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
-# 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
@@ -79,13 +74,13 @@ 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
+# Remove unpackaged files from the buildroot
 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
+mkdir -p %{mydocs}
-rm -rf %{mydocs} && mkdir -p %{mydocs}
 mv $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/html %{mydocs}
 
 %clean
@@ -107,10 +102,8 @@ fi
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING NEWS README
 %{_bindir}/%{name}
-%{_libdir}/lib*.so.*
+%{_libdir}/lib%{name}.so.*
-%{_mandir}/man3/%{name}.3.*
+%{_mandir}/man1/%{name}.1.*
-%dir %{_datadir}/%{name}
-%{_datadir}/%{name}/samples/*.csv
 
 %files devel
 %defattr(-,root,root,-)
@@ -120,15 +113,21 @@ fi
 %{_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
+* Sun Oct 23 2011 Denis Arnaud <denis.arnaud_fedora@m4x.org> 0.25.0-1
+- Upstream integration
+
 * Sat Jul 23 2011 Denis Arnaud <denis.arnaud_fedora@m4x.org> - 0.23.1-5
 - Rebuild for Boost-1.47.0-2
 
@@ -180,4 +179,3 @@ fi
 
 * Wed Mar  4 2009 Denis Arnaud <denis.arnaud_fedora@m4x.org> 0.18.0-1
 - Second RPM release
-