public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/asl] rawhide: Version 20260109
@ 2026-07-13 14:25 Jerry James
  0 siblings, 0 replies; only message in thread
From: Jerry James @ 2026-07-13 14:25 UTC (permalink / raw)
  To: git-commits

            A new commit has been pushed.

            Repo   : rpms/asl
            Branch : rawhide
            Commit : 8fd336d2e5d232d91807628262ea0057addd105c
            Author : Jerry James <loganjerry@gmail.com>
            Date   : 2026-07-13T08:25:31-06:00
            Stats  : +16/-27 in 3 file(s)
            URL    : https://src.fedoraproject.org/rpms/asl/c/8fd336d2e5d232d91807628262ea0057addd105c?branch=rawhide

            Log:
            Version 20260109

- Use the cmake declarative buildsystem
- Drop use of fdupes; deduplication is now done by default

---
diff --git a/asl-arch-flags.patch b/asl-arch-flags.patch
index 6c7ac7c..61485c4 100644
--- a/asl-arch-flags.patch
+++ b/asl-arch-flags.patch
@@ -1,9 +1,9 @@
---- asl-2f5d9de248c53a3063bba23af2013cd3db768bf8/support/cmake/setArchitecture.cmake.orig	2024-02-01 06:05:32.000000000 -0700
-+++ asl-2f5d9de248c53a3063bba23af2013cd3db768bf8/support/cmake/setArchitecture.cmake	2024-02-06 16:40:38.509292057 -0700
+--- asl-877221766530d6bde7f15cb8c014eb6f3ca39c58/support/cmake/setArchitecture.cmake.orig	2026-07-10 00:59:30.000000000 -0600
++++ asl-877221766530d6bde7f15cb8c014eb6f3ca39c58/support/cmake/setArchitecture.cmake	2026-07-13 06:41:21.822634589 -0600
 @@ -149,19 +149,6 @@ function(getArchitectureFlags ARCH COMPI
      message(ERROR_CRITICAL "Please define the architecture")
    endif()
-   if(UNIX AND NOT CPUARCH MATCHES "arm")
+   if(UNIX AND (CPUARCH MATCHES "^(i386|x86_64)$" OR (CPUARCH MATCHES "ppc64" AND CMAKE_SYSTEM_NAME STREQUAL "AIX")))
 -    if(CPUARCH MATCHES "ppc64") # on AIX
 -      if(ARCH EQUAL 32)
 -        set(CCFLAG "")

diff --git a/asl.spec b/asl.spec
index dace32a..4b965fc 100644
--- a/asl.spec
+++ b/asl.spec
@@ -1,8 +1,8 @@
 # ASL upstream has not tagged any releases, so we use a git checkout
-%global commit     3d477ba78a3392b8b7b05a2fd843ae7f9df70252
+%global commit  877221766530d6bde7f15cb8c014eb6f3ca39c58
 
 Name:           asl
-Version:        20251122
+Version:        20260109
 Release:        %autorelease
 Summary:        AMPL Solver Library
 
@@ -18,8 +18,13 @@ Patch:          %{name}-shared.patch
 # Do not override Fedora architecture flags
 Patch:          %{name}-arch-flags.patch
 
-BuildRequires:  cmake
-BuildRequires:  fdupes
+BuildSystem:    cmake
+BuildOption(conf): -DBUILD_CPP:BOOL=ON
+BuildOption(conf): -DBUILD_EXAMPLES:BOOL=OFF
+BuildOption(conf): -DBUILD_MT_LIBS:BOOL=ON
+BuildOption(conf): -DBUILD_SHARED_LIBS:BOOL=ON
+BuildOption(conf): -DGENERATE_ARITH:BOOL=ON
+
 BuildRequires:  gcc-c++
 BuildRequires:  gcc-fortran
 
@@ -37,37 +42,21 @@ Header files and library links for building projects that use %{name}.
 %prep
 %autosetup -p1 -n %{name}-%{commit}
 
-%conf
+%conf -p
 # Fix install location of ampl-asl-config
 sed -i 's,share/,lib/cmake/,' CMakeLists.txt
 
 # Fix install location on 64-bit platforms
-if [ "%{_lib}" != "lib" ]; then
-  sed -i '/DESTINATION/s/lib/%{_lib}/g' CMakeLists.txt
-fi
+sed -i '/DESTINATION/s/lib/${LIB_INSTALL_DIR}/g' CMakeLists.txt
 
 export CFLAGS="%{build_cflags} -DIGNORE_BOGUS_WARNINGS"
 export CXXFLAGS="%{build_cxxflags} -DIGNORE_BOGUS_WARNINGS"
-%cmake \
-  -DBUILD_CPP:BOOL=ON \
-  -DBUILD_EXAMPLES:BOOL=OFF \
-  -DBUILD_MT_LIBS:BOOL=ON \
-  -DBUILD_SHARED_LIBS:BOOL=ON \
-  -DGENERATE_ARITH:BOOL=ON
-
-%build
-%cmake_build
-
-%install
-%cmake_install
 
+%install -a
 # mp needs uninstalled files
 cp -p src/solvers/{dvalue.hd,fg_read.c} %{buildroot}%{_includedir}/asl
 cp -p src/solvers2/fg_read.c %{buildroot}%{_includedir}/asl2
 
-# Save space by not duplicating header files between asl and asl2
-%fdupes %{buildroot}%{_includedir}
-
 %files
 %doc README.md
 %license LICENSE LICENSE.2

diff --git a/sources b/sources
index e1bf71c..caf27d8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (asl-20251122.tar.gz) = 0032ef2416093ded763e0aabe49e3e16a43328b91e5bef72f35f2cf5dcf75823c16606a37752376819d201bf4fea2130ce545b08d61b0ba0cc4a78af73c208ee
+SHA512 (asl-20260109.tar.gz) = 6649e003ea0264f7bb4219776511593a1c8f6ce28650d43bbb90f739dfd146c1776e0ba0fc8b67b559fc16da88bb42a57515a293ae6c76aac18b81e7ca17ef9d

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

only message in thread, other threads:[~2026-07-13 14:25 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-07-13 14:25 [rpms/asl] rawhide: Version 20260109 Jerry James

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