Merge branch 'fasttrack/3.0' into topic_numpy-3.0

microsoft · Feb 13, 2025 · 7e2a454 · 7e2a454
2 parents 668ae2b + dd463eb
commit 7e2a454
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/SPECS-SIGNED/srp-signed/srp-signed.spec b/SPECS-SIGNED/srp-signed/srp-signed.spec
@@ -30,7 +30,7 @@
 # The default %%__os_install_post macro ends up stripping the signatures off of the kernel module.
 %define __os_install_post %{__os_install_post_leave_signatures} %{nil}
 
-%if 0%{azl}
+%if 0%{?azl}
 %global target_kernel_version_full %(/bin/rpm -q --queryformat '%{VERSION}-%{RELEASE}' kernel-headers)
 %else
 %global target_kernel_version_full f.a.k.e
@@ -41,7 +41,7 @@
 Summary:	 srp driver
 Name:		 srp
 Version:	 24.10
-Release:	 6%{?dist}
+Release:	 7%{?dist}
 License:	 GPLv2
 Url:		 http://www.mellanox.com
 Group:		 System Environment/Base
@@ -99,6 +99,9 @@ popd
 %license %{_datadir}/licenses/%{name}/copyright
 
 %changelog
+* Wed Feb 11 2025 Sam Meluch <sammeluch@microsoft.com> - 24.10-7
+- fix broken azl macro for fasttrack
+
 * Wed Feb 05 2025 Tobias Brick <tobiasb@microsoft.com> - 24.10-6
 - Bump release to rebuild for new kernel release
 

diff --git a/SPECS/srp/srp.spec b/SPECS/srp/srp.spec
@@ -28,7 +28,7 @@
 
 %global last-known-kernel 6.6.64.2
 
-%if 0%{azl}
+%if 0%{?azl}
 %global target_kernel_version_full %(/bin/rpm -q --queryformat '%{VERSION}-%{RELEASE}' kernel-headers)
 %else
 %global target_kernel_version_full f.a.k.e
@@ -64,7 +64,7 @@
 Summary:	 srp driver
 Name:		 srp
 Version:	 24.10
-Release:	 6%{?dist}
+Release:	 7%{?dist}
 License:	 GPLv2
 Url:		 http://www.mellanox.com
 Group:		 System Environment/Base
@@ -253,6 +253,9 @@ fi
 %endif
 
 %changelog
+* Wed Feb 11 2025 Sam Meluch <sammeluch@microsoft.com> - 24.10-7
+- fix broken azl macro for fasttrack
+
 * Wed Feb 05 2025 Tobias Brick <tobiasb@microsoft.com> - 24.10-6
 - Bump release to rebuild for new kernel release