packages: lp_solve/lp_solve-shared.patch, lp_solve/lp_solve.spec - updated ...
qboosh
qboosh at pld-linux.org
Sat Mar 19 07:26:37 CET 2011
Author: qboosh Date: Sat Mar 19 06:26:37 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- updated to 5.5.2.0
- updated shared patch
---- Files affected:
packages/lp_solve:
lp_solve-shared.patch (1.7 -> 1.8) , lp_solve.spec (1.15 -> 1.16)
---- Diffs:
================================================================
Index: packages/lp_solve/lp_solve-shared.patch
diff -u packages/lp_solve/lp_solve-shared.patch:1.7 packages/lp_solve/lp_solve-shared.patch:1.8
--- packages/lp_solve/lp_solve-shared.patch:1.7 Tue Mar 27 01:39:17 2007
+++ packages/lp_solve/lp_solve-shared.patch Sat Mar 19 07:26:32 2011
@@ -1,53 +1,58 @@
---- lp_solve_5.5/lpsolve55/ccc 2007-03-27 00:13:26.141765888 +0300
-+++ lp_solve_5.5/lpsolve55/ccc 2007-03-27 02:33:04.379627936 +0300
-@@ -1,8 +1,8 @@
+--- lp_solve_5.5/lpsolve55/ccc.orig 2009-03-25 01:27:18.000000000 +0100
++++ lp_solve_5.5/lpsolve55/ccc 2011-03-19 06:51:52.141343390 +0100
+@@ -1,6 +1,6 @@
+ :
-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
+src='../lp_MDO.c ../shared/commonlib.c ../shared/mmio.c ../shared/myblas.c ../ini.c ../fortify.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:-cc}
- def=
--so=
-+so=y
- if [ "$PLATFORM" = "SCO_UNIX" ]
- then def='-dy -K PIC -DNOLONGLONG'
- dl=-lc
-@@ -10,16 +10,16 @@
+ #determine platform (32/64 bit)
+ >/tmp/platform.c
+@@ -35,16 +35,16 @@
so=y
fi
-opts='-O3'
+opts=${CFLAGS:--O3}
--$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 -s -c -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL $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 -s -c -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL $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
if [ "$so" != "" ]
then
-- $c -fpic -s -c -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd -I. $opts -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src
-- $c -shared -Wl,-Bsymbolic -Wl,-soname,liblpsolve55.so -o liblpsolve55.so `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'` -lc -lm -ldl
-+ $c -fpic -s -c -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I. $opts -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src
-+ $c -shared -Wl,-Bsymbolic -Wl,-soname,liblpsolve55.so -o liblpsolve55.so `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'` -lc -lm -ldl -lcolamd
+- $c -fpic -s -c -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd -I. $opts $NOISNAN -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src
+- $c -shared -Wl,-Bsymbolic -Wl,-soname,liblpsolve55.so -o bin/$PLATFORM/liblpsolve55.so `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'` -lc -lm -ldl
++ $c -fpic -s -c -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I. $opts $NOISNAN -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src
++ $c -shared -Wl,-Bsymbolic -Wl,-soname,liblpsolve55.so -o bin/$PLATFORM/liblpsolve55.so `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'` -lc -lm -ldl -lcolamd
fi
rm *.o 2>/dev/null
---- lp_solve_5.5/lp_solve/ccc 2007-03-27 00:10:11.387403126 +0300
-+++ lp_solve_5.5/lp_solve/ccc 2007-03-27 00:50:12.501214911 +0300
-@@ -1,9 +1,9 @@
+--- lp_solve_5.5/lp_solve/ccc.orig 2009-01-25 19:39:03.000000000 +0100
++++ lp_solve_5.5/lp_solve/ccc 2011-03-19 06:51:37.585343390 +0100
+@@ -1,6 +1,6 @@
+ :
-src='../lp_MDO.c ../shared/commonlib.c ../colamd/colamd.c ../shared/mmio.c ../shared/myblas.c ../ini.c ../fortify.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_solve.c ../lp_SOS.c ../lp_utils.c ../yacc_read.c'
-c=cc
+src='lp_solve.c'
+c=${CC:-cc}
- math=-lm
+ #determine platform (32/64 bit)
+ >/tmp/platform.c
+@@ -28,7 +28,7 @@
+ fi
+ rm /tmp/isnan.c /tmp/isnan >/dev/null 2>&1
-opts='-O3'
+opts=${CFLAGS:--O3}
def=
if [ "$PLATFORM" = "SCO_UNIX" ]
-@@ -17 +17 @@
--$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 -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src -o lp_solve $math $dl -L../lpsolve55 -llpsolve55 -Wl,-rpath=/usr/lib/lp_solve
+@@ -38,4 +38,4 @@
+ else dl=-ldl
+ fi
+
+-$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
++$c -I.. -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../shared $opts $def $NOISNAN -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src -o bin/$PLATFORM/lp_solve $math $dl -L../lpsolve55/bin/$PLATFORM -llpsolve55
================================================================
Index: packages/lp_solve/lp_solve.spec
diff -u packages/lp_solve/lp_solve.spec:1.15 packages/lp_solve/lp_solve.spec:1.16
--- packages/lp_solve/lp_solve.spec:1.15 Wed Apr 4 13:38:40 2007
+++ packages/lp_solve/lp_solve.spec Sat Mar 19 07:26:32 2011
@@ -1,20 +1,20 @@
# $Revision$, $Date$
%define _ver_major 5.5
-%define _ver_minor 0.10
+%define _ver_minor 2.0
Summary: Mixed Integer Linear Program solver
Summary(pl.UTF-8): Biblioteka i narzędzie do rozwiązywania problemu programowania liniowego
Name: lp_solve
Version: %{_ver_major}.%{_ver_minor}
-Release: 0.4
+Release: 1
License: LGPL
Group: Libraries
-Source0: http://dl.sourceforge.net/lpsolve/%{name}_%{version}_source.tar.gz
-# Source0-md5: 26b3e95ddf3d9c077c480ea45874b3b8
+Source0: http://downloads.sourceforge.net/lpsolve/%{name}_%{version}_source.tar.gz
+# Source0-md5: 167c0fb4ab178e0b7ab50bf0a635a836
Patch0: %{name}-shared.patch
URL: http://lpsolve.sourceforge.net/5.5/
+BuildRequires: COLAMD-devel
BuildRequires: bison
BuildRequires: flex
-BuildRequires: colamd-devel
BuildRequires: libtool
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -90,21 +90,22 @@
%setup -q -n %{name}_%{_ver_major}
%patch0 -p1
-rm -rf colamd
+%{__rm} -r colamd
%build
cd lpsolve55
-CC="%{__cc}" CFLAGS="%{rpmcflags}" sh -x ccc
+CC="%{__cc}" CFLAGS="%{rpmcflags} %{rpmcppflags} -I/usr/include/colamd" sh -x ccc
cd ../lp_solve
-CC="%{__cc}" CFLAGS="%{rpmcflags}" sh -x ccc
+CC="%{__cc}" CFLAGS="%{rpmcflags} %{rpmcppflags} -I/usr/include/colamd" sh -x ccc
%install
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT{%{_bindir},%{_libdir},%{_includedir}/lpsolve}
-install lp_solve/lp_solve $RPM_BUILD_ROOT%{_bindir}/lpsolve
-install lpsolve55/liblpsolve55.a $RPM_BUILD_ROOT%{_libdir}/liblpsolve.a
-install lpsolve55/liblpsolve55.so $RPM_BUILD_ROOT%{_libdir}/liblpsolve.so
+install lp_solve/bin/ux*/lp_solve $RPM_BUILD_ROOT%{_bindir}/lpsolve
+install lpsolve55/bin/ux*/liblpsolve55.a $RPM_BUILD_ROOT%{_libdir}/liblpsolve.a
+install lpsolve55/bin/ux*/liblpsolve55.so $RPM_BUILD_ROOT%{_libdir}
+ln -sf liblpsolve55.so $RPM_BUILD_ROOT%{_libdir}/liblpsolve.so
cp -a lp*.h $RPM_BUILD_ROOT%{_includedir}/lpsolve
%clean
@@ -117,10 +118,11 @@
%defattr(644,root,root,755)
%doc README.txt
%attr(755,root,root) %{_bindir}/lpsolve
-%attr(755,root,root) %{_libdir}/liblpsolve.so
+%attr(755,root,root) %{_libdir}/liblpsolve55.so
%files devel
%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/liblpsolve.so
%{_includedir}/lpsolve
%files static
@@ -133,6 +135,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.16 2011/03/19 06:26:32 qboosh
+- updated to 5.5.2.0
+- updated shared patch
+
Revision 1.15 2007/04/04 11:38:40 qboosh
- todo completed
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/lp_solve/lp_solve-shared.patch?r1=1.7&r2=1.8&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/lp_solve/lp_solve.spec?r1=1.15&r2=1.16&f=u
More information about the pld-cvs-commit
mailing list