public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: gbcox <gbcox@bzb.us>
To: git-commits@fedoraproject.org
Subject: [rpms/yubikey-manager] epel10.2: Change to upstream patch - rhbz#2009934
Date: Fri, 21 Aug 2026 14:27:55 GMT	[thread overview]
Message-ID: <178732247553.1.42578282401092820.rpms-yubikey-manager-e6e3af1995fe@fedoraproject.org> (raw)

            A new commit has been pushed.

            Repo   : rpms/yubikey-manager
            Branch : epel10.2
            Commit : e6e3af1995fe1c2ccc7963ab8c6a8ced309211f2
            Author : gbcox <gbcox@bzb.us>
            Date   : 2021-10-06T15:25:56-07:00
            Stats  : +8/-33 in 5 file(s)
            URL    : https://src.fedoraproject.org/rpms/yubikey-manager/c/e6e3af1995fe1c2ccc7963ab8c6a8ced309211f2?branch=epel10.2

            Log:
            Change to upstream patch - rhbz#2009934

Removed site-packages patch, incorporated into upstream

---
diff --git a/.gitignore b/.gitignore
index 4a8bcc3..f9584b4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,4 @@
 /yubikey-manager-7e4c752eb96be54c23efd07453bdf2b9a50fc926.tar.gz
 /yubikey-manager-95afc8c31fef0110f8c93751afed9e4c1b29a0da.tar.gz
 /yubikey-manager-bf45dadd33fbe67f6fc0ce57057debced6830ee2.tar.gz
+/yubikey-manager-9f342bc1501f7d6d5581166fbf9a2ab5fef6e556.tar.gz

diff --git a/do-not-install-docs-to-site-packages.patch b/do-not-install-docs-to-site-packages.patch
deleted file mode 100644
index db8fa38..0000000
--- a/do-not-install-docs-to-site-packages.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/pyproject.toml b/pyproject.toml
-index b6b9d64..77125ee 100644
---- a/pyproject.toml
-+++ b/pyproject.toml
-@@ -14,9 +14,6 @@ classifiers = [
-   "Topic :: Utilities"
- ]
- include = [
--  "COPYING",
--  "NEWS",
--  "README.adoc",
-   "man/",
-   "tests/",
- ]

diff --git a/rhbz-2009934.patch b/rhbz-2009934.patch
deleted file mode 100644
index 6b387ab..0000000
--- a/rhbz-2009934.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN yubikey-manager-bf45dadd33fbe67f6fc0ce57057debced6830ee2-orig/pyproject.toml yubikey-manager-bf45dadd33fbe67f6fc0ce57057debced6830ee2/pyproject.toml
---- yubikey-manager-bf45dadd33fbe67f6fc0ce57057debced6830ee2-orig/pyproject.toml	2021-09-08 03:54:37.000000000 -0700
-+++ yubikey-manager-bf45dadd33fbe67f6fc0ce57057debced6830ee2/pyproject.toml	2021-10-04 15:08:27.023397539 -0700
-@@ -29,7 +29,7 @@
- [tool.poetry.dependencies]
- python = "^3.6"
- dataclasses = {version = "^0.8", python = "<3.7"}
--cryptography = "^2.1 || ^3.0"
-+cryptography = "^35"
- pyOpenSSL = {version = ">=0.15.1", optional = true}
- pyscard = "^1.9 || ^2.0"
- fido2 = ">=0.9, <1.0"

diff --git a/sources b/sources
index 56e69ad..ef21d6d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (yubikey-manager-bf45dadd33fbe67f6fc0ce57057debced6830ee2.tar.gz) = 2a0f20fd9f944ddfe8d02e1aa917a79d351807057f0580d600e4d4291942528d960d4e52e69895f15fe87f09977b23bff75ab1c0d1645770ebc6730f1360402e
+SHA512 (yubikey-manager-9f342bc1501f7d6d5581166fbf9a2ab5fef6e556.tar.gz) = 1e37e0e853588f367e6cce0c6c8d13cba64f2dfaf8a1915e54cc0dff8da547b7a0f7b70652498ed4bad6bbac222607828476b0c815e85778220a06c353afc96a

diff --git a/yubikey-manager.spec b/yubikey-manager.spec
index e113ee8..653ff17 100644
--- a/yubikey-manager.spec
+++ b/yubikey-manager.spec
@@ -1,21 +1,17 @@
 %global forgeurl https://github.com/Yubico/yubikey-manager/
-%global commit bf45dadd33fbe67f6fc0ce57057debced6830ee2
+%global commit 9f342bc1501f7d6d5581166fbf9a2ab5fef6e556
 
 Name:           yubikey-manager
 Version:        4.0.7
 
 %forgemeta
 
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Python library and command line tool for configuring a YubiKey
 License:        BSD
 URL:            %{forgeurl}
 Source0:        %{forgesource}
 Source1:        %{name}.rpmlintrc
-Patch0:         rhbz-2009934.patch
-
-# https://github.com/Yubico/yubikey-manager/issues/456
-Patch1:         do-not-install-docs-to-site-packages.patch
 
 BuildArch:      noarch
 BuildRequires:  swig pcsc-lite-devel ykpers pyproject-rpm-macros
@@ -63,6 +59,10 @@ Python library for configuring a YubiKey.
 %{_bindir}/ykman
 
 %changelog
+* Wed Oct 06 2021 Gerald Cox <gbcox@member.fsf.org> - 4.0.7-5
+- Change to upstream patch - rhbz#2009934
+- Removed site-packages patch, incorporated into upstream
+
 * Mon Oct 04 2021 Gerald Cox <gbcox@member.fsf.org> - 4.0.7-4
 - rhbz#2009934
 

                 reply	other threads:[~2026-08-21 14:27 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=178732247553.1.42578282401092820.rpms-yubikey-manager-e6e3af1995fe@fedoraproject.org \
    --to=gbcox@bzb.us \
    --cc=git-commits@fedoraproject.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox