From ce0e3ed35636a408a9a9e4db586b1984acd0b4fd Mon Sep 17 00:00:00 2001
From: Scott K Logan <logans@cottsay.net>
Date: Wed, 25 Aug 2021 11:07:26 -0700
Subject: [PATCH 1/2] Update to 2.4.0

---
 .gitignore   |  1 +
 sources      |  2 +-
 uhubctl.spec | 12 +++++++-----
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index 8db3df9..6651883 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /uhubctl-2.2.0.tar.gz
+/uhubctl-2.4.0.tar.gz
diff --git a/sources b/sources
index 211b57b..b0a761a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (uhubctl-2.2.0.tar.gz) = 5fe097dd9bbf1fd4aef894683a30b70cde363f98b85347092abe04c85af38d722db89897a22895f2fe6b1b0223c8483d7f0c3d6864964b57f4394a9cbbde1f7c
+SHA512 (uhubctl-2.4.0.tar.gz) = d7f07679c4678565ce0174e1eb591263fae5629dd6fbb5aaa0321ca10176b8b2d662e75a3019caeb83aaf470c8386188848ba3095e1006451e8710b2a2c9bb1d
diff --git a/uhubctl.spec b/uhubctl.spec
index 19ab254..0c8eea8 100644
--- a/uhubctl.spec
+++ b/uhubctl.spec
@@ -1,6 +1,6 @@
 Name:           uhubctl
-Version:        2.2.0
-Release:        2%{?dist}
+Version:        2.4.0
+Release:        1%{?dist}
 Summary:        USB hub per-port power control
 
 License:        GPLv2
@@ -9,6 +9,8 @@ Source0:        https://github.com/mvp/%{name}/archive/v%{version}/%{name}-%{ver
 
 BuildRequires:  gcc
 BuildRequires:  libusbx-devel
+BuildRequires:  make
+BuildRequires:  pkgconf-pkg-config
 
 %description
 uhubctl is utility to control USB power per-port on smart USB hubs. Smart hub
@@ -18,9 +20,6 @@ is defined as one that implements per-port power switching.
 %prep
 %autosetup -p1
 
-# Ensure version doesn't have '-dev'
-echo %{version} > VERSION
-
 
 %build
 %make_build
@@ -37,6 +36,9 @@ echo %{version} > VERSION
 
 
 %changelog
+* Wed Aug 25 2021 Scott K Logan <logans@cottsay.net> - 2.4.0-1
+- Update to 2.4.0 (rhbz#1907252)
+
 * Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
 

From e5c37943aa3ae9bff803a8c4b3d9197737514a8f Mon Sep 17 00:00:00 2001
From: Scott K Logan <logans@cottsay.net>
Date: Wed, 25 Aug 2021 11:40:41 -0700
Subject: [PATCH 2/2] Switch pkg-config dep to more widely-available
 'pkgconfig'

---
 uhubctl.spec | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/uhubctl.spec b/uhubctl.spec
index 0c8eea8..658bcc8 100644
--- a/uhubctl.spec
+++ b/uhubctl.spec
@@ -1,6 +1,6 @@
 Name:           uhubctl
 Version:        2.4.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        USB hub per-port power control
 
 License:        GPLv2
@@ -10,7 +10,7 @@ Source0:        https://github.com/mvp/%{name}/archive/v%{version}/%{name}-%{ver
 BuildRequires:  gcc
 BuildRequires:  libusbx-devel
 BuildRequires:  make
-BuildRequires:  pkgconf-pkg-config
+BuildRequires:  pkgconfig
 
 %description
 uhubctl is utility to control USB power per-port on smart USB hubs. Smart hub
@@ -36,6 +36,9 @@ is defined as one that implements per-port power switching.
 
 
 %changelog
+* Wed Aug 25 2021 Scott K Logan <logans@cottsay.net> - 2.4.0-2
+- Switch pkg-config dep to more widely-available 'pkgconfig'
+
 * Wed Aug 25 2021 Scott K Logan <logans@cottsay.net> - 2.4.0-1
 - Update to 2.4.0 (rhbz#1907252)