[rmol/f13/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 21:37:21 UTC 2010
commit 0312bbe3af837ecb20fc1c35c3d3042524273a92
Author: Denis Arnaud <denis.arnaud_fedora at m4x.org>
Date: Fri Jul 30 23:37:12 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 | 10 +++++++++-
rmol.spec | 14 ++++++++++++--
sources | 1 +
3 files changed, 22 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 6b0f9ed..f322397 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,9 @@
-rmol-0.23.0.tar.gz
+clog
+rmol-*.tar.*
+rmol_*.patch
+.build-*.log
+rmol-*.src.rpm
+rmol-0.23.0
+x86_64
+
+rmol_fix_gcc_45_compilation_error.patch
diff --git a/rmol.spec b/rmol.spec
index c4faea4..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: 2%{?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,9 @@ 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
diff --git a/sources b/sources
index 12fce05..41515d6 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
4efd1c6a4edff1a0e35decabb2e1e6ef rmol-0.23.0.tar.gz
+7f48936f4066868b55d368e761195f13 rmol_fix_gcc_45_compilation_error.patch
More information about the scm-commits
mailing list