From a503376ec250f8246ee51976811d1d9299547d81 Mon Sep 17 00:00:00 2001
From: Kate Hsuan <hpa@redhat.com>
Date: Mon, 19 Jan 2026 13:01:19 +0800
Subject: [PATCH] Update to 1.0.29 and migrate to tmt test

1. Update to the upstream version 1.0.29
2. Migrate to the tmt test

Resolves: RHEL-116687
---
 .fmf/version                   |  1 +
 .gitignore                     |  1 +
 libusb1.spec                   |  4 +---
 plans/integration.fmf          | 11 +++++++++++
 sources                        |  2 +-
 tests/integration/main.fmf     |  3 +++
 tests/{ => integration}/run.sh |  4 ++--
 tests/tests.yml                | 13 -------------
 8 files changed, 20 insertions(+), 19 deletions(-)
 create mode 100644 .fmf/version
 create mode 100644 plans/integration.fmf
 create mode 100644 tests/integration/main.fmf
 rename tests/{ => integration}/run.sh (98%)
 delete mode 100644 tests/tests.yml

diff --git a/.fmf/version b/.fmf/version
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/.fmf/version
@@ -0,0 +1 @@
+1
diff --git a/.gitignore b/.gitignore
index e118dbe..867e1d5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 /libusb-1.0.26.tar.bz2
 /libusb-1.0.27.tar.bz2
 /libusb-1.0.28.tar.bz2
+/libusb-1.0.29.tar.bz2
diff --git a/libusb1.spec b/libusb1.spec
index 7933b0e..dd1b155 100644
--- a/libusb1.spec
+++ b/libusb1.spec
@@ -1,6 +1,6 @@
 Summary:        Library for accessing USB devices
 Name:           libusb1
-Version:        1.0.28
+Version:        1.0.29
 Release:        %autorelease
 Source0:        https://github.com/libusb/libusb/releases/download/v%{version}/libusb-%{version}.tar.bz2
 License:        LGPL-2.1-or-later
@@ -61,11 +61,9 @@ This package contains tests and examples for %{name}.
 chmod -x examples/*.c
 mkdir -p m4
 sed -i '/AM_LDFLAGS = -static/d' tests/Makefile.am
-%if 0%{?rhel} < 11
 aclocal
 autoconf
 automake --add-missing
-%endif
 
 
 %build
diff --git a/plans/integration.fmf b/plans/integration.fmf
new file mode 100644
index 0000000..acd5262
--- /dev/null
+++ b/plans/integration.fmf
@@ -0,0 +1,11 @@
+summary: Basic libusb test
+discover:
+    how: fmf
+prepare:
+  - name: packages
+    how: install
+    package:
+        - glibc-common
+        - libusb1-tests-examples
+execute:
+    how: tmt
diff --git a/sources b/sources
index 6ba27ac..2419f3d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (libusb-1.0.28.tar.bz2) = 0f4efa6b54e6195d2e5446652c2dc07358583e205d63bf438c4409511b8637d1700a71268c40499755747827d23cc730d9122267386f847bf781993c045c519f
+SHA512 (libusb-1.0.29.tar.bz2) = 04f8bda8197c9ecf52709609b8fbfea762fd82ddb5cde153a7630b0e8ed557d42da8cbc44f2f593aa22fdd0762e16716300565d67adb0c5240d7f3723321f690
diff --git a/tests/integration/main.fmf b/tests/integration/main.fmf
new file mode 100644
index 0000000..3716652
--- /dev/null
+++ b/tests/integration/main.fmf
@@ -0,0 +1,3 @@
+summary:
+    Test for libusb1
+test: bash ./run.sh
diff --git a/tests/run.sh b/tests/integration/run.sh
similarity index 98%
rename from tests/run.sh
rename to tests/integration/run.sh
index 36c9ae3..c342b67 100644
--- a/tests/run.sh
+++ b/tests/integration/run.sh
@@ -1,9 +1,9 @@
 #!/bin/sh
-
 set -e
-
+ 
 ldd /usr/bin/libusb-test-stress
 /usr/bin/libusb-test-stress
 /usr/bin/libusb-test-umockdev
 /usr/bin/libusb-test-libusb
 /usr/bin/libusb-example-listdevs
+
diff --git a/tests/tests.yml b/tests/tests.yml
deleted file mode 100644
index 57b120c..0000000
--- a/tests/tests.yml
+++ /dev/null
@@ -1,13 +0,0 @@
----
-- hosts: localhost
-  roles:
-  # Running these tests does not require the sources
-  - role: standard-test-basic
-    tags:
-    - atomic
-    - classic
-    tests:
-    - test:
-        dir: .
-        run: run.sh
-