From d501790009824bd46d662d7b709136c0856d37c0 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Nov 28 2019 19:31:00 +0000 Subject: Version 3.6. Drop the JuPyMake and jupyter-polymake support; those packages are now built and installed separately. --- diff --git a/polymake-fedora.patch b/polymake-fedora.patch index 739ee17..b70749d 100644 --- a/polymake-fedora.patch +++ b/polymake-fedora.patch @@ -1,6 +1,6 @@ ---- bundled/cdd/support/configure.pl.orig 2019-08-13 04:16:37.000000000 -0600 -+++ bundled/cdd/support/configure.pl 2019-08-18 16:18:04.859818172 -0600 -@@ -52,7 +52,6 @@ sub proceed { +--- bundled/cdd/support/configure.pl.orig 2019-11-19 03:41:04.000000000 -0700 ++++ bundled/cdd/support/configure.pl 2019-11-22 13:21:21.727679863 -0700 +@@ -53,7 +53,6 @@ sub proceed { my $cdd_lib=Polymake::Configure::get_libdir($cdd_path, "cddgmp"); if (-f "$cdd_lib/libcddgmp.$Config::Config{so}" ) { $LDFLAGS = "-L$cdd_lib"; @@ -8,7 +8,7 @@ } if (!$CFLAGS or !$LDFLAGS) { die "Invalid installation location of cddlib: header file cdd.h and/or library libcddgmp.$Config::Config{so} not found.\n", -@@ -65,7 +64,6 @@ sub proceed { +@@ -66,7 +65,6 @@ sub proceed { $cdd_path .= "include: $cdd_inc "; } if (defined ($cdd_lib=$options->{'cdd-lib'})) { @@ -16,9 +16,20 @@ $cdd_path .= "lib: $cdd_lib"; } ---- bundled/libnormaliz/apps/polytope/src/libnormaliz_inst.cc.orig 2019-08-13 04:16:37.000000000 -0600 -+++ bundled/libnormaliz/apps/polytope/src/libnormaliz_inst.cc 2019-08-18 16:18:04.873818163 -0600 -@@ -136,7 +136,7 @@ inline bool int_quotient(long long& Quot +--- bundled/flint/support/configure.pl.orig 2019-11-19 03:41:04.000000000 -0700 ++++ bundled/flint/support/configure.pl 2019-11-22 13:24:32.758125045 -0700 +@@ -23,7 +23,7 @@ sub proceed { + my $lib=Polymake::Configure::get_libdir($flint_path, "flint"); + if (-f "$inc/flint/flint.h" && -f "$lib/libflint.$Config::Config{so}" ) { + $cxxflags .= " -I$inc"; +- $ldflags .= " -L$lib -Wl,-rpath,$lib"; ++ $ldflags .= " -L$lib"; + } else { + die "Invalid installation location of flint, header files and/or library not found\n"; + } +--- bundled/libnormaliz/apps/polytope/src/libnormaliz_inst.cc.orig 2019-11-19 03:41:04.000000000 -0700 ++++ bundled/libnormaliz/apps/polytope/src/libnormaliz_inst.cc 2019-11-22 13:21:21.747679490 -0700 +@@ -137,7 +137,7 @@ inline bool int_quotient(long long& Quot #endif #endif @@ -27,9 +38,18 @@ #if defined(__GNUC__) #if defined(__clang__) ---- bundled/libnormaliz/support/configure.pl.orig 2019-08-13 04:16:37.000000000 -0600 -+++ bundled/libnormaliz/support/configure.pl 2019-08-18 16:18:04.874818162 -0600 -@@ -135,6 +135,7 @@ int main (int argc, char *argv[]) +--- bundled/libnormaliz/support/configure.pl.orig 2019-11-19 03:41:04.000000000 -0700 ++++ bundled/libnormaliz/support/configure.pl 2019-11-22 13:24:00.576723894 -0700 +@@ -62,7 +62,7 @@ int main() { + my $nmz_lib=Polymake::Configure::get_libdir($nmz_path, "normaliz"); + if (-f "$nmz_inc/libnormaliz/libnormaliz.h" && -f "$nmz_lib/libnormaliz.$Config::Config{so}" ) { + $CXXFLAGS = "-I$nmz_inc"; +- $LDFLAGS = "-L$nmz_lib -Wl,-rpath,$nmz_lib"; ++ $LDFLAGS = "-L$nmz_lib"; + } else { + die "Invalid installation location of libnormaliz header file libnormaliz/libnormaliz.h and/or library libnormaliz.$Config::Config{so} not found\n"; + } +@@ -136,6 +136,7 @@ int main (int argc, char *argv[]) $message .= " [OpenMP support disabled]"; } } else { @@ -37,9 +57,9 @@ $LIBS="-lnormaliz"; $message = "$nmz_version @ ".($nmz_path//"system") } ---- bundled/lrs/support/configure.pl.orig 2019-08-13 04:16:37.000000000 -0600 -+++ bundled/lrs/support/configure.pl 2019-08-18 16:18:04.875818162 -0600 -@@ -65,7 +65,7 @@ sub proceed { +--- bundled/lrs/support/configure.pl.orig 2019-11-19 03:41:04.000000000 -0700 ++++ bundled/lrs/support/configure.pl 2019-11-22 13:21:21.748679471 -0700 +@@ -66,7 +66,7 @@ sub proceed { } if (-f "$lrs_lib/lib$lrs_libname.$Config::Config{so}" ) { @@ -48,8 +68,8 @@ } elsif (-f "$lrs_lib/lib$lrs_libname.a" ) { $LDFLAGS = "-L$lrs_lib"; } else { ---- bundled/nauty/apps/graph/src/build_flags.pl.orig 2019-08-13 04:16:37.000000000 -0600 -+++ bundled/nauty/apps/graph/src/build_flags.pl 2019-08-18 16:18:04.875818162 -0600 +--- bundled/nauty/apps/graph/src/build_flags.pl.orig 2019-11-19 03:41:04.000000000 -0700 ++++ bundled/nauty/apps/graph/src/build_flags.pl 2019-11-22 13:21:21.749679453 -0700 @@ -1,25 +1,11 @@ # input for generate_ninja_targets.pl @@ -84,9 +104,9 @@ + } ) + : () ) ---- bundled/nauty/support/configure.pl.orig 2019-08-13 04:16:37.000000000 -0600 -+++ bundled/nauty/support/configure.pl 2019-08-18 16:18:04.875818162 -0600 -@@ -13,7 +13,7 @@ +--- bundled/nauty/support/configure.pl.orig 2019-11-19 03:41:04.000000000 -0700 ++++ bundled/nauty/support/configure.pl 2019-11-22 13:21:21.749679453 -0700 +@@ -14,7 +14,7 @@ # GNU General Public License for more details. #------------------------------------------------------------------------------- @@ -95,7 +115,7 @@ sub allowed_options { my ($allowed_options, $allowed_with)=@_; -@@ -28,24 +28,27 @@ sub usage { +@@ -29,24 +29,27 @@ sub usage { " directory containing the nauty sources.\n"; } @@ -134,9 +154,9 @@ + return $UseBundled ? "bundled" : ($nautysrc//"system"); } ---- bundled/singular/support/configure.pl.orig 2019-08-13 04:16:37.000000000 -0600 -+++ bundled/singular/support/configure.pl 2019-08-18 16:18:04.876818161 -0600 -@@ -42,7 +42,7 @@ sub singular_config_approach { +--- bundled/singular/support/configure.pl.orig 2019-11-19 03:41:04.000000000 -0700 ++++ bundled/singular/support/configure.pl 2019-11-22 13:21:21.750679434 -0700 +@@ -43,7 +43,7 @@ sub singular_config_approach { # yes we need it twice ... chomp ($singular_prefix = `$singular_config --prefix`); chomp $singular_prefix; @@ -145,7 +165,7 @@ my $libdir = $1; # newer versions of singular need -lsingular_resources while older ones needed -lresources -@@ -65,9 +65,6 @@ sub pkg_config_approach { +@@ -66,9 +66,6 @@ sub pkg_config_approach { chomp ($CXXFLAGS=`$pkg_config --cflags Singular`); die "$pkg_config failed: $!" if ($?); chomp ($LDFLAGS=`$pkg_config --libs-only-other --libs-only-L Singular`); @@ -155,8 +175,8 @@ chomp ($LIBS=`$pkg_config --libs-only-l Singular`); return $pc_singular_prefix; } ---- bundled/sympol/apps/polytope/src/build_flags.pl.orig 2019-08-13 04:16:37.000000000 -0600 -+++ bundled/sympol/apps/polytope/src/build_flags.pl 2019-08-18 16:18:04.876818161 -0600 +--- bundled/sympol/apps/polytope/src/build_flags.pl.orig 2019-11-19 03:41:04.000000000 -0700 ++++ bundled/sympol/apps/polytope/src/build_flags.pl 2019-11-22 13:21:21.750679434 -0700 @@ -10,7 +10,7 @@ if ($ConfigFlags{'bundled.sympol.UseBund 'raycomputationcdd.cpp' => '-DGMPRATIONAL ${bundled.cdd.CFLAGS}', 'raycomputationlrs.cpp' => '-DGMP -DMA ${bundled.lrs.CFLAGS}', @@ -166,9 +186,9 @@ }, ) } else { ---- bundled/sympol/support/configure.pl.orig 2019-08-13 04:16:37.000000000 -0600 -+++ bundled/sympol/support/configure.pl 2019-08-18 16:18:04.876818161 -0600 -@@ -146,6 +146,7 @@ int main() { +--- bundled/sympol/support/configure.pl.orig 2019-11-19 03:41:04.000000000 -0700 ++++ bundled/sympol/support/configure.pl 2019-11-22 13:21:21.750679434 -0700 +@@ -147,6 +147,7 @@ int main() { undef $LIBS; $CXXFLAGS = '-I${root}/bundled/sympol/external/sympol'; } else { @@ -176,9 +196,9 @@ $LIBS="-lsympol"; } ---- perl/polymake-config.orig 2019-08-13 04:16:37.000000000 -0600 -+++ perl/polymake-config 2019-08-18 16:18:04.877818161 -0600 -@@ -139,9 +139,6 @@ while (defined ($_=shift)) { +--- perl/polymake-config.orig 2019-11-19 03:41:04.000000000 -0700 ++++ perl/polymake-config 2019-11-22 13:21:21.751679415 -0700 +@@ -140,9 +140,6 @@ while (defined ($_=shift)) { } elsif ($_ eq "--ldflags") { my $ldflags=$ConfigFlags{LDFLAGS}; @@ -188,7 +208,7 @@ my $add_rpath=1; # collect standard library paths of the C++ compiler and exclude them from the result -@@ -163,9 +160,6 @@ while (defined ($_=shift)) { +@@ -164,9 +161,6 @@ while (defined ($_=shift)) { $ldflags="$ConfigFlags{ARCHFLAGS} $ldflags -flat_namespace"; } else { $ldflags .= " -Wl,-E"; @@ -198,9 +218,9 @@ } $ldflags=~s/^\s+//; $ldflags=~s/\s+$//; $ldflags=~s/\s{2,}/ /g; ---- support/configure.pl.orig 2019-08-13 04:16:37.000000000 -0600 -+++ support/configure.pl 2019-08-18 16:18:04.877818161 -0600 -@@ -460,7 +460,7 @@ sub parse_command_line { +--- support/configure.pl.orig 2019-11-19 03:41:04.000000000 -0700 ++++ support/configure.pl 2019-11-22 13:21:21.752679397 -0700 +@@ -461,7 +461,7 @@ sub parse_command_line { } } @@ -209,7 +229,7 @@ $CXXDEBUG =$vars{CXXDEBUG} // "-g"; $CFLAGS =$vars{CFLAGS} // ""; $CXXFLAGS =$vars{CXXFLAGS} // $CFLAGS; -@@ -688,7 +688,7 @@ sub determine_cxx_library { +@@ -689,7 +689,7 @@ sub determine_cxx_library { } $CFLAGS .= " -I$options{toolchain}/include"; $CXXFLAGS .= " -I$options{toolchain}/include"; @@ -218,7 +238,7 @@ } if ($options{libcxx} eq ".true.") { -@@ -1076,10 +1076,6 @@ sub locate_gmp_and_mpfr_libraries { +@@ -1077,10 +1077,6 @@ sub locate_gmp_and_mpfr_libraries { $CXXFLAGS .= " -I$GMP/include"; my $libdir=get_libdir($GMP, "gmp"); $LDFLAGS .= " -L$libdir"; @@ -229,7 +249,7 @@ } my $MPFR=$options{mpfr}; -@@ -1088,10 +1084,6 @@ sub locate_gmp_and_mpfr_libraries { +@@ -1089,10 +1085,6 @@ sub locate_gmp_and_mpfr_libraries { $CXXFLAGS .= " -I$MPFR/include"; my $libdir=get_libdir($MPFR, "mpfr"); $LDFLAGS .= " -L$libdir"; diff --git a/polymake-jupymake.patch b/polymake-jupymake.patch deleted file mode 100644 index 21801c6..0000000 --- a/polymake-jupymake.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- resources/JuPyMake/JuPyMake.cpp.orig 2019-02-12 16:05:25.000000000 -0700 -+++ resources/JuPyMake/JuPyMake.cpp 2019-03-11 20:55:50.028569517 -0600 -@@ -137,12 +137,6 @@ struct module_state { - static struct module_state _state; - #endif - --static PyObject * error_out(PyObject *m) { -- struct module_state *st = GETSTATE(m); -- PyErr_SetString(st->error, "something bad happened"); -- return NULL; --} -- - static PyMethodDef JuPyMakeMethods[] = { - {"ExecuteCommand",(PyCFunction)ExecuteCommand, METH_VARARGS, - "Runs a polymake command"}, -@@ -200,7 +194,6 @@ extern "C" void initJuPyMake(void) - - if (module == NULL) - INITERROR; -- struct module_state *st = GETSTATE(module); - JuPyMakeError = PyErr_NewException(const_cast("JuPyMake.PolymakeError"), NULL, NULL ); - Py_INCREF( JuPyMakeError ); - diff --git a/polymake-latte.patch b/polymake-latte.patch index 7b96662..223db7a 100644 --- a/polymake-latte.patch +++ b/polymake-latte.patch @@ -1,6 +1,6 @@ ---- apps/polytope/rules/latte.rules.orig 2019-02-12 16:05:25.000000000 -0700 -+++ apps/polytope/rules/latte.rules 2019-03-06 19:00:03.643216653 -0700 -@@ -23,7 +23,7 @@ CREDIT latte +--- apps/polytope/rules/latte.rules.orig 2019-11-19 03:41:04.000000000 -0700 ++++ apps/polytope/rules/latte.rules 2019-11-22 13:27:41.816646741 -0700 +@@ -24,7 +24,7 @@ CREDIT latte custom $latte_count; CONFIGURE { diff --git a/polymake-no-hardening.patch b/polymake-no-hardening.patch index b5472c0..26232e3 100644 --- a/polymake-no-hardening.patch +++ b/polymake-no-hardening.patch @@ -1,6 +1,6 @@ ---- support/configure.pl.orig 2019-08-18 16:18:04.877818161 -0600 -+++ support/configure.pl 2019-08-18 16:22:18.491652323 -0600 -@@ -1000,6 +1000,7 @@ int main() { +--- support/configure.pl.orig 2019-11-22 13:21:21.752679397 -0700 ++++ support/configure.pl 2019-11-22 13:27:23.133985412 -0700 +@@ -1001,6 +1001,7 @@ int main() { } $LDsharedFLAGS=$Config::Config{lddlflags}; @@ -8,7 +8,7 @@ if ($^O eq "darwin") { # MacOS magic again: remove multi-architecture options for fat binaries -@@ -1029,6 +1030,8 @@ int main() { +@@ -1030,6 +1031,8 @@ int main() { if ($options{callable} ne ".none.") { $LDcallableFLAGS="$LDsharedFLAGS $Config::Config{ldflags}"; @@ -17,7 +17,7 @@ $LDsonameFLAGS = "-Wl,-soname,"; } else { $LDcallableFLAGS="none"; -@@ -1721,10 +1724,17 @@ sub write_perl_specific_configuration_fi +@@ -1722,10 +1725,17 @@ sub write_perl_specific_configuration_fi my ($xsubpp) = grep { -e $_ } map { "$Config::Config{$_}/ExtUtils/xsubpp" } qw(privlib vendorlib); my ($typemap) = grep { -e $_ } map { "$Config::Config{$_}/ExtUtils/typemap" } qw(privlib vendorlib); diff --git a/polymake.rpmlintrc b/polymake.rpmlintrc index 2f00d1c..499807f 100644 --- a/polymake.rpmlintrc +++ b/polymake.rpmlintrc @@ -18,7 +18,7 @@ addFilter(r'W: no-manual-page-for-binary polymake-config') # The binary invokes gcc, so it depends on the necessary devel packages and is # itself a devel package -addFilter(r'polymake-singular.[^:]+: E: explicit-lib-dependency libgcc') +addFilter(r'polymake-singular.[^:]+: E: explicit-lib-dependency lib(gcc|normaliz)') addFilter(r'polymake-singular.[^:]+: E: devel-dependency') addFilter(r'polymake-singular.[^:]+: W: devel-file-in-non-devel-package') diff --git a/polymake.spec b/polymake.spec index eee8fb9..9874e6b 100644 --- a/polymake.spec +++ b/polymake.spec @@ -7,22 +7,14 @@ # defined, else the plugin builds fail. %undefine _strict_symbol_defs_build -# JuPyMake version and release numbers -%global jupymakever 0.8 -%global jupymakerel 9%{?dist} - -# jupyter-polymake version and release numbers -%global jupyterpmver 0.16 -%global jupyterpmrel 9%{?dist} - # Build with the bundled version of jreality. This currently includes bundled # versions of several other Java projects (e.g., bsh, janino, jinput), and also # itextpdf 5.3.2, whose license is problematic. %bcond_with jreality Name: polymake -Version: 3.5 -Release: 5%{?dist} +Version: 3.6 +Release: 1%{?dist} %global polydir %{_libdir}/%{name} %global majver %(cut -dr -f1 <<< %{version}) @@ -45,8 +37,6 @@ Patch0: %{name}-fedora.patch Patch1: %{name}-no-hardening.patch # Fix detection of LattE Patch2: %{name}-latte.patch -# Fix some warnings in the JuPyMake code -Patch3: %{name}-jupymake.patch %if %{with jreality} BuildRequires: ant @@ -85,13 +75,8 @@ BuildRequires: permlib-devel BuildRequires: pkgconfig(eigen3) BuildRequires: pkgconfig(libxml-2.0) BuildRequires: pkgconfig(nauty) -BuildRequires: pkgconfig(python3) BuildRequires: pkgconfig(Singular) BuildRequires: ppl-devel -BuildRequires: python3dist(ipykernel) -BuildRequires: python3dist(ipython) -BuildRequires: python3dist(jupyter-client) -BuildRequires: python3dist(pexpect) BuildRequires: sympol-devel BuildRequires: TOPCOM BuildRequires: xhtml1-dtds @@ -122,11 +107,12 @@ Requires: flint-devel%{?_isa} Requires: gmp-devel%{?_isa} %if %{with jreality} Requires: java -Requires: jpackage-utils +Requires: javapackages-tools %endif Requires: gcc-c++ Requires: glibc-devel%{?_isa} Requires: libgcc%{?_isa} +Requires: libnormaliz-devel%{?_isa} Requires: make Requires: mpfr-devel%{?_isa} Requires: perl(:MODULE_COMPAT_%{perl_version}) @@ -162,6 +148,9 @@ Provides: perl(Polymake::Core::ShellHelpers) Provides: perl(Polymake::Core::ShellMock) Provides: perl(Polymake::Namespaces) Provides: perl(Polymake::Test::Validation) +Provides: perl(Polymake::file_utils.pl) +Provides: perl(Polymake::regex.pl) +Provides: perl(Polymake::utils.pl) # Don't expose private perl interfaces %global __provides_exclude perl\\\(Geomview.*\\\) @@ -176,17 +165,12 @@ Provides: perl(Polymake::Test::Validation) %global __provides_exclude %{__provides_exclude}|perl\\\(SplitsTree.*\\\) %global __provides_exclude %{__provides_exclude}|perl\\\(ThreeJS.*\\\) %global __provides_exclude %{__provides_exclude}|perl\\\(TikZ.*\\\) -%global __provides_exclude %{__provides_exclude}|perl\\\(Visual.*\\\) %global __provides_exclude %{__provides_exclude}|perl\\\(X3d.*\\\) %global __provides_exclude %{__provides_exclude}|perl\\\(application\\\) %global __provides_exclude %{__provides_exclude}|perl\\\(namespaces\\\) # Exclude private perl interfaces that we don't Provide -%global __requires_exclude perl\\\(Visual::Drawing\\\) -%global __requires_exclude %{__requires_exclude}|perl\\\(Polymake::file_utils\.pl\\\) -%global __requires_exclude %{__requires_exclude}|perl\\\(Polymake::regex\.pl\\\) -%global __requires_exclude %{__requires_exclude}|perl\\\(Polymake::utils\.pl\\\) -%global __requires_exclude %{__requires_exclude}|perl\\\(namespaces.*\\\) +%global __requires_exclude perl\\\(namespaces.*\\\) %description singular This package contains all of polymake except its Singular dependencies, @@ -200,28 +184,6 @@ Requires: %{name}%{?_isa} = %{version}-%{release} %description doc This package contains documentation for %{name}. -%package -n python3-JuPyMake -Summary: Documentation for %{name} -Requires: %{name}%{?_isa} = %{version}-%{release} -Version: %{jupymakever} -Release: %{jupymakerel} - -%description -n python3-JuPyMake -This package contains a basic interface to call polymake from python. -It is intended for use in a Jupyter interface. - -%package jupyter -Summary: Jupyter kernel for %{name} -Requires: python-jupyter-filesystem -Requires: python3-JuPyMake = %{jupymakever}-%{jupymakerel} -License: WTFPL -Version: %{jupyterpmver} -Release: %{jupyterpmrel} -BuildArch: noarch - -%description jupyter -This package contains a Jupyter kernel for polymake. - %prep %autosetup -p0 -n %{name}-%{majver} @@ -239,11 +201,6 @@ fixtimestamp bundled/sympol/apps/polytope/src/sympol_interface.cc sed -i.orig "/global variables/i\$ENV{'PATH'} = \"\$ENV{PATH}:%{_libdir}/4ti2/bin\";\n" perl/polymake fixtimestamp perl/polymake -# We do not want to use env -sed -i.orig 's,/usr/bin/env python3.*,/usr/bin/python3,' \ - resources/jupyter-polymake/setup.py -fixtimestamp resources/jupyter-polymake/setup.py - %ifarch %{arm} # The ARM builders almost always run out of memory while building polymake. # Reduce the optimization and debug levels for the problematic file in an @@ -263,13 +220,14 @@ sed -i 's,\${NINJA},& -j 1 -v,' Makefile export LC_ALL=C.UTF-8 export CFLAGS="%{optflags} -I%{_includedir}/eigen3 -I%{_includedir}/gfanlib -I%{_includedir}/nauty -Wno-unused-local-typedefs" export CXXFLAGS="$CFLAGS" -export LDFLAGS="$RPM_LD_FLAGS -lnormaliz -lcocoa -ldl" -if [ %{__isa_bits} = "32" ]; then - LDFLAGS="-Wl,--no-keep-memory -Wl,--reduce-memory-overheads $LDFLAGS" -fi +export LDFLAGS="$RPM_LD_FLAGS -lnormaliz -ldl" +%if 0%{__isa_bits} == 32 +LDFLAGS="-Wl,--no-keep-memory -Wl,--reduce-memory-overheads $LDFLAGS" +%endif export Arch=%{_arch} # NOT an autoconf-generated configure script; do not use %%configure. ./configure --build=%{_arch} --prefix=%{_prefix} --libdir=%{_libdir} \ + --libexecdir=%{polydir} \ --without-native \ --with-cdd-include=%{_includedir}/cddlib/ \ --with-cdd-lib=%{_libdir} \ @@ -285,10 +243,13 @@ export Arch=%{_arch} %else --without-java \ %endif - --libexecdir=%{polydir} --without-javaview + --without-javaview -# No, really, we can't have the hardening flags on -sed -i 's| -Wl,-z,now -specs=.*redhat-hardened-ld||g' build.%{_arch}/config.ninja +# No, really, we can't have the hardening flags on, and we do not want to +# specify -lpthread before -Wl,--as-needed +sed -e 's| -Wl,-z,now -specs=.*redhat-hardened-ld||g' \ + -e 's/-lpthread -shared/-shared/g' \ + -i build.%{_arch}/config.ninja # FIXME: infrequent failures with %%{?_smp_mflags}, plus memory is tight make all @@ -325,40 +286,9 @@ chmod 0755 %{buildroot}%{_datadir}/%{name}/resources/host-agent/server.pl chmod 0755 %{buildroot}%{_datadir}/%{name}/resources/polymake-in-container.sh find %{buildroot}%{polydir} -name \*.so -exec chmod 0755 {} \+ -# We install JuPyMake and jupyter-polymake in the python directories +# JuPyMake and jupyter-polymake are built and installed separately rm -fr %{buildroot}%{_datadir}/%{name}/resources/{JuPyMake,jupyter-polymake} -# We cannot build JuPyMake and jupyter-polymake until we have an installed tree -pushd resources/JuPyMake -export PATH=$PATH:$PWD -sed "s,@buildroot@,%{buildroot},;s,@libdir@,%{_libdir}," %{SOURCE2} \ - > polymake-config -chmod a+x polymake-config -%py3_build -%py3_install -rm polymake-config -popd - -pushd resources/jupyter-polymake -%py3_build -%py3_install -popd - -# Move the jupyter kernel files to where they should go -mkdir -p %{buildroot}%{_datadir}/jupyter/kernels/polymake -mv %{buildroot}%{python3_sitelib}/jupyter_kernel_polymake/resources/* \ - %{buildroot}%{_datadir}/jupyter/kernels/polymake -rmdir %{buildroot}%{python3_sitelib}/jupyter_kernel_polymake/resources - -# Since JuPyMake is executed once in the buildroot to move all the files where -# they are supposed to go, the buildroot string ends up in the debug file for -# JuPyMake, which makes the build fail. However: -# (1) No file other than the debug file contains a buildroot string; and -# (2) I don't know how to get it out of the debug file without doing -# significant damage to that file. -# So we do this instead: -export QA_SKIP_BUILD_ROOT=1 - %files %{_bindir}/%{name} %{polydir}/lib/ideal.so @@ -398,18 +328,12 @@ export QA_SKIP_BUILD_ROOT=1 %files doc %doc doc/* -%files -n python3-JuPyMake -%doc resources/JuPyMake/example.py resources/JuPyMake/README.md -%license resources/JuPyMake/GPLv2 resources/JuPyMake/LICENSE -%{python3_sitearch}/JuPyMake* - -%files jupyter -%doc resources/jupyter-polymake/README.md -%license resources/jupyter-polymake/LICENSE -%{_datadir}/jupyter/kernels/%{name}/ -%{python3_sitelib}/jupyter_kernel_polymake* - %changelog +* Wed Nov 27 2019 Jerry James - 3.6-1 +- Version 3.6 +- Drop the JuPyMake and jupyter-polymake support; those packages are now + built and installed separately + * Mon Nov 11 2019 Jerry James - 3.5-5 - Rebuild for perl 5.30.1 diff --git a/sources b/sources index e7f2a34..07187d0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (polymake-3.5-minimal.tar.bz2) = 6bfc395c2cfb1c4435d18c6429dfdd49eb35680b1189b73d29ea75c9520bc374cb4d7ea9138d7fc04ac371bb50860190354d983dc3c461539672b8dbd1ee76ac +SHA512 (polymake-3.6-minimal.tar.bz2) = bed18b31145bd9c795dcd11d2285337f40ed4e736c47f41e8133590043e7caceba6bc97fb1f124fa44f149d165673675fea2d3bf948b143e49f966624782f343