OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: r...@openpkg.org
Module: openpkg-src Date: 27-Mar-2009 12:03:27
Branch: HEAD Handle: 2009032711032700
Modified files:
openpkg-src/lpsolve lpsolve.patch lpsolve.spec
Log:
upgrading package: lpsolve 5.5.0.13 -> 5.5.0.14
Summary:
Revision Changes Path
1.2 +15 -16 openpkg-src/lpsolve/lpsolve.patch
1.12 +4 -4 openpkg-src/lpsolve/lpsolve.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/lpsolve/lpsolve.patch
============================================================================
$ cvs diff -u -r1.1 -r1.2 lpsolve.patch
--- openpkg-src/lpsolve/lpsolve.patch 13 Jun 2006 18:49:47 -0000 1.1
+++ openpkg-src/lpsolve/lpsolve.patch 27 Mar 2009 11:03:27 -0000 1.2
@@ -1,9 +1,9 @@
Index: lp_solve/ccc
---- lp_solve/ccc.orig 2005-11-14 21:01:26 +0100
-+++ lp_solve/ccc 2006-06-13 20:37:05 +0200
-@@ -3,15 +3,9 @@
-
- math=-lm
+--- lp_solve/ccc.orig 2009-01-25 18:39:03 +0100
++++ lp_solve/ccc 2009-03-27 11:52:12 +0100
+@@ -28,14 +28,8 @@
+ fi
+ rm /tmp/isnan.c /tmp/isnan >/dev/null 2>&1
-opts='-O3'
+opts='-O2'
@@ -17,14 +17,13 @@
-fi
+def='-DINTEGERTIME'
-
- $c -I.. -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd
-I../shared $opts $def -DYY_NEVER_INTERACTIVE -DPARSER_LP
-DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src -o lp_solve $math
$dl
+ $c -I.. -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd
-I../shared $opts $def $NOISNAN -DYY_NEVER_INTERACTIVE -DPARSER_LP
-DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src -o
bin/$PLATFORM/lp_solve $math $dl
Index: lpsolve55/ccc
---- lpsolve55/ccc.orig 2005-06-11 21:27:18 +0200
-+++ lpsolve55/ccc 2006-06-13 20:38:12 +0200
-@@ -1,18 +1,11 @@
- src='../lp_MDO.c ../shared/commonlib.c ../shared/mmio.c ../shared/myblas.c
../ini.c ../fortify.c ../colamd/colamd.c ../lp_rlp.c ../lp_crash.c
../bfp/bfp_LUSOL/lp_LUSOL.c ../bfp/bfp_LUSOL/LUSOL/lusol.c ../lp_Hash.c
../lp_lib.c ../lp_wlp.c ../lp_matrix.c ../lp_mipbb.c ../lp_MPS.c ../lp_params.c
../lp_presolve.c ../lp_price.c ../lp_pricePSE.c ../lp_report.c ../lp_scale.c
../lp_simplex.c ../lp_SOS.c ../lp_utils.c ../yacc_read.c'
- c=cc
+--- lpsolve55/ccc.orig 2009-01-25 18:39:34 +0100
++++ lpsolve55/ccc 2009-03-27 11:54:24 +0100
+@@ -26,18 +26,11 @@
+ fi
+ rm /tmp/isnan.c /tmp/isnan >/dev/null 2>&1
-def=
+def='-DINTEGERTIME'
@@ -39,8 +38,8 @@
-opts='-O3'
+opts='-O2'
--$c -s -c -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL
-I../bfp/bfp_LUSOL/LUSOL -I../colamd $opts $def -DYY_NEVER_INTERACTIVE
-DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src
-+$c -c -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL
-I../colamd $opts $def -DYY_NEVER_INTERACTIVE -DPARSER_LP
-DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src
- ar rv liblpsolve55.a `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'`
- ranlib liblpsolve55.a
+-$c -s -c -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL
-I../bfp/bfp_LUSOL/LUSOL -I../colamd $opts $def $NOISNAN -DYY_NEVER_INTERACTIVE
-DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src
++$c -c -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL
-I../colamd $opts $def $NOISNAN -DYY_NEVER_INTERACTIVE -DPARSER_LP
-DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src
+ ar rv bin/$PLATFORM/liblpsolve55.a `echo $src|sed s/[.]c/.o/g|sed 's/[^
]*\///g'`
+ ranlib bin/$PLATFORM/liblpsolve55.a
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/lpsolve/lpsolve.spec
============================================================================
$ cvs diff -u -r1.11 -r1.12 lpsolve.spec
--- openpkg-src/lpsolve/lpsolve.spec 4 Aug 2008 17:10:54 -0000 1.11
+++ openpkg-src/lpsolve/lpsolve.spec 27 Mar 2009 11:03:27 -0000 1.12
@@ -23,7 +23,7 @@
# package version
%define V_major 5.5
-%define V_minor 0.13
+%define V_minor 0.14
# package information
Name: lpsolve
@@ -36,7 +36,7 @@
Group: Algorithm
License: LGPL
Version: %{V_major}.%{V_minor}
-Release: 20080804
+Release: 20090327
# list of sources
Source0:
http://switch.dl.sourceforge.net/lpsolve/lp_solve_%{version}_source.tar.gz
@@ -78,9 +78,9 @@
$RPM_BUILD_ROOT%{l_prefix}/include/lpsolve \
$RPM_BUILD_ROOT%{l_prefix}/lib
%{l_shtool} install -c -s -m 755 \
- lp_solve/lp_solve $RPM_BUILD_ROOT%{l_prefix}/bin/lpsolve
+ lp_solve/bin/*/lp_solve $RPM_BUILD_ROOT%{l_prefix}/bin/lpsolve
%{l_shtool} install -c -m 644 \
- lpsolve55/liblpsolve55.a $RPM_BUILD_ROOT%{l_prefix}/lib/liblpsolve.a
+ lpsolve55/bin/*/liblpsolve55.a
$RPM_BUILD_ROOT%{l_prefix}/lib/liblpsolve.a
%{l_shtool} install -c -m 644 \
lp*.h $RPM_BUILD_ROOT%{l_prefix}/include/lpsolve/
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
