- updated to 5.5.2.3

- added define patch (fixes FALSE/TRUE defines conflict)

diff --git a/lp_solve-define.patch b/lp_solve-define.patch
new file mode 100644 (file)
index 0000000..d6f0c1c
--- /dev/null
+++ b/lp_solve-define.patch
@@ -0,0 +1,32 @@
+--- lp_solve_5.5/shared/commonlib.h.orig       2016-05-10 22:09:37.933715163 +0200
++++ lp_solve_5.5/shared/commonlib.h    2016-05-10 22:10:56.710378524 +0200
+@@ -84,7 +84,8 @@
+   #define NULL               0
+ #endif
+ 
+-#ifndef FALSE
++#if 0
++/* defined in lp_types.h */
+   #define FALSE        0
+   #define TRUE         1
+ #endif
+--- lp_solve_5.5/shared/commonlib.c.orig       2016-05-06 11:25:24.000000000 +0200
++++ lp_solve_5.5/shared/commonlib.c    2016-05-10 22:16:43.280363979 +0200
+@@ -19,6 +19,7 @@
+ #include <float.h>
+ #include <math.h>
+ #include "commonlib.h"
++#include "lp_types.h"
+ 
+ #ifdef FORTIFY
+ # include "lp_fortify.h"
+--- lp_solve_5.5/shared/myblas.c.orig  2016-05-06 11:25:24.000000000 +0200
++++ lp_solve_5.5/shared/myblas.c       2016-05-10 22:18:31.380359443 +0200
+@@ -4,6 +4,7 @@
+ /*#include <memory.h>*/
+ #include <string.h>
+ #include <math.h>
++#include "lp_types.h"
+ #include "myblas.h"
+ 
+ #ifdef FORTIFY

diff --git a/lp_solve.spec b/lp_solve.spec
index ae8e13d22e2b9383fd3f050f50a223a04fe11c9e..a4e68aa03376178d4cf27d53c20952c08c363181 100644 (file)
--- a/lp_solve.spec
+++ b/lp_solve.spec
@@ -1,5 +1,5 @@
 %define                _ver_major      5.5
-%define                _ver_minor      2.0
+%define                _ver_minor      2.3
 Summary:       Mixed Integer Linear Program solver
 Summary(pl.UTF-8):     Biblioteka i narzędzie do rozwiązywania problemu programowania liniowego
 Name:          lp_solve
@@ -8,8 +8,9 @@ Release:        1
 License:       LGPL
 Group:         Libraries
 Source0:       http://downloads.sourceforge.net/lpsolve/%{name}_%{version}_source.tar.gz
-# Source0-md5: 167c0fb4ab178e0b7ab50bf0a635a836
+# Source0-md5: 695d0bc15519a10604493ace65d16d24
 Patch0:                %{name}-shared.patch
+Patch1:                %{name}-define.patch
 URL:           http://lpsolve.sourceforge.net/5.5/
 BuildRequires: COLAMD-devel
 BuildRequires: bison
@@ -88,6 +89,7 @@ Statyczna biblioteka liblpsolve.
 %prep
 %setup -q -n %{name}_%{_ver_major}
 %patch0 -p1
+%patch1 -p1
 
 %{__rm} -r colamd