Restore patches
OBS-URL: https://build.opensuse.org/package/show/science/cddlib?expand=0&rev=5
This commit is contained in:
Git OBS Bridge
parent
32627b7d99
commit
2363ed9160
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:af1b81226514abf731800e2e104def8a7274817d7e645693f8b99fc2b1432155
|
||||
size 1383388
|
||||
3
cddlib-094g.tar.xz
Normal file
3
cddlib-094g.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:f23178213b9bcdc38878f1997d26248e0699d986775546a5216357b2ca8d9504
|
||||
size 780540
|
||||
21
cddlib-automake.diff
Normal file
21
cddlib-automake.diff
Normal file
@ -0,0 +1,21 @@
|
||||
From: Jan Engelhardt <jengelh@medozas.de>
|
||||
Date: 2012-08-22 01:01:11.243215671 +0200
|
||||
|
||||
automake 1.12 wants AM_PROG_AR.
|
||||
|
||||
---
|
||||
configure.in | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
Index: cddlib-094g/configure.in
|
||||
===================================================================
|
||||
--- cddlib-094g.orig/configure.in
|
||||
+++ cddlib-094g/configure.in
|
||||
@@ -8,6 +8,7 @@ dnl Checks for programs.
|
||||
AC_PROG_CC
|
||||
AM_PROG_CC_C_O
|
||||
AC_PROG_INSTALL
|
||||
+m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
|
||||
LT_INIT
|
||||
|
||||
dnl Checks for libraries.
|
||||
56
cddlib-flags.diff
Normal file
56
cddlib-flags.diff
Normal file
@ -0,0 +1,56 @@
|
||||
From: Jan Engelhardt <jengelh@medozas.de>
|
||||
Date: 2011-09-26 14:49:00.979547210 +0200
|
||||
|
||||
Replace old variable names by new ones.
|
||||
|
||||
---
|
||||
configure.in | 5 +++--
|
||||
src-gmp/Makefile.am | 6 +++---
|
||||
src/Makefile.am | 4 ++--
|
||||
3 files changed, 8 insertions(+), 7 deletions(-)
|
||||
|
||||
Index: cddlib-094g/configure.in
|
||||
===================================================================
|
||||
--- cddlib-094g.orig/configure.in
|
||||
+++ cddlib-094g/configure.in
|
||||
@@ -1,11 +1,12 @@
|
||||
dnl Process this file with autoconf to produce a configure script.
|
||||
-AC_INIT
|
||||
+AC_INIT([cddlib], [0.94])
|
||||
|
||||
dnl Init automake.
|
||||
-AM_INIT_AUTOMAKE(cddlib, 0.94)
|
||||
+AM_INIT_AUTOMAKE([-Wall foreign subdir-objects])
|
||||
|
||||
dnl Checks for programs.
|
||||
AC_PROG_CC
|
||||
+AM_PROG_CC_C_O
|
||||
AC_PROG_INSTALL
|
||||
LT_INIT
|
||||
|
||||
Index: cddlib-094g/src-gmp/Makefile.am
|
||||
===================================================================
|
||||
--- cddlib-094g.orig/src-gmp/Makefile.am
|
||||
+++ cddlib-094g/src-gmp/Makefile.am
|
||||
@@ -31,6 +31,6 @@ testlp3_gmp_SOURCES = tes
|
||||
|
||||
LDADD = ../lib-src-gmp/libcddgmp.la
|
||||
AM_LDFLAGS = -L$(gmplibdir)
|
||||
-INCLUDES = -I../lib-src-gmp
|
||||
-INCLUDES += -I$(gmpincludedir)
|
||||
-AM_CPPFLAGS = -DGMPRATIONAL
|
||||
+AM_CPPFLAGS = -I../lib-src-gmp
|
||||
+AM_CPPFLAGS += -I$(gmpincludedir)
|
||||
+AM_CPPFLAGS += -DGMPRATIONAL
|
||||
Index: cddlib-094g/src/Makefile.am
|
||||
===================================================================
|
||||
--- cddlib-094g.orig/src/Makefile.am
|
||||
+++ cddlib-094g/src/Makefile.am
|
||||
@@ -30,5 +30,5 @@ testlp3_SOURCES = testlp3
|
||||
# cddmathlink_SOURCES = cddmathlink.c cddmlio.h cddmlio.c
|
||||
|
||||
LDADD = ../lib-src/libcdd.la
|
||||
-INCLUDES = -I../lib-src
|
||||
-AM_CPPFLAGS = -UGMPRATIONAL
|
||||
+AM_CPPFLAGS = -I../lib-src
|
||||
+AM_CPPFLAGS += -UGMPRATIONAL
|
||||
@ -1,3 +1,8 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Aug 21 23:03:03 UTC 2012 - jengelh@inai.de
|
||||
|
||||
- Restore and rediff patches
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Aug 21 19:59:49 UTC 2012 - dmitry@roshchin.org
|
||||
|
||||
@ -5,11 +10,3 @@ Tue Aug 21 19:59:49 UTC 2012 - dmitry@roshchin.org
|
||||
* fixed memory leaks in cddlib.c and cddlp.c
|
||||
* integrated patches for making the library
|
||||
shared and more compatible for C++ compilers
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun Feb 26 12:04:08 UTC 2012 - scorot@free.fr
|
||||
|
||||
- bzip2 source file instead of xv which is unsupported on SLE
|
||||
- fix %%make_install for SLE-11
|
||||
- remove unneeded xv build requirement
|
||||
|
||||
|
||||
17
cddlib.spec
17
cddlib.spec
@ -24,10 +24,13 @@ Group: Productivity/Scientific/Math
|
||||
License: GPL-2.0+
|
||||
URL: http://www.ifor.math.ethz.ch/~fukuda/cdd_home/
|
||||
|
||||
Source: cddlib-094g.tar.gz
|
||||
Source: cddlib-094g.tar.xz
|
||||
Patch1: cddlib-flags.diff
|
||||
Patch2: cddlib-automake.diff
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
BuildRequires: autoconf
|
||||
BuildRequires: autoconf, automake, libtool
|
||||
BuildRequires: gmp-devel >= 3
|
||||
BuildRequires: xz
|
||||
|
||||
%description
|
||||
cddlib is a C implementation of the Double Description Method of
|
||||
@ -58,18 +61,16 @@ of linear inequalities.
|
||||
|
||||
%prep
|
||||
%setup -qn %name-094g
|
||||
%patch -P 1 -P 2 -p1
|
||||
|
||||
%build
|
||||
autoreconf -fi;
|
||||
%configure --enable-shared --disable-static
|
||||
make %{?_smp_mflags}
|
||||
|
||||
%install
|
||||
%if 0%{sles_version} <= 11
|
||||
%makeinstall
|
||||
%else
|
||||
%make_install
|
||||
%endif
|
||||
find "%buildroot" -name "*.la" -delete;
|
||||
make install DESTDIR="%buildroot";
|
||||
rm -f "%buildroot/%_libdir"/*.la;
|
||||
|
||||
%post -n %lname -p /sbin/ldconfig
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user