[rmol/f12/master] * Wed Jul 28 2010 Denis Arnaud <denis.arnaud_fedora at m4x.org> 0.23.0-3 - Added a patch to fix Rawhide
Denis Arnaud
denisarnaud at fedoraproject.org
Fri Jul 30 22:15:55 UTC 2010
commit 65c48dba4f79a96571bbae899d3db11b0b26867b
Author: Denis Arnaud <denis.arnaud_fedora at m4x.org>
Date: Sat Jul 31 00:15:48 2010 +0200
* Wed Jul 28 2010 Denis Arnaud <denis.arnaud_fedora at m4x.org> 0.23.0-3
- Added a patch to fix Rawhide build error
.gitignore | 9 ++++++++-
rmol.spec | 17 +++++++++++++++--
rmol_fix_gcc_45_compilation_error.patch | 29 +++++++++++++++++++++++++++++
3 files changed, 52 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 6b0f9ed..e9b09cb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,8 @@
-rmol-0.23.0.tar.gz
+clog
+rmol-*.tar.*
+rmol_*.patch
+.build-*.log
+rmol-*.src.rpm
+rmol-0.23.0
+x86_64
+
diff --git a/rmol.spec b/rmol.spec
index 095a073..19f44a4 100644
--- a/rmol.spec
+++ b/rmol.spec
@@ -1,9 +1,9 @@
#
-%define mydocs __tmp_docdir
+%global mydocs __tmp_docdir
#
Name: rmol
Version: 0.23.0
-Release: 1%{?dist}
+Release: 3%{?dist}
Summary: C++ library of Revenue Management and Optimisation classes and functions
@@ -13,6 +13,9 @@ URL: http://%{name}.sourceforge.net
Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+# Patch for g++ 4.5 compatibility. Already fixed by upstream.
+Patch0: rmol_fix_gcc_45_compilation_error.patch
+
BuildRequires: gsl-devel
BuildRequires: boost-devel
BuildRequires: cppunit-devel
@@ -66,6 +69,10 @@ library. The documentation is the same as at the RMOL web page.
%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
@@ -130,6 +137,12 @@ fi
%changelog
+* Wed Jul 28 2010 Denis Arnaud <denis.arnaud_fedora at m4x.org> 0.23.0-3
+- Added a patch to fix Rawhide build error
+
+* Fri Jan 22 2010 Rahul Sundaram <sundaram at fedoraproject.org> 0.23.0-2
+- Rebuild for Boost soname bump
+
* Tue Sep 15 2009 Denis Arnaud <denis.arnaud_fedora at m4x.org> 0.23.0-1
- Upstream integration
diff --git a/rmol_fix_gcc_45_compilation_error.patch b/rmol_fix_gcc_45_compilation_error.patch
new file mode 100644
index 0000000..0c66b36
--- /dev/null
+++ b/rmol_fix_gcc_45_compilation_error.patch
@@ -0,0 +1,29 @@
+Index: rmol/service/RMOL_ServiceContext.cpp
+===================================================================
+--- rmol/service/RMOL_ServiceContext.cpp (revision 312)
++++ rmol/service/RMOL_ServiceContext.cpp (working copy)
+@@ -113,7 +113,7 @@
+ GeneratedDemandVector_T& lDemandVector = *itLastVector;
+ lDemandVector.reserve (K);
+ const FldDistributionParameters aDistributionParam =
+- FldDistributionParameters::FldDistributionParameters (iMean, iDeviation);
++ FldDistributionParameters (iMean, iDeviation);
+ const Gaussian gaussianDemandGenerator (aDistributionParam);
+
+ // Generate K numbers
+Index: rmol/command/Optimiser.cpp
+===================================================================
+--- rmol/command/Optimiser.cpp (revision 312)
++++ rmol/command/Optimiser.cpp (working copy)
+@@ -185,9 +185,8 @@
+ BucketHolder& ioBucketHolder) {
+
+ // Create the aggregated class/bucket.
+- FldYieldRange aYieldRange = FldYieldRange::FldYieldRange (0);
+- FldDistributionParameters aDistribParams =
+- FldDistributionParameters::FldDistributionParameters (0,0);
++ FldYieldRange aYieldRange = FldYieldRange (0);
++ FldDistributionParameters aDistribParams = FldDistributionParameters(0,0);
+ Demand& aDemand =
+ FacDemand::instance().create (aDistribParams, aYieldRange);
+ Bucket& aBucket = FacBucket::instance().create (aYieldRange, aDemand);
More information about the scm-commits
mailing list