public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Tom Rix <Tom.Rix@amd.com>
To: git-commits@fedoraproject.org
Subject: [rpms/hipfft] epel10: Convert from gitcommit to preview
Date: Thu, 11 Jun 2026 16:24:39 GMT	[thread overview]
Message-ID: <178119507998.1.17486757634070176067.rpms-hipfft-b100ceea0428@fedoraproject.org> (raw)

            A new commit has been pushed.

            Repo   : rpms/hipfft
            Branch : epel10
            Commit : b100ceea042804201d24156bc4b7ee4b7aa433d4
            Author : Tom Rix <Tom.Rix@amd.com>
            Date   : 2026-02-28T07:44:14-08:00
            Stats  : +20/-62 in 4 file(s)
            URL    : https://src.fedoraproject.org/rpms/hipfft/c/b100ceea042804201d24156bc4b7ee4b7aa433d4?branch=epel10

            Log:
            Convert from gitcommit to preview

Signed-off-by: Tom Rix <Tom.Rix@amd.com>

---
diff --git a/.gitignore b/.gitignore
index 8b914c9..9126b28 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@
 /hipFFT-rocm-7.0.2.tar.gz
 /hipFFT-rocm-7.1.0.tar.gz
 /hipfft-7.2.0.tar.gz
+/hipfft-7.11.0.tar.gz

diff --git a/0001-hipfft-hipfftw-soversion.patch b/0001-hipfft-hipfftw-soversion.patch
deleted file mode 100644
index e43b9c0..0000000
--- a/0001-hipfft-hipfftw-soversion.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From cfa8e85698486f791008fcade4ec2dff8ddd99d9 Mon Sep 17 00:00:00 2001
-From: Tom Rix <Tom.Rix@amd.com>
-Date: Fri, 31 Oct 2025 09:10:07 -0700
-Subject: [PATCH] hipfft hipfftw soversion
-
----
- library/CMakeLists.txt | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt
-index 8c97cc4eeb97..97cacb3451d3 100644
---- a/library/CMakeLists.txt
-+++ b/library/CMakeLists.txt
-@@ -164,6 +164,7 @@ endif()
- # nvcc can not recognize shared library file name with suffix other than *.so when linking.
- if (NOT BUILD_WITH_COMPILER STREQUAL "HIP-NVCC")
-   rocm_set_soversion(hipfft ${hipfft_SOVERSION})
-+  rocm_set_soversion(hipfftw ${hipfft_SOVERSION})
- endif()
- 
- # Generate export header
--- 
-2.51.0
-

diff --git a/hipfft.spec b/hipfft.spec
index 63d8664..d752958 100644
--- a/hipfft.spec
+++ b/hipfft.spec
@@ -19,16 +19,19 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 #
-%bcond_with gitcommit
-%if %{with gitcommit}
-%global commit0 2584e35062ad9c2edb68d93c464cf157bc57e3b0
-%global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
-%global date0 20250926
-%endif
-
 %global upstreamname hipfft
+
+%bcond_with preview
+%if %{with preview}
+%global rocm_release 7.11
+%global rocm_patch 0
+%global pkg_src therock-%{rocm_release}
+%else
 %global rocm_release 7.2
 %global rocm_patch 0
+%global pkg_src rocm-%{rocm_release}.%{rocm_patch}
+%endif
+
 %global rocm_version %{rocm_release}.%{rocm_patch}
 
 %bcond_with compat
@@ -81,25 +84,16 @@
 %global _binary_payload w7T0.xzdio
 
 Name:           %{hipfft_name}
-%if %{with gitcommit}
-Version:        git%{date0}.%{shortcommit0}
-Release:        2%{?dist}
-%else
 Version:        %{rocm_version}
+%if %{with preview}
+Release:        1%{?dist}
+%else
 Release:        2%{?dist}
 %endif
 Summary:        ROCm FFT marshaling library
 License:        MIT AND BSD-3-Clause
 URL:            https://github.com/ROCm/rocm-libraries
-
-%if %{with gitcommit}
-Source0:        %{url}/archive/%{commit0}/rocm-libraries-%{shortcommit0}.tar.gz
-%else
-Source0:        %{url}/releases/download/rocm-%{version}/%{upstreamname}.tar.gz#/%{upstreamname}-%{version}.tar.gz
-%endif
-
-# https://github.com/ROCm/rocm-libraries/issues/2400
-Patch1:         0001-hipfft-hipfftw-soversion.patch
+Source0:        %{url}/releases/download/%{pkg_src}/%{upstreamname}.tar.gz#/%{upstreamname}-%{version}.tar.gz
 
 # Only x86_64 works right now
 ExclusiveArch:  x86_64
@@ -165,12 +159,11 @@ Requires:       %{name}%{?_isa} = %{version}-%{release}
 %endif
 
 %prep
-%if %{with gitcommit}
-%setup -q -n rocm-libraries-%{commit0}
-cd projects/hipfft
-%else
 %autosetup -p1 -n %{upstreamname}
-%endif
+
+# https://github.com/ROCm/rocm-libraries/issues/2400
+sed -i '/rocm_set_soversion(hipfft .*/a\
+  rocm_set_soversion(hipfftw ${hipfft_SOVERSION})' library/CMakeLists.txt
 
 # CMake Error at clients/tests/CMakeLists.txt:87 (find_package):
 #   No "FindHIP.cmake" found in CMAKE_MODULE_PATH.
@@ -178,10 +171,6 @@ cd projects/hipfft
 sed -i -e 's@find_package( HIP MODULE REQUIRED )@find_package( HIP REQUIRED )@' clients/tests/CMakeLists.txt
 
 %build
-%if %{with gitcommit}
-cd projects/hipfft
-%endif
-
 %cmake \
     -DCMAKE_C_COMPILER=%rocmllvm_bindir/amdclang \
     -DCMAKE_CXX_COMPILER=%rocmllvm_bindir/amdclang++ \
@@ -202,11 +191,7 @@ cd projects/hipfft
 
 %cmake_build
 
-
 %install
-%if %{with gitcommit}
-cd projects/hipfft
-%endif
 %cmake_install
 
 rm -f %{buildroot}%{pkg_prefix}/share/doc/hipfft/LICENSE.md
@@ -225,13 +210,8 @@ export LD_LIBRARY_PATH=%{_vpath_builddir}/library:$LD_LIBRARY_PATH
 %endif
 
 %files
-%if %{with gitcommit}
-%license projects/hipfft/LICENSE.md
-%doc projects/hipfft/README.md
-%else
 %license LICENSE.md
 %doc README.md
-%endif
 
 %{pkg_prefix}/%{pkg_libdir}/libhipfft.so.0{,.*}
 %{pkg_prefix}/%{pkg_libdir}/libhipfftw.so.0{,.*}

diff --git a/sources b/sources
index 459ae3e..6d171b1 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
 SHA512 (hipfft-7.2.0.tar.gz) = bd42d71fe01c05fe7d17d298bc6ee9e70d0733a8146b295e17fe7657bb0be34d3f78b0e8525131b4bbc6f7d38307a97e92314945dcc42ef1934cd3c95a9c9a19
+SHA512 (hipfft-7.11.0.tar.gz) = a35cd31370f7f286eeab3c233c53a08fe8bb434042521cafbc25747fa935b687b1fdf485daad0d8250d2b8f25a414090591af6b485c1e5ad0fb7b9f003c06a09

                 reply	other threads:[~2026-06-11 16:24 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=178119507998.1.17486757634070176067.rpms-hipfft-b100ceea0428@fedoraproject.org \
    --to=tom.rix@amd.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