Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild

This reverts commit f608275ec9.
Problem building on aarch64

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

.gitignore

@@ -1,2 +1,3 @@
 /xnnpack-51a9875.tar.gz
 /xnnpack-fcbf55a.tar.gz
+/xnnpack-312eb7e.tar.gz

sources

@@ -1,2 +1,3 @@
 SHA512 (xnnpack-51a9875.tar.gz) = 1742ad4de3aa1a67cd5a3cbf15d82afc2cc8569a2abac92542f748a440ef37fef4e9d9c302b7b2813e3176934b637c761c1c0956d20ab1ba28b280d9b121d91b
 SHA512 (xnnpack-fcbf55a.tar.gz) = 8063e27686f7b71cfba05b0c004c46db4506638689ffb112f013b3886de58653b60ca5487978c3f96275c17bb1136883ca4c93ddb2241a2c31925a950cb51759
+SHA512 (xnnpack-312eb7e.tar.gz) = fe027e3a5ff065675b845f391380939ebd85d1482b2b991b2ef0e6f15528d119cc36d52201f44d2301e34cf0928d53d7b52e95a29c5d69f48d1e2679b12e075c

xnnpack.spec

@@ -2,10 +2,14 @@
 %bcond_with gitcommit
 
 %if %{with gitcommit}
+# Something recent to match change to cpuinfo
+%global commit0 312eb7e13554ce75d02c5cb27357555f1368f2d1
+%global date0 20240814
+
 %else
-# commit is what PyTorch 2.3 at its gitcommit expects
-%global commit0 fcbf55af6cf28a4627bcd1f703ab7ad843f0f3a2
-%global date0 20240229
+# For PyTorch 2.5
+%global commit0 312eb7e13554ce75d02c5cb27357555f1368f2d1
+%global date0 20240814
 %endif
 
 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
@@ -26,11 +30,8 @@ Release:        %autorelease
 
 URL:            https://github.com/google/%{upstream_name}
 Source0:        %{url}/archive/%{commit0}/%{name}-%{shortcommit0}.tar.gz
-%if %{with gitcommit}
-%else
 # https://github.com/google/XNNPACK/pull/6144
 Patch0:         0001-Fix-cmake-for-pthread-and-cpuinfo-with-USE_SYSTEM_LI.patch
-%endif
 
 ExclusiveArch:  x86_64 aarch64
 
@@ -61,15 +62,8 @@ Requires:       %{name}%{?_isa} = %{version}-%{release}
 %prep
 %autosetup -p1 -n %{upstream_name}-%{commit0}
 
-%if %{with gitcommit}
-%else
-# On RHEL 9, gcc 11, there is this error
-# /tmp/ccnF75eP.s:120: Error: unsupported instruction `vpdpbusd'
-sed -i 's@IF(CMAKE_C_COMPILER_VERSION VERSION_LESS "11")@IF(CMAKE_C_COMPILER_VERSION VERSION_LESS "13")@' CMakeLists.txt
 # version of the *.so
-echo "SET_TARGET_PROPERTIES(XNNPACK PROPERTIES SOVERSION \"24.02.29\")" >> CMakeLists.txt
-
-%endif
+echo "SET_TARGET_PROPERTIES(XNNPACK PROPERTIES SOVERSION \"24.08.14\")" >> CMakeLists.txt
 
 %build
 %cmake -G Ninja \
@@ -79,6 +73,7 @@ echo "SET_TARGET_PROPERTIES(XNNPACK PROPERTIES SOVERSION \"24.02.29\")" >> CMake
       -DXNNPACK_BUILD_BENCHMARKS=OFF \
       -DXNNPACK_BUILD_LIBRARY=ON \
       -DXNNPACK_BUILD_TESTS=OFF \
+      -DXNNPACK_ENABLE_KLEIDIAI=OFF \
       -DXNNPACK_USE_SYSTEM_LIBS=ON \
       -DXNNPACK_LIBRARY_TYPE=shared
 
@@ -88,13 +83,10 @@ echo "SET_TARGET_PROPERTIES(XNNPACK PROPERTIES SOVERSION \"24.02.29\")" >> CMake
 mkdir -p %{buildroot}%{_includedir}
 install -p -m 644 include/xnnpack.h %{buildroot}%{_includedir}
 mkdir -p %{buildroot}%{_libdir}
-%if %{with gitcommit}
-%else
-strip libXNNPACK.so.24.02.29
-install -p -m 755 libXNNPACK.so.24.02.29 %{buildroot}%{_libdir}
+strip libXNNPACK.so.24.08.14
+install -p -m 755 libXNNPACK.so.24.08.14 %{buildroot}%{_libdir}
 cd %{buildroot}%{_libdir}
-ln -s libXNNPACK.so.24.02.29 libXNNPACK.so
-%endif
+ln -s libXNNPACK.so.24.08.14 libXNNPACK.so
 
 # building tests or benchmarks is broken
 # % check
@@ -110,17 +102,4 @@ ln -s libXNNPACK.so.24.02.29 libXNNPACK.so
 %{_libdir}/libXNNPACK.so
 
 %changelog
-* Sun Mar 10 2024 Tom Rix <trix@redhat.com> - 0.0^git20240229.fcbf55a-1
-- Update
-
-* Tue Jan 30 2024 Tom Rix <trix@redhat.com> - 0.0^git20221221.51a9875-4
-- Fix arm build
-
-* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.0^git20221221.51a9875-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Tue Oct 10 2023 Tom Rix <trix@redhat.com> - 0.0^git20221221.51a9875-2
-- Address review comments
-
-* Thu Oct 5 2023 Tom Rix <trix@redhat.com> - 0.0^git20221221.51a9875-1
-- Initial package
+%autochangelog