public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: SY Wang <uwsy1059@qq.com>
To: git-commits@fedoraproject.org
Subject: [rpms/mstore] rawhide: Switch to CMake build system.
Date: Fri, 28 Aug 2026 14:22:18 GMT	[thread overview]
Message-ID: <178792693803.1.6691075078190605856.rpms-mstore-9b5626dd0aa2@fedoraproject.org> (raw)

A new commit has been pushed.

Repo   : rpms/mstore
Branch : rawhide
Commit : 9b5626dd0aa2b13ef5c90a067f9a93087e6d6e01
Author : SY Wang <uwsy1059@qq.com>
Date   : 2026-08-28T16:12:52+08:00
Stats  : +19/-14 in 1 file(s)
URL    : https://src.fedoraproject.org/rpms/mstore/c/9b5626dd0aa2b13ef5c90a067f9a93087e6d6e01?branch=rawhide

Log:
Switch to CMake build system.

---
diff --git a/mstore.spec b/mstore.spec
index 9630e30..b14721b 100644
--- a/mstore.spec
+++ b/mstore.spec
@@ -1,14 +1,14 @@
 Name:           mstore
 Version:        0.3.0
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Molecular structure store for testing
 License:        Apache-2.0
 URL:            https://github.com/grimme-lab/mstore
 Source0:        https://github.com/grimme-lab/mstore/archive/v%{version}/%{name}-%{version}.tar.gz
 
-BuildRequires:  meson
+BuildRequires:  cmake
 BuildRequires:  gcc-gfortran
-BuildRequires:  mctc-lib-devel >= 0.5.2
+BuildRequires:  cmake(mctc-lib)
 
 %description
 Molecular structure store for testing
@@ -23,33 +23,38 @@ This package contains the development headers for mstore.
 %prep
 %autosetup
 
+%conf
+# TODO: Account for absolute path CMAKE_INSTALL_INCLUDEDIR so we can use %%{_fmoddir}
+%cmake \
+  -DCMAKE_INSTALL_INCLUDEDIR:PATH=%{_lib}/gfortran/modules \
+  -Dmstore-module-dir:STRING=mstore
+
 %build
-%meson
-%meson_build
+%cmake_build
 
 %install
-%meson_install
-# Move Fortran modules to the right place
-mkdir -p %{buildroot}%{_libdir}/gfortran/modules
-mv %{buildroot}%{_includedir}/mstore/gcc-*/*.mod %{buildroot}%{_libdir}/gfortran/modules
-# Remove static library
-\rm %{buildroot}%{_libdir}/libmstore.a
+%cmake_install
 
 %check
-%meson_test
+%ctest
 
 %files
 %license LICENSE
 %doc README.md
-%{_libdir}/libmstore.so.*
+%{_libdir}/libmstore.so.%{soversion}{,.*}
 %{_bindir}/mstore-info
+%{_bindir}/mstore-fortranize
 
 %files devel
 %{_libdir}/libmstore.so
-%{_libdir}/gfortran/modules/mstore*.mod
+%{_fmoddir}/mstore/
+%{_libdir}/cmake/mstore/
 %{_libdir}/pkgconfig/mstore.pc
 
 %changelog
+* Fri Aug 28 2026 SY Wang <uwsy1059@qq.com> - 0.3.0-8
+- Switch to CMake build system.
+
 * Wed Jul 29 2026 Susi Lehtola <susi.lehtola@iki.fi> - 0.3.0-7
 - Rebuild against mctc-lib update.
 

                 reply	other threads:[~2026-08-28 14:22 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=178792693803.1.6691075078190605856.rpms-mstore-9b5626dd0aa2@fedoraproject.org \
    --to=uwsy1059@qq.com \
    --cc=git-commits@fedoraproject.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox