From 8b90db8b41d005f444d2199938a8af2aeecdef93 Mon Sep 17 00:00:00 2001 From: "Ralf S. Engelschall" Date: Sat, 15 Nov 2003 08:20:51 +0000 Subject: [PATCH] upgrading package: glpk 4.1 -> 4.2 --- glpk/glpk.patch | 24 ------------------------ glpk/glpk.spec | 7 +++---- 2 files changed, 3 insertions(+), 28 deletions(-) delete mode 100644 glpk/glpk.patch diff --git a/glpk/glpk.patch b/glpk/glpk.patch deleted file mode 100644 index 5d90e6fa8e..0000000000 --- a/glpk/glpk.patch +++ /dev/null @@ -1,24 +0,0 @@ -Index: Makefile.in ---- Makefile.in.orig 2003-08-23 10:00:00.000000000 +0200 -+++ Makefile.in 2003-10-09 20:24:26.000000000 +0200 -@@ -139,8 +139,6 @@ - for i in $(HDRS); do \ - $(INSTALL_DATA) $(srcdir)/include/$$i \ - $(DESTDIR)$(includedir)/$$i; \ -- $(INSTALL_DATA) $(srcdir)/include/$$i \ -- $(DESTDIR)$(oldincludedir)/$$i || : ; \ - done - $(INSTALL_DATA) libglpk.a $(DESTDIR)$(libdir)/libglpk.a - $(INSTALL_PROGRAM) glpsol $(DESTDIR)$(bindir)/glpsol -@@ -188,8 +186,8 @@ - @echo "Sorry, target `installcheck' is not implemented." - - installdirs: -- $(SHELL) $(srcdir)/mkinstalldirs $(bindir) -- $(SHELL) $(srcdir)/mkinstalldirs $(includedir) -- $(SHELL) $(srcdir)/mkinstalldirs $(libdir) -+ $(SHELL) $(srcdir)/mkinstalldirs $(DESTDIR)$(bindir) -+ $(SHELL) $(srcdir)/mkinstalldirs $(DESTDIR)$(includedir) -+ $(SHELL) $(srcdir)/mkinstalldirs $(DESTDIR)$(libdir) - - ## eof ## diff --git a/glpk/glpk.spec b/glpk/glpk.spec index 1a04ed26ac..0f0cfad493 100644 --- a/glpk/glpk.spec +++ b/glpk/glpk.spec @@ -32,12 +32,11 @@ Packager: The OpenPKG Project Distribution: OpenPKG [EVAL] Group: Algorithm License: GPL -Version: 4.1 -Release: 20031009 +Version: 4.2 +Release: 20031115 # list of sources Source0: ftp://ftp.gnu.org/gnu/glpk/glpk-%{version}.tar.gz -Patch0: glpk.patch # build information Prefix: %{l_prefix} @@ -56,12 +55,12 @@ AutoReqProv: no %prep %setup -q - %patch -p0 %build CC="%{l_cc}" \ CFLAGS="%{l_cflags -O}" \ CPPFLAGS="%{l_cppflags}" \ + LIBS="-lm" \ ./configure \ --prefix=%{l_prefix} \ --includedir=%{l_prefix}/include/glpk