public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/mathic] f44: Version 1.4
@ 2026-06-09 22:20 Jerry James
  0 siblings, 0 replies; only message in thread
From: Jerry James @ 2026-06-09 22:20 UTC (permalink / raw)
  To: git-commits

            A new commit has been pushed.

            Repo   : rpms/mathic
            Branch : f44
            Commit : 1872f1dbc3dcee840a0f18bb8bf51c4b13cd8969
            Author : Jerry James <loganjerry@gmail.com>
            Date   : 2026-06-09T15:37:25-06:00
            Stats  : +36/-32 in 2 file(s)
            URL    : https://src.fedoraproject.org/rpms/mathic/c/1872f1dbc3dcee840a0f18bb8bf51c4b13cd8969?branch=f44

            Log:
            Version 1.4

- Use the cmake declarative buildsystem

---
diff --git a/mathic.spec b/mathic.spec
index 3aa847d..5f63fb0 100644
--- a/mathic.spec
+++ b/mathic.spec
@@ -1,5 +1,5 @@
 Name:           mathic
-Version:        1.3
+Version:        1.4
 Release:        %autorelease
 Summary:        Data structures for Groebner basis computations
 
@@ -10,11 +10,15 @@ Source:         %{url}/archive/v%{version}/%{name}-%{version}.tar.gz
 
 # See https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval
 ExcludeArch:    %{ix86}
-
+BuildSystem:    cmake
+BuildOption(conf): -DBUILD_SHARED_LIBS:BOOL=ON
+BuildOption(conf): -DBUILD_TESTING:BOOL=ON
+BuildOption(conf): -DCMAKE_SKIP_RPATH:BOOL=ON
+BuildOption(conf): -Denable_divsim:BOOL=ON
+BuildOption(conf): -Denable_pqsim:BOOL=ON
+
+BuildRequires:  cmake(GTest)
 BuildRequires:  gcc-c++
-BuildRequires:  libtool
-BuildRequires:  make
-BuildRequires:  pkgconfig(gtest)
 BuildRequires:  pkgconfig(memtailor)
 
 %description
@@ -51,40 +55,40 @@ Mathic-based tools.  Currently this contains:
 - pqsim: priority queue simulation
 
 %prep
-%autosetup -p1
-
-%conf
-# Fix the URL in the pkgconfig file
-sed -i 's/broune/Macaulay2/' build/autotools/mathic.pc.in
-
-# Upstream doesn't generate the configure script
-autoreconf -fi .
+%autosetup
 
-%build
-export GTEST_PATH=%{_prefix}
-export GTEST_VERSION=$(gtest-config --version)
-%configure --disable-static --enable-shared --with-gtest=yes GTEST_LIBS=-lgtest
+# Fix the installation directory
+sed -i 's, lib, ${LIB_INSTALL_DIR},' CMakeLists.txt
 
-# Get rid of undesirable hardcoded rpaths; workaround libtool reordering
-# -Wl,--as-needed after all the libraries.
-sed -e 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' \
-    -e 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' \
-    -e 's|CC=.g..|& -Wl,--as-needed|' \
-    -i libtool
+# Add an soname
+sed -e '/Threads/iset_target_properties(mathic PROPERTIES VERSION 0.0.4 SOVERSION 0)' \
+    -i src/CMakeLists.txt
 
-%make_build
-%make_build divsim pqsim
-
-%install
-%make_install
+%install -a
+# This file is not installed by cmake
+cp -p src/mathic.h %{buildroot}%{_includedir}
 
 # Install the tools
 mkdir -p %{buildroot}%{_bindir}
-cp -p .libs/{divsim,pqsim} %{buildroot}%{_bindir}
+cp -p %{_vpath_builddir}/{divsim,pqsim} %{buildroot}%{_bindir}
+
+# Install the pkgconfig file for backwards compatibility
+# Fix the URL in the pkgconfig file
+mkdir -p %{buildroot}%{_libdir}/pkgconfig
+sed -e 's,@prefix@,%{_prefix},' \
+    -e 's,@exec_prefix@,%{_prefix},' \
+    -e 's,@libdir@,%{_libdir},' \
+    -e 's,@includedir@,%{_includedir},' \
+    -e 's,@PACKAGE_VERSION@,%{version},' \
+    -e 's,broune,Macaulay2,' \
+    build/autotools/mathic.pc.in \
+    > %{buildroot}%{_libdir}/pkgconfig/%{name}.pc
+
+# We install these files in a different place
+rm -fr %{buildroot}%{_prefix}/licenses
 
 %check
-export LD_LIBRARY_PATH=$PWD/.libs
-make check
+%{_vpath_builddir}/src/mathic-unit-tests
 
 %files
 %doc README.md

diff --git a/sources b/sources
index aa31d44..09b357e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (mathic-1.3.tar.gz) = d555aea95443f91dc6d71d824c8c0ad2c2c288a32fd20cf9c20ca9c6cec5e9e4bc6918551d70ea47ccc893490a05a4881ad184fbbebf4ca607bc47e3b98ff2b4
+SHA512 (mathic-1.4.tar.gz) = 71b98006b422b810815b6aacf77e2a3b6f037997595ae31ce823a417408efbf5f0af17ea1b7092b90a6537eed17dff0b4dce4cc1cf6a6400b00c1685b25bc3e2

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2026-06-09 22:20 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-06-09 22:20 [rpms/mathic] f44: Version 1.4 Jerry James

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox