packages: glpk/glpk.spec, glpk/glpk-dl.patch (NEW), glpk/glpk-sonames.patch...
qboosh
qboosh at pld-linux.org
Sat Oct 16 16:39:40 CEST 2010
Author: qboosh Date: Sat Oct 16 14:39:40 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- updated to 4.44
- switched to unixODBC
- added dl patch to link with -ldl (SQL libs are dlopened)
- added sonames patch to dlopen by soname, not *.so (added sonames to Suggests)
---- Files affected:
packages/glpk:
glpk.spec (1.22 -> 1.23) , glpk-dl.patch (NONE -> 1.1) (NEW), glpk-sonames.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: packages/glpk/glpk.spec
diff -u packages/glpk/glpk.spec:1.22 packages/glpk/glpk.spec:1.23
--- packages/glpk/glpk.spec:1.22 Mon Mar 29 09:08:40 2010
+++ packages/glpk/glpk.spec Sat Oct 16 16:39:35 2010
@@ -2,19 +2,28 @@
Summary: Solver LP and MIP problems
Summary(pl.UTF-8): Narzędzie do rozwiązywania problemów LP i MIP
Name: glpk
-Version: 4.27
-Release: 4
+Version: 4.44
+Release: 1
License: GPL v3+
Group: Applications/Math
Source0: http://ftp.gnu.org/gnu/glpk/%{name}-%{version}.tar.gz
-# Source0-md5: aa089dd6a5becd9251d9e716d660316d
+# Source0-md5: f2ac7013bc0420d730d052e7ba24bdb1
+Patch0: %{name}-dl.patch
+Patch1: %{name}-sonames.patch
URL: http://www.gnu.org/software/glpk/glpk.html
-BuildRequires: autoconf
+BuildRequires: autoconf >= 2.50
BuildRequires: automake
BuildRequires: gmp-devel
-BuildRequires: libiodbc-devel
BuildRequires: libtool >= 2:2.2
BuildRequires: mysql-devel
+BuildRequires: unixODBC-devel
+%ifarch %{x8664} ppc64 sparc64 s390x
+Suggests: libodbc.so.1()(64bit)
+Suggests: libmysqlclient.so.16()(64bit)
+%else
+Suggests: libodbc.so.1
+Suggests: libmysqlclient.so.16
+%endif
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -56,18 +65,26 @@
%prep
%setup -q
+%patch0 -p1
+%patch1 -p1
%build
-%{__libtoolize} --install
+%{__libtoolize}
%{__aclocal}
%{__autoconf}
-%configure
+%{__autoheader}
+%{__automake}
+%configure \
+ --enable-dl=dlfcn \
+ --enable-mysql \
+ --enable-odbc=unix \
+ --with-gmp \
+ --with-zlib
%{__make}
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_bindir},%{_libdir},%{_includedir}}
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
@@ -80,7 +97,7 @@
%files
%defattr(644,root,root,755)
-%doc AUTHORS ChangeLog NEWS README doc/{*.txt,glpk.ps,gmpl.ps,memo}
+%doc AUTHORS ChangeLog NEWS README THANKS doc/{*.txt,*.pdf,notes}
%attr(755,root,root) %{_bindir}/glpsol
%attr(755,root,root) %{_libdir}/libglpk.so.*.*.*
%attr(755,root,root) %ghost %{_libdir}/libglpk.so.0
@@ -101,6 +118,12 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.23 2010/10/16 14:39:35 qboosh
+- updated to 4.44
+- switched to unixODBC
+- added dl patch to link with -ldl (SQL libs are dlopened)
+- added sonames patch to dlopen by soname, not *.so (added sonames to Suggests)
+
Revision 1.22 2010/03/29 07:08:40 arekm
- release 4
================================================================
Index: packages/glpk/glpk-dl.patch
diff -u /dev/null packages/glpk/glpk-dl.patch:1.1
--- /dev/null Sat Oct 16 16:39:40 2010
+++ packages/glpk/glpk-dl.patch Sat Oct 16 16:39:35 2010
@@ -0,0 +1,10 @@
+--- glpk-4.44/configure.ac.orig 2010-06-03 10:00:00.000000000 +0200
++++ glpk-4.44/configure.ac 2010-10-16 15:30:29.667743558 +0200
+@@ -106,6 +106,7 @@
+ elif test "$enable_dl" = "dlfcn"; then
+ AC_MSG_RESULT([dlfcn])
+ AC_DEFINE([HAVE_DLFCN], [1], [N/A])
++ LIBS="-ldl $LIBS"
+ else
+ AC_MSG_RESULT([no])
+ fi
================================================================
Index: packages/glpk/glpk-sonames.patch
diff -u /dev/null packages/glpk/glpk-sonames.patch:1.1
--- /dev/null Sat Oct 16 16:39:40 2010
+++ packages/glpk/glpk-sonames.patch Sat Oct 16 16:39:35 2010
@@ -0,0 +1,15 @@
+--- glpk-4.44/configure.ac.orig 2010-06-03 10:00:00.000000000 +0200
++++ glpk-4.44/configure.ac 2010-10-16 15:05:32.707743558 +0200
+@@ -117,9 +117,9 @@
+ LIBMYSQL="libmysqlclient.dylib"
+ ;;
+ *)
+- LIBIODBC="libiodbc.so"
+- LIBODBC="libodbc.so"
+- LIBMYSQL="libmysqlclient.so"
++ LIBIODBC="libiodbc.so.2"
++ LIBODBC="libodbc.so.1"
++ LIBMYSQL="libmysqlclient.so.16"
+ ;;
+ esac
+
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/glpk/glpk.spec?r1=1.22&r2=1.23&f=u
More information about the pld-cvs-commit
mailing list