[rmol/f14/master] - Upstream integration - Fixed bug #631080 (https://bugzilla.redhat.com/show_bug.cgi?id=631080)
Denis Arnaud
denisarnaud at fedoraproject.org
Tue Sep 7 18:22:28 UTC 2010
commit 016f41700e15ded33c0a9d4bed748338a3e94518
Author: Denis Arnaud <denis.arnaud_fedora at m4x.org>
Date: Tue Sep 7 20:22:30 2010 +0200
- Upstream integration
- Fixed bug #631080 (https://bugzilla.redhat.com/show_bug.cgi?id=631080)
.gitignore | 2 +-
rmol.spec | 21 +++++++++------------
sources | 3 +--
3 files changed, 11 insertions(+), 15 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e9b09cb..4ef03e1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,6 @@ rmol-*.tar.*
rmol_*.patch
.build-*.log
rmol-*.src.rpm
-rmol-0.23.0
+rmol-*.*.*
x86_64
diff --git a/rmol.spec b/rmol.spec
index 19f44a4..836ab4a 100644
--- a/rmol.spec
+++ b/rmol.spec
@@ -2,24 +2,20 @@
%global mydocs __tmp_docdir
#
Name: rmol
-Version: 0.23.0
-Release: 3%{?dist}
+Version: 0.23.1
+Release: 1%{?dist}
Summary: C++ library of Revenue Management and Optimisation classes and functions
Group: System Environment/Libraries
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)
-
-# Patch for g++ 4.5 compatibility. Already fixed by upstream.
-Patch0: rmol_fix_gcc_45_compilation_error.patch
+Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
+%{?el5:BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)}
BuildRequires: gsl-devel
BuildRequires: boost-devel
BuildRequires: cppunit-devel
-#Requires:
%description
RMOL is a C++ library of Revenue Management and Optimisation classes
@@ -69,10 +65,6 @@ 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
@@ -137,6 +129,10 @@ fi
%changelog
+* Tue Sep 07 2010 Denis Arnaud <denis.arnaud_fedora at m4x.org> 0.23.1-1
+- Upstream integration
+- Fixed bug #631080 (https://bugzilla.redhat.com/show_bug.cgi?id=631080)
+
* Wed Jul 28 2010 Denis Arnaud <denis.arnaud_fedora at m4x.org> 0.23.0-3
- Added a patch to fix Rawhide build error
@@ -172,3 +168,4 @@ fi
* Wed Mar 4 2009 Denis Arnaud <denis.arnaud_fedora at m4x.org> 0.18.0-1
- Second RPM release
+
diff --git a/sources b/sources
index 41515d6..0dec231 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-4efd1c6a4edff1a0e35decabb2e1e6ef rmol-0.23.0.tar.gz
-7f48936f4066868b55d368e761195f13 rmol_fix_gcc_45_compilation_error.patch
+7e6b006650e354715d8749fc393f021e rmol-0.23.1.tar.bz2
More information about the scm-commits
mailing list