From 0e5adbff650aa902bf56154cb3d1caa353e802ab1eb48f462aad2c79cd5090ef Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sat, 20 Oct 2018 11:49:23 +0000 Subject: [PATCH 1/2] - Update to new upstream release 0.94j OBS-URL: https://build.opensuse.org/package/show/science/cddlib?expand=0&rev=19 --- cddlib-0.94j.tar.gz | 3 +++ cddlib-094i.tar.gz | 3 --- cddlib-automake.diff | 44 -------------------------------------------- cddlib.changes | 8 ++++++++ cddlib.spec | 31 +++++++++++++++++++++---------- 5 files changed, 32 insertions(+), 57 deletions(-) create mode 100644 cddlib-0.94j.tar.gz delete mode 100644 cddlib-094i.tar.gz delete mode 100644 cddlib-automake.diff diff --git a/cddlib-0.94j.tar.gz b/cddlib-0.94j.tar.gz new file mode 100644 index 0000000..a0cda3a --- /dev/null +++ b/cddlib-0.94j.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:27d7fcac2710755a01ef5381010140fc57c95f959c3c5705c58539d8c4d17bfb +size 1364746 diff --git a/cddlib-094i.tar.gz b/cddlib-094i.tar.gz deleted file mode 100644 index 2c39841..0000000 --- a/cddlib-094i.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b8133ab74b83d225781cff1bd6f5d5940219651c708020da337d87b4707ced03 -size 1187490 diff --git a/cddlib-automake.diff b/cddlib-automake.diff deleted file mode 100644 index 56996bd..0000000 --- a/cddlib-automake.diff +++ /dev/null @@ -1,44 +0,0 @@ -From: Jan Engelhardt -Date: 2012-08-22 01:01:11.243215671 +0200 - -automake 1.12 wants AM_PROG_AR. -Add -no-undefined, required for PE targets and not detrimental on ELF. - ---- - configure.in | 1 + - lib-src-gmp/Makefile.am | 2 +- - lib-src/Makefile.am | 2 +- - 3 files changed, 3 insertions(+), 2 deletions(-) - -Index: cddlib-094h/configure.in -=================================================================== ---- cddlib-094h.orig/configure.in -+++ cddlib-094h/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. -Index: cddlib-094h/lib-src-gmp/Makefile.am -=================================================================== ---- cddlib-094h.orig/lib-src-gmp/Makefile.am -+++ cddlib-094h/lib-src-gmp/Makefile.am -@@ -25,4 +25,4 @@ cddtypes_f.h \ - setoper.h - - AM_CPPFLAGS = -I$(gmpincludedir) -DGMPRATIONAL --AM_LDFLAGS = -version-info 0:0:0 -+AM_LDFLAGS = -version-info 0:0:0 -no-undefined -Index: cddlib-094h/lib-src/Makefile.am -=================================================================== ---- cddlib-094h.orig/lib-src/Makefile.am -+++ cddlib-094h/lib-src/Makefile.am -@@ -16,4 +16,4 @@ cddtypes.h \ - setoper.h - - AM_CPPFLAGS = -UGMPRATIONAL --AM_LDFLAGS = -version-info 0:0:0 -+AM_LDFLAGS = -version-info 0:0:0 -no-undefined diff --git a/cddlib.changes b/cddlib.changes index d6cdf20..3e40819 100644 --- a/cddlib.changes +++ b/cddlib.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Sat Oct 20 11:41:09 UTC 2018 - Jan Engelhardt + +- Update to new upstream release 0.94j + * Introduced cddexec as a replacement of cdd_both_reps that many + distributions packaged. +- Remove cddlib-flags.diff, cddlib-automake.diff + ------------------------------------------------------------------- Mon Apr 30 22:12:36 UTC 2018 - jengelh@inai.de diff --git a/cddlib.spec b/cddlib.spec index e54a6e4..599ada7 100644 --- a/cddlib.spec +++ b/cddlib.spec @@ -12,25 +12,24 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # Name: cddlib %define lname libcdd0 -Version: 0.94i +Version: 0.94j Release: 0 Summary: Library for finding vertices of convex polytopes License: GPL-2.0-or-later Group: Productivity/Scientific/Math Url: https://www.inf.ethz.ch/personal/fukudak/cdd_home/ -Source: ftp://ftp.math.ethz.ch/users/fukudak/cdd/cddlib-094i.tar.gz -Patch1: cddlib-flags.diff -Patch2: cddlib-automake.diff +Source: https://github.com/cddlib/cddlib/releases/download/0.94j/cddlib-0.94j.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: autoconf BuildRequires: automake +BuildRequires: fdupes BuildRequires: gmp-devel >= 3 BuildRequires: libtool @@ -62,30 +61,42 @@ Motzkin et al. for generating all vertices (i.e. extreme points) and extreme rays of a general convex polyhedron in R^d given by a system of linear inequalities. +%package doc +Summary: Documentation for the cddlib API +Group: Documentation/Other +BuildArch: noarch + +%description doc +cddlib is an implementation of the Double Description Method of +Motzkin et al. + +This package contains the documentation to cddlib. + %prep -%setup -qn %name-094i -%patch -P 1 -P 2 -p1 +%setup -q %build autoreconf -fi -%configure --enable-shared --disable-static --includedir="%_includedir/cdd" +%configure --enable-shared --disable-static --includedir="%_includedir/cdd" --docdir="%_docdir/%name" make %{?_smp_mflags} V=1 %install %make_install rm -f "%buildroot/%_libdir"/*.la +%fdupes %buildroot/%_prefix %post -n %lname -p /sbin/ldconfig %postun -n %lname -p /sbin/ldconfig %files -n %lname -%defattr(-,root,root) %_libdir/libcdd*.so.* %files devel -%defattr(-,root,root) %_bindir/* %_libdir/libcdd*.so %_includedir/* +%files doc +%_docdir/%name/ + %changelog From 509ddd3a3c2e77790b31889722e52336cd5f840975935a5eee0fa8ca2c7c599a Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sat, 20 Oct 2018 16:14:53 +0000 Subject: [PATCH 2/2] OBS-URL: https://build.opensuse.org/package/show/science/cddlib?expand=0&rev=20 --- cddlib-flags.diff | 56 ----------------------------------------------- 1 file changed, 56 deletions(-) delete mode 100644 cddlib-flags.diff diff --git a/cddlib-flags.diff b/cddlib-flags.diff deleted file mode 100644 index 8d6e0b9..0000000 --- a/cddlib-flags.diff +++ /dev/null @@ -1,56 +0,0 @@ -From: Jan Engelhardt -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