From 76e8c35d4400bdef63c1650a33771c49fee60cf9 Mon Sep 17 00:00:00 2001
From: Fabio Valentini <decathorpe@gmail.com>
Date: Dec 01 2023 23:59:42 +0000
Subject: Update to version 6.1.1; Fixes RHBZ#2207808


---

diff --git a/.gitignore b/.gitignore
index 01f9b79..6b666fd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
 /notify-4.0.17.crate
 /notify-5.1.0.crate
 /notify-5.2.0.crate
+/notify-6.1.1.crate
diff --git a/notify-fix-metadata-auto.diff b/notify-fix-metadata-auto.diff
index 324c753..37acb47 100644
--- a/notify-fix-metadata-auto.diff
+++ b/notify-fix-metadata-auto.diff
@@ -1,6 +1,6 @@
---- notify-5.2.0/Cargo.toml	1970-01-01T00:00:01+00:00
-+++ notify-5.2.0/Cargo.toml	2023-07-30T19:54:00.762090+00:00
-@@ -68,20 +68,11 @@
+--- notify-6.1.1/Cargo.toml	1970-01-01T00:00:01+00:00
++++ notify-6.1.1/Cargo.toml	2023-12-01T23:52:44.646322+00:00
+@@ -69,20 +69,12 @@
      "macos_fsevent",
      "crossbeam-channel",
  ]
@@ -8,7 +8,7 @@
 +macos_fsevent = []
  macos_kqueue = [
 -    "kqueue",
--    "mio",
+     "mio",
  ]
  manual_tests = []
  timing_tests = []
@@ -22,10 +22,13 @@
  
  [target."cfg(any(target_os=\"linux\", target_os=\"android\"))".dependencies.inotify]
  version = "0.9"
-@@ -91,26 +82,3 @@
+@@ -92,29 +84,3 @@
  version = "0.8"
  features = ["os-ext"]
  
+-[target."cfg(target_os=\"macos\")".dependencies.bitflags]
+-version = "2.3.0"
+-
 -[target."cfg(target_os=\"macos\")".dependencies.fsevent-sys]
 -version = "4"
 -optional = true
@@ -40,7 +43,7 @@
 -optional = true
 -
 -[target."cfg(windows)".dependencies.windows-sys]
--version = "0.45.0"
+-version = "0.48.0"
 -features = [
 -    "Win32_System_Threading",
 -    "Win32_Foundation",
diff --git a/notify-fix-metadata.diff b/notify-fix-metadata.diff
index 9110b5d..b71a20b 100644
--- a/notify-fix-metadata.diff
+++ b/notify-fix-metadata.diff
@@ -1,15 +1,6 @@
---- notify-5.2.0/Cargo.toml	1970-01-01T00:00:01+00:00
-+++ notify-5.2.0/Cargo.toml	2023-07-30T19:54:27.067207+00:00
-@@ -29,7 +29,7 @@
-     "watch",
- ]
- categories = ["filesystem"]
--license = "CC0-1.0 OR Artistic-2.0"
-+license = "CC0-1.0"
- repository = "https://github.com/notify-rs/notify.git"
- resolver = "1"
- 
-@@ -64,13 +64,7 @@
+--- notify-6.1.1/Cargo.toml	1970-01-01T00:00:01+00:00
++++ notify-6.1.1/Cargo.toml	2023-12-01T23:53:26.299516+00:00
+@@ -65,14 +65,7 @@
  version = "3.2.0"
  
  [features]
@@ -19,6 +10,7 @@
 -]
 -macos_fsevent = []
 -macos_kqueue = [
+-    "mio",
 -]
 +default = ["crossbeam-channel"]
  manual_tests = []
diff --git a/rust-notify.spec b/rust-notify.spec
index f98cf1f..5c37e32 100644
--- a/rust-notify.spec
+++ b/rust-notify.spec
@@ -1,32 +1,24 @@
-# Generated by rust2rpm 24
+# Generated by rust2rpm 25
 %bcond_without check
 %global debug_package %{nil}
 
 %global crate notify
 
 Name:           rust-notify
-Version:        5.2.0
+Version:        6.1.1
 Release:        %autorelease
 Summary:        Cross-platform filesystem notification library
 
-# * license in crate metadata is misleading:
-#   - old code is covered by the CC0-1.0 license,
-#   - new code is dual-licensed under CC0-1.0 or (non-standard) Artistic-2.0
-# * choose to use this project under only the CC0-1.0 license due to the unusual
-#   and non-standard "choice of venue" clause that was attached to the
-#   Artistic-2.0 license text by upstream
-# https://github.com/notify-rs/notify/issues/514
 License:        CC0-1.0
 URL:            https://crates.io/crates/notify
 Source:         %{crates_source}
-# Automatically generated patch to strip foreign dependencies
+# Automatically generated patch to strip dependencies and normalize metadata
 Patch:          notify-fix-metadata-auto.diff
 # Manually created patch for downstream crate metadata changes
-# * update license in crate metadata
 # * remove macOS-specific features
 Patch:          notify-fix-metadata.diff
 
-BuildRequires:  rust-packaging >= 21
+BuildRequires:  cargo-rpm-macros >= 24
 
 %global _description %{expand:
 Cross-platform filesystem notification library.}
@@ -43,8 +35,7 @@ This package contains library source intended for building other packages which
 use the "%{crate}" crate.
 
 %files          devel
-%license %{crate_instdir}/LICENSE
-%license %{crate_instdir}/LICENSE.ARTISTIC
+%license %{crate_instdir}/LICENSE-CC0
 %doc %{crate_instdir}/README.md
 %{crate_instdir}/
 
@@ -109,7 +100,7 @@ use the "timing_tests" feature of the "%{crate}" crate.
 %ghost %{crate_instdir}/Cargo.toml
 
 %prep
-%autosetup -n %{crate}-%{version_no_tilde} -p1
+%autosetup -n %{crate}-%{version} -p1
 %cargo_prep
 
 %generate_buildrequires
@@ -123,8 +114,7 @@ use the "timing_tests" feature of the "%{crate}" crate.
 
 %if %{with check}
 %check
-# Tests are not very reliable, https://github.com/passcod/notify/issues/186
-%cargo_test -- -- --skip create_directory_watch_subdirectories
+%cargo_test
 %endif
 
 %changelog
diff --git a/sources b/sources
index 13fb22d..4588e32 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (notify-5.2.0.crate) = 1b181ee6b86b0a193655e4ffc62f6fc09ea174fbe7ccc579435e5a488d84210ca01f8a941fe5bb4d7ca8560faa49394db8f2bd6169fc42b1fa93a26c278a5555
+SHA512 (notify-6.1.1.crate) = 58a44759d96c3ec7c431a37d92e1c1a0f112d75fac9651e9fead7a3a1de46074d79a251320b0522891711879da4ab42dd008c5a28a994039890f8d434d215e69