Fix fedora package name.

kpeeters · Aug 10, 2024 · a06281e · a06281e
1 parent a97d0bd
commit a06281e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/.github/workflows/fedora-40-package.yml b/.github/workflows/fedora-40-package.yml
@@ -59,7 +59,7 @@ jobs:
 
     - name: Upload Release Assets
       run: |
-        gh release upload "${{ env.VERSION }}" build/cadabra2-${{ env.VERSION }}-fedora-40.deb --clobber
+        gh release upload "${{ env.VERSION }}" build/cadabra2-${{ env.VERSION }}-fedora-40.rpm --clobber
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
diff --git a/cmake/packaging.cmake b/cmake/packaging.cmake
@@ -52,6 +52,10 @@ if(EXISTS "/etc/redhat-release")
 			message("-- This is a Fedora 35 system")
 			set(CPACK_RPM_PACKAGE_REQUIRES   "python3-libs, gmp, libuuid, sqlite, gtkmm30, boost-system, boost-filesystem, boost-program-options, boost-regex, libstdc++, python3-matplotlib, python3-sympy, dvipng, texlive, texlive-ytableau")
 			set(CPACK_SYSTEM_NAME "fedora35")
+		 elseif(LINUX_ISSUE MATCHES "40")
+			message("-- This is a Fedora 40 system")
+			set(CPACK_RPM_PACKAGE_REQUIRES   "python3-libs, gmp, libuuid, sqlite, gtkmm30, boost-system, boost-filesystem, boost-program-options, boost-regex, libstdc++, python3-matplotlib, python3-sympy")
+			set(CPACK_SYSTEM_NAME "fedora40")
 		 elseif(LINUX_ISSUE MATCHES "24")
 			message("-- This is a Fedora 24 system")
 			set(CPACK_RPM_PACKAGE_REQUIRES   "python3-libs, gmp, libuuid, sqlite, gtkmm30, boost-system, boost-filesystem, boost-program-options, boost-regex, libstdc++, python3-matplotlib, dvipng, texlive, texlive-ytableau")