From 0f673eea951ec3a686cb8e910036f35b0da2b0a8 Mon Sep 17 00:00:00 2001 From: Denis Arnaud Date: Mon, 4 May 2009 00:03:22 +0000 Subject: [PATCH] Synchronisation with upstream (new version 0.20.0). --- .cvsignore | 2 +- import.log | 1 + rmol.spec | 9 +++++++-- sources | 2 +- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index c9d0623..7218f41 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -rmol-0.19.0.tar.gz +rmol-0.20.0.tar.gz diff --git a/import.log b/import.log index 955f4b5..cc1f883 100644 --- a/import.log +++ b/import.log @@ -1 +1,2 @@ rmol-0_19_0-1_fc10:HEAD:rmol-0.19.0-1.fc10.src.rpm:1239741024 +rmol-0_20_0-1_fc10:HEAD:rmol-0.20.0-1.fc10.src.rpm:1241395329 diff --git a/rmol.spec b/rmol.spec index 424482f..9f093b1 100644 --- a/rmol.spec +++ b/rmol.spec @@ -2,7 +2,7 @@ %define mydocs __tmp_docdir # Name: rmol -Version: 0.19.0 +Version: 0.20.0 Release: 1%{?dist} Summary: C++ library of Revenue Management and Optimisation classes and functions @@ -75,7 +75,7 @@ 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%{_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 @@ -103,6 +103,8 @@ fi %{_bindir}/%{name} %{_libdir}/lib*.so.* %{_mandir}/man3/%{name}.3.* +%dir %{_datadir}/%{name} +%{_datadir}/%{name}/samples/*.csv %files devel %defattr(-,root,root,-) @@ -121,6 +123,9 @@ fi %changelog +* Sun May 03 2009 Denis Arnaud 0.20.0-1 +- Upstream integration + * Sun Mar 25 2009 Denis Arnaud 0.19.0-1 - RPM release for Fedora 10 diff --git a/sources b/sources index d87f0ad..6198c6b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6d124af07a5cea807f47acab699a38c5 rmol-0.19.0.tar.gz +1ad021296f4c7c981040385f3486c6c2 rmol-0.20.0.tar.gz