From d200b0c144b3bf2dcb65c6b05d3d124b6887eee2 Mon Sep 17 00:00:00 2001
From: Jerry James <loganjerry@gmail.com>
Date: Dec 10 2019 04:36:30 +0000
Subject: Fix the location of the module file (bz 1773348).

Do not build the empty fiber library.

---

diff --git a/4ti2.rpmlintrc b/4ti2.rpmlintrc
new file mode 100644
index 0000000..ce69003
--- /dev/null
+++ b/4ti2.rpmlintrc
@@ -0,0 +1,11 @@
+# THIS FILE IS FOR WHITELISTING RPMLINT ERRORS AND WARNINGS IN TASKOTRON
+# https://fedoraproject.org/wiki/Taskotron/Tasks/dist.rpmlint#Whitelisting_errors
+
+# The dictionary is missing some technical terms
+addFilter(r'W: spelling-error .* combinatorial')
+
+# The documentation is in the main package
+addFilter(r'4ti2-devel\.[^:]+: W: no-documentation')
+
+# If gnulib leaves a version number behind somewhere, I can't find it
+addFilter(r'4ti2\.spec:[^:]+: W: unversioned-explicit-provides bundled\(gnulib\)')
diff --git a/4ti2.spec b/4ti2.spec
index 7b3b2d4..251f244 100644
--- a/4ti2.spec
+++ b/4ti2.spec
@@ -1,6 +1,6 @@
 Name:           4ti2
 Version:        1.6.9
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Algebraic, geometric and combinatorial problems on linear spaces
 
 %global relver %(tr . _ <<< %{version})
@@ -12,6 +12,7 @@ Source1:        4ti2.module.in
 # Deal with a boolean variable that can somehow hold the value 2
 Patch0:         %{name}-maxnorm.patch
 
+BuildRequires:  environment(modules)
 BuildRequires:  gcc
 BuildRequires:  gcc-c++
 BuildRequires:  glpk-devel
@@ -24,14 +25,14 @@ BuildRequires:  tex(epic.sty)
 Provides:       bundled(gnulib)
 
 Requires:       4ti2-libs%{?_isa} = %{version}-%{release}
-Requires:       environment-modules
+Requires:       environment(modules)
 
 %description
 A software package for algebraic, geometric and combinatorial problems
 on linear spaces.
 
 This package uses Environment Modules.  Prior to invoking the binaries,
-you must run "module load 4ti2-%{arch}" to modify your PATH.
+you must run "module load 4ti2-%{_arch}" to modify your PATH.
 
 %package devel
 Summary:        Headers needed to develop software that uses 4ti2
@@ -63,7 +64,7 @@ mv -f NEWS.utf8 NEWS
 sed -i 's/c++0x/c++11/g' configure
 
 %build
-%configure --enable-shared --disable-static --enable-fiber
+%configure --enable-shared --disable-static
 
 # Get rid of undesirable hardcoded rpaths; workaround libtool reordering
 # -Wl,--as-needed after all the libraries.
@@ -97,9 +98,9 @@ mkdir -p %{buildroot}%{_libdir}/4ti2
 mv %{buildroot}%{_bindir} %{buildroot}%{_libdir}/4ti2
 
 # Make the environment-modules file
-mkdir -p %{buildroot}%{_datadir}/Modules/modulefiles/
+mkdir -p %{buildroot}%{_modulesdir}
 # Since we're doing our own substitution here, use our own definitions.
-sed 's#@LIBDIR@#'%{_libdir}/4ti2'#g;' < %SOURCE1 >%{buildroot}%{_datadir}/Modules/modulefiles/4ti2-%{_arch}
+sed 's#@LIBDIR@#'%{_libdir}/4ti2'#g;' < %SOURCE1 >%{buildroot}%{_modulesdir}/4ti2-%{_arch}
 
 # We don't need or want libtool files
 rm -f %{buildroot}%{_libdir}/*.la
@@ -107,8 +108,6 @@ rm -f %{buildroot}%{_libdir}/*.la
 # We don't want documentation in _datadir
 rm -fr %{buildroot}%{_datadir}/4ti2/doc
 
-%ldconfig_scriptlets libs
-
 %check
 export LD_LIBRARY_PATH=%{buildroot}%{_libdir}
 make check
@@ -116,7 +115,7 @@ make check
 %files
 %doc doc/4ti2_manual.pdf
 %{_libdir}/4ti2/
-%{_datadir}/Modules/modulefiles/4ti2-%{_arch}
+%{_modulesdir}/4ti2-%{_arch}
 
 %files devel
 %{_includedir}/4ti2/
@@ -130,6 +129,10 @@ make check
 %{_libdir}/libzsolve*.so.0*
 
 %changelog
+* Mon Dec  9 2019 Jerry James <loganjerry@gmail.com> - 1.6.9-4
+- Fix the location of the module file (bz 1773348)
+- Do not build the empty fiber library
+
 * Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.9-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild