2 changed files with 59 additions and 49 deletions
--- a/SOURCES/0001-testing-vercheck.patch
+++ b/SOURCES/0001-testing-vercheck.patch
@ -0,0 +1,36 @@
+diff --color -ur idxd-config-accel-config-v3.4.8/test/dsa_user_test_runner.sh idxd-config-accel-config-v3.4.8-new/test/dsa_user_test_runner.sh
+--- idxd-config-accel-config-v3.4.8/test/dsa_user_test_runner.sh	2022-09-21 14:16:06.000000000 -0700
+++ idxd-config-accel-config-v3.4.8-new/test/dsa_user_test_runner.sh	2022-10-06 16:36:02.838178412 -0700
+@@ -14,7 +14,7 @@
+ 
+ [ ! -f "$DSATEST" ] && echo "fail: $LINENO" && exit 1
+ 
+-check_min_kver "5.6" || do_skip "kernel does not support idxd"
+check_min_kver "4.18" || do_skip "kernel does not support idxd"
+ 
+ # skip if no pasid support as dsa_test does not support operation w/o pasid yet.
+ [ ! -f "/sys/bus/dsa/devices/$DSA/pasid_enabled" ] && echo "No SVM support" && exit "$EXIT_SKIP"
+diff --color -ur idxd-config-accel-config-v3.4.8/test/iaa_user_test_runner.sh idxd-config-accel-config-v3.4.8-new/test/iaa_user_test_runner.sh
+--- idxd-config-accel-config-v3.4.8/test/iaa_user_test_runner.sh	2022-09-21 14:16:06.000000000 -0700
+++ idxd-config-accel-config-v3.4.8-new/test/iaa_user_test_runner.sh	2022-10-06 16:35:43.989998045 -0700
+@@ -14,7 +14,7 @@
+ 
+ [ ! -f "$IAATEST" ] && echo "fail: $LINENO" && exit 1
+ 
+-check_min_kver "5.6" || do_skip "kernel does not support idxd"
+check_min_kver "4.18" || do_skip "kernel does not support idxd"
+ 
+ # skip if no pasid support as iaa_test does not support operation w/o pasid yet.
+ [ ! -f "/sys/bus/dsa/devices/$IAA/pasid_enabled" ] && echo "No SVM support" && exit "$EXIT_SKIP"
+diff --color -ur idxd-config-accel-config-v3.4.8/test/libaccfg.c idxd-config-accel-config-v3.4.8-new/test/libaccfg.c
+--- idxd-config-accel-config-v3.4.8/test/libaccfg.c	2022-09-21 14:16:06.000000000 -0700
+++ idxd-config-accel-config-v3.4.8-new/test/libaccfg.c	2022-10-06 16:36:31.090448787 -0700
+@@ -966,7 +966,7 @@
+ 	struct accfg_device *device;
+ 	struct log_ctx log_ctx;
+ 
+-	if (!accfg_test_attempt(test, KERNEL_VERSION(5, 6, 0)))
+	if (!accfg_test_attempt(test, KERNEL_VERSION(4, 18, 0)))
+ 		return EXIT_SKIP;
+ 
+ 	accfg_set_log_priority(ctx, loglevel);
--- a/SPECS/accel-config.spec
+++ b/SPECS/accel-config.spec
@ -2,14 +2,15 @@

 Name:		accel-config
 Version:	3.5.3
-Release:	2%{?dist}
+Release:	1%{?dist}
 Summary:	Configure accelerator subsystem devices
 # The entire source code is under GPLv2 except for accel-config
-# library which is mostly LGPLv2.1, ccan/list which is BSD-MIT and
+# library which is mostly LGPLv2, ccan/list which is BSD-MIT and
 # the rest of ccan which is CC0.
 License:	GPLv2 and LGPLv2+ and MIT and CC0
 URL:		https://github.com/intel/%{project_name}
 Source0:	%{URL}/archive/%{name}-v%{version}.tar.gz
+Patch0: 0001-testing-vercheck.patch

 Requires:	%{name}-libs%{?_isa} = %{version}-%{release}
 BuildRequires:	gcc
@ -25,10 +26,9 @@ BuildRequires:	pkgconfig(json-c)
 BuildRequires:	pkgconfig(libudev)
 BuildRequires:	pkgconfig(zlib)
 BuildRequires:	systemd
-BuildRequires:	make

 # accel-config is for configuring Intel DSA (Data-Streaming
-# Accelerator) subsystem in the Linux kernel. It supports x86_64 only.
+# Accelerator) subsystem in the Linux kernel. It supports x86 only.
 ExclusiveArch:	%{ix86} x86_64

 %description
@ -46,7 +46,7 @@ developing applications that use %{name}.

 %package libs
 Summary:	Configuration library for accelerator subsystem devices
-# All source code of configuration library is LGPLv2.1, except
+# All source code of configuration library is LGPLv2, except
 # ccan/list which is BSD-MIT and the rest of ccan/ which is CC0.
 License:	LGPLv2+ and MIT and CC0
 Requires:	%{name}%{?_isa} = %{version}-%{release}
@ -88,7 +88,7 @@ make check
 %files libs
 %doc README.md
 %license Documentation/COPYING licenses/BSD-MIT licenses/CC0
-%license licenses/accel-config-licenses accfg/lib/LICENSE_LGPL_2_1
+%license licenses/libaccel-config-licenses accfg/lib/LICENSE_LGPL_2_1
 %{_libdir}/lib%{name}.so.*

 %files devel
@ -99,59 +99,33 @@ make check

 %files test
 %license Documentation/COPYING LICENSE_GPL_2_0
-%doc test/README.md
+#%doc test/README.md
 %{_libexecdir}/accel-config/test/*

 %changelog
-* Tue Apr 18 2023 Jerry Snitselaar <jsnitsel@redhat.com> - 3.5.3-2
- Remove spec file variable that blocked debuginfo build
-Resolves: rhz#2153899
-
 * Tue Apr 18 2023 Jerry Snitselaar <jsnitsel@redhat.com> - 3.5.3-1
- Rebase to the 3.5.3 release.
-Resolves: rhbz#2153899
+- Rebase to 3.5.3 release.
+resolves: rhbz#2153898
+
+* Sun Oct 16 2022 Jerry Snitselaar <jsnitsel@redhat.com> - 3.5.0-1
+- Rebase to the 3.5.0 release.
+resolves: rhbz#2101608

-* Tue Oct 04 2022 Jerry Snitselaar <jsnitsel@redhat.com> - 3.5.0-1
- Rebase to 3.5.0 release.
-Resolves: rhbz#2101609
+* Thu Oct 06 2022 Jerry Snitselaar <jsnitsel@redhat.com> - 3.4.8-1
+- Rebase to 3.4.8 release.
+resolves: rhbz#2101608

 * Sun Apr 03 2022 Jerry Snitselaar <jsnitsel@redhat.com> - 3.4.6.3-1
 - Rebase to 3.4.6.3 release.
-Resolves: rhbz#2040077
-
-* Fri Feb 11 2022 Jerry Snitselaar <jsnitsel@redhat.com> - 3.4.2-2
- Rebuild to clear osci test failure.
-Resolves: rhbz#1999934
-
-* Tue Oct 05 2021 Jerry Snitselaar <jsnitsel@redhat.com> - 3.4.2-1
- Rebase to 3.4.2 release and add test subpackage.
-Resolves: rhbz#1999934
-
-* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 3.2-3
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-  Related: rhbz#1991688
-
-* Fri Jul 02 2021 Jerry Snitselaar <jsnitsel@redhat.com> - 3.2-2
- Fix product version for gating.
-Resolves: rhbz#1921368
-
-* Mon Jun 21 2021 Jerry Snitselaar <jsnitsel@redhat.com> - 3.2-1
- Rebase to 3.2 release. Related: rhbz#1921368
-
-* Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 3.1-2
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
-
-* Mon Mar 29 2021 Yunying Sun <yunying.sun@intel.com> - 3.1-1
- Added ix86 support back as 3.1 release fixed it
- Updated to 3.1 release
+resolves: rhbz#2040076

-* Thu Feb 18 2021 Yunying Sun <yunying.sun@intel.com> - 3.0.1-1
- Updated to 3.0.1 release
- Removed ix86 support as so far it supports x86_64 only
- Updated licenses following upstream
+* Thu Sep 09 2021 Jerry Snitselaar <jsnitsel@redhat.com> - 3.4.2-1
+- Rebase to 3.4.2 and add test subpackage.
+resolves: rhbz#1971910

-* Mon Jan 25 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.8-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+* Tue May 18 2021 Jerry Snitselaar <jsnitsel@redhat.com> - 3.1-1
+- Rebase to 3.1 release.
+resolves: rhbz#1920762

 * Fri Nov 6 2020 Yunying Sun <yunying.sun@intel.com> - 2.8-1
 - Initial Packaging