decathorpe pushed to rpms/rust-gptman (f38). "Update to version
1.0.2; Fixes RHBZ#2233075"
by notificationsï¼ fedoraproject.org
Notification time stamped 2023-08-31 23:58:08 UTC
From 7067b3db4f15911a166b3f150da68bb41fae3e3f Mon Sep 17 00:00:00 2001
From: Fabio Valentini <decathorpe(a)gmail.com>
Date: Aug 31 2023 22:33:11 +0000
Subject: Update to version 1.0.2; Fixes RHBZ#2233075
---
diff --git a/.gitignore b/.gitignore
index 8838303..20fea88 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
/gptman-0.8.3.crate
/gptman-0.8.4.crate
/gptman-1.0.1.crate
+/gptman-1.0.2.crate
diff --git a/README.md b/README.md
deleted file mode 100644
index 9d80a07..0000000
--- a/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# rust-gptman
-
-GPT manager that allows you to copy partitions from one disk to another
\ No newline at end of file
diff --git a/gptman-fix-metadata.diff b/gptman-fix-metadata.diff
index 80c9b6d..5d1a915 100644
--- a/gptman-fix-metadata.diff
+++ b/gptman-fix-metadata.diff
@@ -1,6 +1,6 @@
---- gptman-1.0.1/Cargo.toml 1970-01-01T00:00:01+00:00
-+++ gptman-1.0.1/Cargo.toml 2023-07-28T04:32:45.803883+00:00
-@@ -39,49 +39,11 @@
+--- gptman-1.0.2/Cargo.toml 1970-01-01T00:00:01+00:00
++++ gptman-1.0.2/Cargo.toml 2023-08-31T22:31:09.528028+00:00
+@@ -40,49 +40,11 @@
[lib]
name = "gptman"
@@ -18,7 +18,7 @@
version = "1.3.1"
-[dependencies.clap]
--version = ">= 3, < 5"
+-version = "4"
-features = [
- "derive",
- "wrap_help",
@@ -50,7 +50,7 @@
[dependencies.serde]
version = "1.0.116"
-@@ -90,21 +52,5 @@
+@@ -91,21 +53,7 @@
[dependencies.thiserror]
version = "1.0"
@@ -58,7 +58,7 @@
-version = "0.1.8"
-optional = true
-
--[features]
+ [features]
-cli = [
- "lazy_static",
- "ansi_term",
@@ -69,6 +69,6 @@
- "clap",
- "count-zeroes",
-]
--
+ default = ["nix"]
+
[target."cfg(target_os = \"linux\")".dependencies.nix]
- version = ">= 0.22, < 0.27"
diff --git a/rust-gptman.spec b/rust-gptman.spec
index 6b10420..e987739 100644
--- a/rust-gptman.spec
+++ b/rust-gptman.spec
@@ -5,7 +5,7 @@
%global crate gptman
Name: rust-gptman
-Version: 1.0.1
+Version: 1.0.2
Release: %autorelease
Summary: GPT manager that allows you to copy partitions from one disk to another
@@ -51,6 +51,18 @@ use the "default" feature of the "%{crate}" crate.
%files -n %{name}+default-devel
%ghost %{crate_instdir}/Cargo.toml
+%package -n %{name}+nix-devel
+Summary: %{summary}
+BuildArch: noarch
+
+%description -n %{name}+nix-devel %{_description}
+
+This package contains library source intended for building other packages which
+use the "nix" feature of the "%{crate}" crate.
+
+%files -n %{name}+nix-devel
+%ghost %{crate_instdir}/Cargo.toml
+
%prep
%autosetup -n %{crate}-%{version_no_tilde} -p1
%cargo_prep
diff --git a/sources b/sources
index c6518ff..cd934ed 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (gptman-1.0.1.crate) = 793e7891e367cb279298fb74b25ce8e4dd94c27f9ba7b25fe0c3fc81f3215220d47fc68f01a81eba591dcaa1eab66f4dd8fa14d1ecc25a01a97047c93acf7b4b
+SHA512 (gptman-1.0.2.crate) = 2236243b2fc1aa8e67bb94fa2225e5e2babeaace1219d283635ef7903a089b0c3cad96a33680268657fe661ed6fc5f1ab3165c3a02e05d97c5f64595b078c8c3
https://src.fedoraproject.org/rpms/rust-gptman/c/7067b3db4f15911a166b3f15...
3Â months, 1Â week
sergiomb pushed to rpms/fakeroot (f39). "Update fakeroot to 1.32.1"
by notificationsï¼ fedoraproject.org
Notification time stamped 2023-08-31 23:57:02 UTC
From f961598b2460132af69b8c7c54a7841bd4aade47 Mon Sep 17 00:00:00 2001
From: Sérgio M. Basto <sergio(a)serjux.com>
Date: Aug 31 2023 23:54:40 +0000
Subject: Update fakeroot to 1.32.1
---
diff --git a/.gitignore b/.gitignore
index a90a39f..17c9610 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@
/fakeroot_1.29.orig.tar.gz
/fakeroot_1.30.1.orig.tar.gz
/fakeroot_1.31.orig.tar.gz
+/fakeroot_1.32.1.orig.tar.gz
diff --git a/fakeroot.spec b/fakeroot.spec
index 50038d4..7eed9bb 100644
--- a/fakeroot.spec
+++ b/fakeroot.spec
@@ -2,8 +2,8 @@
Summary: Gives a fake root environment
Name: fakeroot
-Version: 1.31
-Release: 2%{?dist}
+Version: 1.32.1
+Release: 1%{?dist}
# setenv.c: LGPLv2+
# contrib/Fakeroot-Stat-1.8.8: Perl (GPL+ or Artistic)
# the rest: GPLv3+
@@ -19,8 +19,6 @@ Patch2: debian_fix-shell-in-fakeroot.patch
# Fix LD_LIBRARY_PATH for multilib: https://bugzilla.redhat.com/show_bug.cgi?id=1241527
Patch5: fakeroot-multilib.patch
# Patch7: relax_tartest.patch
-# Fix from Debian for i686
-Patch8: compile-time64-wraps-with-D_TIME_BITS-64.patch
BuildRequires: make
@@ -167,6 +165,9 @@ fi
%ghost %{_libdir}/libfakeroot/libfakeroot-0.so
%changelog
+* Thu Aug 31 2023 Sérgio Basto <sergio(a)serjux.com> - 1.32.1-1
+- Update fakeroot to 1.32.1
+
* Wed Jul 19 2023 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.31-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
diff --git a/sources b/sources
index 92363cd..68f8b5e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (fakeroot_1.31.orig.tar.gz) = a66a3535c2088ba8c33e3afc18d2ab1a16a502b999a4efbea7542e345181aa172af2e0949989832cda69bf6753c80a4bfc12cc283f5da11de31aa0bee0e8b47b
+SHA512 (fakeroot_1.32.1.orig.tar.gz) = fe8263ca9b90e4df253311e5331721a8783260a1058b307d10ffbde47724fc24df584806b17af4477be47d90dc553abe6a476e02cf8ce2aebdd94357ff7d7f09
https://src.fedoraproject.org/rpms/fakeroot/c/f961598b2460132af69b8c7c54a...
3Â months, 1Â week
sergiomb pushed to rpms/fakeroot (rawhide). "Update fakeroot to 1.32.1"
by notificationsï¼ fedoraproject.org
Notification time stamped 2023-08-31 23:55:02 UTC
From f961598b2460132af69b8c7c54a7841bd4aade47 Mon Sep 17 00:00:00 2001
From: Sérgio M. Basto <sergio(a)serjux.com>
Date: Aug 31 2023 23:54:40 +0000
Subject: Update fakeroot to 1.32.1
---
diff --git a/.gitignore b/.gitignore
index a90a39f..17c9610 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@
/fakeroot_1.29.orig.tar.gz
/fakeroot_1.30.1.orig.tar.gz
/fakeroot_1.31.orig.tar.gz
+/fakeroot_1.32.1.orig.tar.gz
diff --git a/fakeroot.spec b/fakeroot.spec
index 50038d4..7eed9bb 100644
--- a/fakeroot.spec
+++ b/fakeroot.spec
@@ -2,8 +2,8 @@
Summary: Gives a fake root environment
Name: fakeroot
-Version: 1.31
-Release: 2%{?dist}
+Version: 1.32.1
+Release: 1%{?dist}
# setenv.c: LGPLv2+
# contrib/Fakeroot-Stat-1.8.8: Perl (GPL+ or Artistic)
# the rest: GPLv3+
@@ -19,8 +19,6 @@ Patch2: debian_fix-shell-in-fakeroot.patch
# Fix LD_LIBRARY_PATH for multilib: https://bugzilla.redhat.com/show_bug.cgi?id=1241527
Patch5: fakeroot-multilib.patch
# Patch7: relax_tartest.patch
-# Fix from Debian for i686
-Patch8: compile-time64-wraps-with-D_TIME_BITS-64.patch
BuildRequires: make
@@ -167,6 +165,9 @@ fi
%ghost %{_libdir}/libfakeroot/libfakeroot-0.so
%changelog
+* Thu Aug 31 2023 Sérgio Basto <sergio(a)serjux.com> - 1.32.1-1
+- Update fakeroot to 1.32.1
+
* Wed Jul 19 2023 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.31-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
diff --git a/sources b/sources
index 92363cd..68f8b5e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (fakeroot_1.31.orig.tar.gz) = a66a3535c2088ba8c33e3afc18d2ab1a16a502b999a4efbea7542e345181aa172af2e0949989832cda69bf6753c80a4bfc12cc283f5da11de31aa0bee0e8b47b
+SHA512 (fakeroot_1.32.1.orig.tar.gz) = fe8263ca9b90e4df253311e5331721a8783260a1058b307d10ffbde47724fc24df584806b17af4477be47d90dc553abe6a476e02cf8ce2aebdd94357ff7d7f09
https://src.fedoraproject.org/rpms/fakeroot/c/f961598b2460132af69b8c7c54a...
3Â months, 1Â week
decathorpe pushed to rpms/rust-gptman (f39). "Update to version
1.0.2; Fixes RHBZ#2233075"
by notificationsï¼ fedoraproject.org
Notification time stamped 2023-08-31 23:47:31 UTC
From 7067b3db4f15911a166b3f150da68bb41fae3e3f Mon Sep 17 00:00:00 2001
From: Fabio Valentini <decathorpe(a)gmail.com>
Date: Aug 31 2023 22:33:11 +0000
Subject: Update to version 1.0.2; Fixes RHBZ#2233075
---
diff --git a/.gitignore b/.gitignore
index 8838303..20fea88 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
/gptman-0.8.3.crate
/gptman-0.8.4.crate
/gptman-1.0.1.crate
+/gptman-1.0.2.crate
diff --git a/README.md b/README.md
deleted file mode 100644
index 9d80a07..0000000
--- a/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# rust-gptman
-
-GPT manager that allows you to copy partitions from one disk to another
\ No newline at end of file
diff --git a/gptman-fix-metadata.diff b/gptman-fix-metadata.diff
index 80c9b6d..5d1a915 100644
--- a/gptman-fix-metadata.diff
+++ b/gptman-fix-metadata.diff
@@ -1,6 +1,6 @@
---- gptman-1.0.1/Cargo.toml 1970-01-01T00:00:01+00:00
-+++ gptman-1.0.1/Cargo.toml 2023-07-28T04:32:45.803883+00:00
-@@ -39,49 +39,11 @@
+--- gptman-1.0.2/Cargo.toml 1970-01-01T00:00:01+00:00
++++ gptman-1.0.2/Cargo.toml 2023-08-31T22:31:09.528028+00:00
+@@ -40,49 +40,11 @@
[lib]
name = "gptman"
@@ -18,7 +18,7 @@
version = "1.3.1"
-[dependencies.clap]
--version = ">= 3, < 5"
+-version = "4"
-features = [
- "derive",
- "wrap_help",
@@ -50,7 +50,7 @@
[dependencies.serde]
version = "1.0.116"
-@@ -90,21 +52,5 @@
+@@ -91,21 +53,7 @@
[dependencies.thiserror]
version = "1.0"
@@ -58,7 +58,7 @@
-version = "0.1.8"
-optional = true
-
--[features]
+ [features]
-cli = [
- "lazy_static",
- "ansi_term",
@@ -69,6 +69,6 @@
- "clap",
- "count-zeroes",
-]
--
+ default = ["nix"]
+
[target."cfg(target_os = \"linux\")".dependencies.nix]
- version = ">= 0.22, < 0.27"
diff --git a/rust-gptman.spec b/rust-gptman.spec
index 6b10420..e987739 100644
--- a/rust-gptman.spec
+++ b/rust-gptman.spec
@@ -5,7 +5,7 @@
%global crate gptman
Name: rust-gptman
-Version: 1.0.1
+Version: 1.0.2
Release: %autorelease
Summary: GPT manager that allows you to copy partitions from one disk to another
@@ -51,6 +51,18 @@ use the "default" feature of the "%{crate}" crate.
%files -n %{name}+default-devel
%ghost %{crate_instdir}/Cargo.toml
+%package -n %{name}+nix-devel
+Summary: %{summary}
+BuildArch: noarch
+
+%description -n %{name}+nix-devel %{_description}
+
+This package contains library source intended for building other packages which
+use the "nix" feature of the "%{crate}" crate.
+
+%files -n %{name}+nix-devel
+%ghost %{crate_instdir}/Cargo.toml
+
%prep
%autosetup -n %{crate}-%{version_no_tilde} -p1
%cargo_prep
diff --git a/sources b/sources
index c6518ff..cd934ed 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (gptman-1.0.1.crate) = 793e7891e367cb279298fb74b25ce8e4dd94c27f9ba7b25fe0c3fc81f3215220d47fc68f01a81eba591dcaa1eab66f4dd8fa14d1ecc25a01a97047c93acf7b4b
+SHA512 (gptman-1.0.2.crate) = 2236243b2fc1aa8e67bb94fa2225e5e2babeaace1219d283635ef7903a089b0c3cad96a33680268657fe661ed6fc5f1ab3165c3a02e05d97c5f64595b078c8c3
https://src.fedoraproject.org/rpms/rust-gptman/c/7067b3db4f15911a166b3f15...
3Â months, 1Â week
carlwgeorge pushed to rpms/python-greenlet (f39). "Update to 3.0.0~a1"
by notificationsï¼ fedoraproject.org
Notification time stamped 2023-08-31 23:44:50 UTC
From 5df663d3e5614f76b006d899dc5669c21ab6455d Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion(a)nwra.com>
Date: Aug 13 2023 23:10:15 +0000
Subject: Update to 3.0.0~a1
---
diff --git a/.gitignore b/.gitignore
index e6e9d0c..e3ea0d5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,4 @@ greenlet-0.3.1.tar.gz
/greenlet-1.1.2.tar.gz
/greenlet-1.1.3.tar.gz
/greenlet-2.0.2.tar.gz
+/greenlet-3.0.0a1.tar.gz
diff --git a/327.patch b/327.patch
deleted file mode 100644
index 31a0bec..0000000
--- a/327.patch
+++ /dev/null
@@ -1,503 +0,0 @@
-From 0418516101d92159f74e69fdd1c29010db71c5cc Mon Sep 17 00:00:00 2001
-From: Thomas A Caswell <tcaswell(a)gmail.com>
-Date: Fri, 4 Nov 2022 11:11:58 -0400
-Subject: [PATCH 01/12] Fix #323: Support Python 3.12
-
----
- src/greenlet/greenlet_cpython_compat.hpp | 6 ++++++
- src/greenlet/greenlet_greenlet.hpp | 12 +++++++++++-
- 2 files changed, 17 insertions(+), 1 deletion(-)
-
-diff --git a/src/greenlet/greenlet_cpython_compat.hpp b/src/greenlet/greenlet_cpython_compat.hpp
-index 3fd13ac..6210586 100644
---- a/src/greenlet/greenlet_cpython_compat.hpp
-+++ b/src/greenlet/greenlet_cpython_compat.hpp
-@@ -48,6 +48,12 @@ We have to save and restore this as well.
- # define GREENLET_USE_CFRAME 0
- #endif
-
-+#if PY_VERSION_HEX >= 0x30C0000
-+# define GREENLET_PY312 1
-+#else
-+# define GREENLET_PY312 0
-+#endif
-+
- #if PY_VERSION_HEX >= 0x30B00A4
- /*
- Greenlet won't compile on anything older than Python 3.11 alpha 4 (see
-diff --git a/src/greenlet/greenlet_greenlet.hpp b/src/greenlet/greenlet_greenlet.hpp
-index cc02c5c..472902e 100644
---- a/src/greenlet/greenlet_greenlet.hpp
-+++ b/src/greenlet/greenlet_greenlet.hpp
-@@ -831,7 +831,11 @@ void PythonState::operator<<(const PyThreadState *const tstate) G_NOEXCEPT
- this->use_tracing = tstate->cframe->use_tracing;
- #endif
- #if GREENLET_PY311
-+ #if GREENLET_PY312
-+ this->recursion_depth = tstate->py_recursion_limit - tstate->py_recursion_remaining;
-+ #else
- this->recursion_depth = tstate->recursion_limit - tstate->recursion_remaining;
-+ #endif
- this->current_frame = tstate->cframe->current_frame;
- this->datastack_chunk = tstate->datastack_chunk;
- this->datastack_top = tstate->datastack_top;
-@@ -867,7 +871,11 @@ void PythonState::operator>>(PyThreadState *const tstate) G_NOEXCEPT
- tstate->cframe->use_tracing = this->use_tracing;
- #endif
- #if GREENLET_PY311
-+ #if GREENLET_PY312
-+ tstate->py_recursion_remaining = tstate->py_recursion_limit - this->recursion_depth;
-+ #else
- tstate->recursion_remaining = tstate->recursion_limit - this->recursion_depth;
-+ #endif
- tstate->cframe->current_frame = this->current_frame;
- tstate->datastack_chunk = this->datastack_chunk;
- tstate->datastack_top = this->datastack_top;
-@@ -895,7 +903,9 @@ void PythonState::will_switch_from(PyThreadState *const origin_tstate) G_NOEXCEP
- void PythonState::set_initial_state(const PyThreadState* const tstate) G_NOEXCEPT
- {
- this->_top_frame = nullptr;
--#if GREENLET_PY311
-+#if GREENLET_PY312
-+ this->recursion_depth = tstate->py_recursion_limit - tstate->py_recursion_remaining;
-+#elif GREENLET_PY311
- this->recursion_depth = tstate->recursion_limit - tstate->recursion_remaining;
- #else
- this->recursion_depth = tstate->recursion_depth;
-
-From 5c76aeda3709cafc8afe656ed7fa284369059d98 Mon Sep 17 00:00:00 2001
-From: Michael Droettboom <mdboom(a)gmail.com>
-Date: Fri, 4 Nov 2022 12:53:37 -0400
-Subject: [PATCH 02/12] Fix 3.12 testing
-
----
- .github/workflows/tests.yml | 12 ++++++++++--
- 1 file changed, 10 insertions(+), 2 deletions(-)
-
-diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
-index 27c91e0..237a85b 100644
---- a/.github/workflows/tests.yml
-+++ b/.github/workflows/tests.yml
-@@ -25,15 +25,23 @@ jobs:
- runs-on: ${{ matrix.os }}
- strategy:
- matrix:
-- python-version: [2.7, 3.5, 3.6, 3.7, 3.8, 3.9, "3.10", "3.11"]
-+ python-version: [2.7, 3.5, 3.6, 3.7, 3.8, 3.9, "3.10", "3.11", "3.12.0~a1"]
- # Jan 2023: We have pinned back from ubuntu-latest (which is
- # now ubuntu 22.04) because older Python versions like
- # 3.5, 3.6 and presumably 2.7 are not available in it.
-- os: [ubuntu-20.04, macos-latest]
-+ os: [ubuntu-latest, macos-latest]
-+ exclude:
-+ - os: macos-latest
-+ python-version: 3.12.0~a1
- steps:
- - uses: actions/checkout@v3
- - name: Set up Python
- uses: actions/setup-python@v4
-+ if: "!contains(matrix.python-version, '~')"
-+ with:
-+ python-version: ${{ matrix.python-version }}
-+ - uses: deadsnakes/action(a)v2.1.1
-+ if: "contains(matrix.python-version, '~')"
- with:
- python-version: ${{ matrix.python-version }}
- cache: 'pip'
-
-From dbe67e389158a5120bcaee857ce9df8d8e20240f Mon Sep 17 00:00:00 2001
-From: Michael Droettboom <mdboom(a)gmail.com>
-Date: Fri, 4 Nov 2022 12:56:25 -0400
-Subject: [PATCH 03/12] Try a different way to specify version
-
----
- .github/workflows/tests.yml | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
-index 237a85b..7d3c3d4 100644
---- a/.github/workflows/tests.yml
-+++ b/.github/workflows/tests.yml
-@@ -25,23 +25,23 @@ jobs:
- runs-on: ${{ matrix.os }}
- strategy:
- matrix:
-- python-version: [2.7, 3.5, 3.6, 3.7, 3.8, 3.9, "3.10", "3.11", "3.12.0~a1"]
-+ python-version: [2.7, 3.5, 3.6, 3.7, 3.8, 3.9, "3.10", "3.11", "3.12"]
- # Jan 2023: We have pinned back from ubuntu-latest (which is
- # now ubuntu 22.04) because older Python versions like
- # 3.5, 3.6 and presumably 2.7 are not available in it.
- os: [ubuntu-latest, macos-latest]
- exclude:
- - os: macos-latest
-- python-version: 3.12.0~a1
-+ python-version: 3.12
- steps:
- - uses: actions/checkout@v3
- - name: Set up Python
- uses: actions/setup-python@v4
-- if: "!contains(matrix.python-version, '~')"
-+ if: "!equals(matrix.python-version, '3.12')"
- with:
- python-version: ${{ matrix.python-version }}
- - uses: deadsnakes/action(a)v2.1.1
-- if: "contains(matrix.python-version, '~')"
-+ if: "equals(matrix.python-version, '3.12')"
- with:
- python-version: ${{ matrix.python-version }}
- cache: 'pip'
-
-From 8d0cb88cfba16226e5a5936b3f48d838a15fbe28 Mon Sep 17 00:00:00 2001
-From: Michael Droettboom <mdboom(a)gmail.com>
-Date: Fri, 4 Nov 2022 14:20:47 -0400
-Subject: [PATCH 04/12] Fix syntax
-
----
- .github/workflows/tests.yml | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
-index 7d3c3d4..90897af 100644
---- a/.github/workflows/tests.yml
-+++ b/.github/workflows/tests.yml
-@@ -37,11 +37,11 @@ jobs:
- - uses: actions/checkout@v3
- - name: Set up Python
- uses: actions/setup-python@v4
-- if: "!equals(matrix.python-version, '3.12')"
-+ if: "matrix.python-version != '3.12'"
- with:
- python-version: ${{ matrix.python-version }}
- - uses: deadsnakes/action(a)v2.1.1
-- if: "equals(matrix.python-version, '3.12')"
-+ if: "matrix.python-version == '3.12'"
- with:
- python-version: ${{ matrix.python-version }}
- cache: 'pip'
-
-From 51a334e65dafb171742f5a715ad89c3116900c04 Mon Sep 17 00:00:00 2001
-From: Michael Droettboom <mdboom(a)gmail.com>
-Date: Wed, 16 Nov 2022 09:14:29 -0500
-Subject: [PATCH 05/12] Use 3.12-dev instead of deadsnakes
-
-Co-authored-by: Andreas Motl <andreas.motl(a)elmyra.de>
----
- .github/workflows/tests.yml | 9 ++-------
- 1 file changed, 2 insertions(+), 7 deletions(-)
-
-diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
-index 90897af..060cc7f 100644
---- a/.github/workflows/tests.yml
-+++ b/.github/workflows/tests.yml
-@@ -25,23 +25,18 @@ jobs:
- runs-on: ${{ matrix.os }}
- strategy:
- matrix:
-- python-version: [2.7, 3.5, 3.6, 3.7, 3.8, 3.9, "3.10", "3.11", "3.12"]
-+ python-version: [2.7, 3.5, 3.6, 3.7, 3.8, 3.9, "3.10", "3.11", "3.12-dev"]
- # Jan 2023: We have pinned back from ubuntu-latest (which is
- # now ubuntu 22.04) because older Python versions like
- # 3.5, 3.6 and presumably 2.7 are not available in it.
- os: [ubuntu-latest, macos-latest]
- exclude:
- - os: macos-latest
-- python-version: 3.12
-+ python-version: 3.12-dev
- steps:
- - uses: actions/checkout@v3
- - name: Set up Python
- uses: actions/setup-python@v4
-- if: "matrix.python-version != '3.12'"
-- with:
-- python-version: ${{ matrix.python-version }}
-- - uses: deadsnakes/action(a)v2.1.1
-- if: "matrix.python-version == '3.12'"
- with:
- python-version: ${{ matrix.python-version }}
- cache: 'pip'
-
-From 387dee06179373e53b2d42447ea88f2acdcd2d1f Mon Sep 17 00:00:00 2001
-From: Michael Droettboom <mdboom(a)gmail.com>
-Date: Thu, 27 Apr 2023 09:52:14 -0400
-Subject: [PATCH 06/12] Updates for PEP669
-
----
- src/greenlet/greenlet.cpp | 4 ++++
- src/greenlet/greenlet_greenlet.hpp | 15 +++++++++------
- 2 files changed, 13 insertions(+), 6 deletions(-)
-
-diff --git a/src/greenlet/greenlet.cpp b/src/greenlet/greenlet.cpp
-index 1d6ddaa..b382c5a 100644
---- a/src/greenlet/greenlet.cpp
-+++ b/src/greenlet/greenlet.cpp
-@@ -3092,7 +3092,11 @@ static PyObject*
- mod_get_tstate_trash_delete_nesting(PyObject* UNUSED(module))
- {
- PyThreadState* tstate = PyThreadState_GET();
-+#if GREENLET_PY312
-+ return PyLong_FromLong(tstate->trash.delete_nesting);
-+#else
- return PyLong_FromLong(tstate->trash_delete_nesting);
-+#endif
- }
-
- static PyMethodDef GreenMethods[] = {
-diff --git a/src/greenlet/greenlet_greenlet.hpp b/src/greenlet/greenlet_greenlet.hpp
-index 472902e..7146214 100644
---- a/src/greenlet/greenlet_greenlet.hpp
-+++ b/src/greenlet/greenlet_greenlet.hpp
-@@ -828,7 +828,9 @@ void PythonState::operator<<(const PyThreadState *const tstate) G_NOEXCEPT
- the switch, use `will_switch_from`.
- */
- this->cframe = tstate->cframe;
-+ #if !GREENLET_PY312
- this->use_tracing = tstate->cframe->use_tracing;
-+ #endif
- #endif
- #if GREENLET_PY311
- #if GREENLET_PY312
-@@ -843,13 +845,12 @@ void PythonState::operator<<(const PyThreadState *const tstate) G_NOEXCEPT
- PyFrameObject *frame = PyThreadState_GetFrame((PyThreadState *)tstate);
- Py_XDECREF(frame); // PyThreadState_GetFrame gives us a new reference.
- this->_top_frame.steal(frame);
-+ this->trash_delete_nesting = tstate->trash.delete_nesting;
- #else
- this->recursion_depth = tstate->recursion_depth;
- this->_top_frame.steal(tstate->frame);
--#endif
--
-- // All versions of Python.
- this->trash_delete_nesting = tstate->trash_delete_nesting;
-+#endif
- }
-
- void PythonState::operator>>(PyThreadState *const tstate) G_NOEXCEPT
-@@ -868,7 +869,9 @@ void PythonState::operator>>(PyThreadState *const tstate) G_NOEXCEPT
- root_cframe here. See note above about why we can't
- just copy this from ``origin->cframe->use_tracing``.
- */
-+ #if !GREENLET_PY312
- tstate->cframe->use_tracing = this->use_tracing;
-+ #endif
- #endif
- #if GREENLET_PY311
- #if GREENLET_PY312
-@@ -881,17 +884,17 @@ void PythonState::operator>>(PyThreadState *const tstate) G_NOEXCEPT
- tstate->datastack_top = this->datastack_top;
- tstate->datastack_limit = this->datastack_limit;
- this->_top_frame.relinquish_ownership();
-+ tstate->trash.delete_nesting = this->trash_delete_nesting;
- #else
- tstate->frame = this->_top_frame.relinquish_ownership();
- tstate->recursion_depth = this->recursion_depth;
-+ tstate->trash.delete_nesting = this->trash_delete_nesting;
- #endif
-- // All versions of Python.
-- tstate->trash_delete_nesting = this->trash_delete_nesting;
- }
-
- void PythonState::will_switch_from(PyThreadState *const origin_tstate) G_NOEXCEPT
- {
--#if GREENLET_USE_CFRAME
-+#if GREENLET_USE_CFRAME && !GREENLET_PY312
- // The weird thing is, we don't actually save this for an
- // effect on the current greenlet, it's saved for an
- // effect on the target greenlet. That is, we want
-
-From db74f88454dd36c3c6769bec680a16a1ac284b96 Mon Sep 17 00:00:00 2001
-From: Michael Droettboom <mdboom(a)gmail.com>
-Date: Thu, 27 Apr 2023 09:54:50 -0400
-Subject: [PATCH 07/12] Fix Python 3.11
-
----
- src/greenlet/greenlet_greenlet.hpp | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/src/greenlet/greenlet_greenlet.hpp b/src/greenlet/greenlet_greenlet.hpp
-index 7146214..41fda8e 100644
---- a/src/greenlet/greenlet_greenlet.hpp
-+++ b/src/greenlet/greenlet_greenlet.hpp
-@@ -845,7 +845,11 @@ void PythonState::operator<<(const PyThreadState *const tstate) G_NOEXCEPT
- PyFrameObject *frame = PyThreadState_GetFrame((PyThreadState *)tstate);
- Py_XDECREF(frame); // PyThreadState_GetFrame gives us a new reference.
- this->_top_frame.steal(frame);
-+ #if GREENLET_PY312
- this->trash_delete_nesting = tstate->trash.delete_nesting;
-+ #else
-+ this->trash_delete_nesting = tstate->trash_delete_nesting;
-+ #endif
- #else
- this->recursion_depth = tstate->recursion_depth;
- this->_top_frame.steal(tstate->frame);
-@@ -884,7 +888,11 @@ void PythonState::operator>>(PyThreadState *const tstate) G_NOEXCEPT
- tstate->datastack_top = this->datastack_top;
- tstate->datastack_limit = this->datastack_limit;
- this->_top_frame.relinquish_ownership();
-+ #if GREENLET_PY312
- tstate->trash.delete_nesting = this->trash_delete_nesting;
-+ #else
-+ tstate->trash_delete_nesting = this->trash_delete_nesting;
-+ #endif
- #else
- tstate->frame = this->_top_frame.relinquish_ownership();
- tstate->recursion_depth = this->recursion_depth;
-
-From 132c4616f38e3c05899da1be22086d96e4981057 Mon Sep 17 00:00:00 2001
-From: Michael Droettboom <mdboom(a)gmail.com>
-Date: Thu, 27 Apr 2023 09:56:56 -0400
-Subject: [PATCH 08/12] Revert ubuntu-latest change
-
----
- .github/workflows/tests.yml | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
-index 060cc7f..fa48066 100644
---- a/.github/workflows/tests.yml
-+++ b/.github/workflows/tests.yml
-@@ -29,7 +29,7 @@ jobs:
- # Jan 2023: We have pinned back from ubuntu-latest (which is
- # now ubuntu 22.04) because older Python versions like
- # 3.5, 3.6 and presumably 2.7 are not available in it.
-- os: [ubuntu-latest, macos-latest]
-+ os: [ubuntu-20.04, macos-latest]
- exclude:
- - os: macos-latest
- python-version: 3.12-dev
-
-From d26952ec3fb74c1f1d68104a4ac80018deb0618c Mon Sep 17 00:00:00 2001
-From: Michael Droettboom <mdboom(a)gmail.com>
-Date: Thu, 27 Apr 2023 09:58:22 -0400
-Subject: [PATCH 09/12] Fix legacy versions
-
----
- src/greenlet/greenlet_greenlet.hpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/greenlet/greenlet_greenlet.hpp b/src/greenlet/greenlet_greenlet.hpp
-index 41fda8e..ffb23a7 100644
---- a/src/greenlet/greenlet_greenlet.hpp
-+++ b/src/greenlet/greenlet_greenlet.hpp
-@@ -896,7 +896,7 @@ void PythonState::operator>>(PyThreadState *const tstate) G_NOEXCEPT
- #else
- tstate->frame = this->_top_frame.relinquish_ownership();
- tstate->recursion_depth = this->recursion_depth;
-- tstate->trash.delete_nesting = this->trash_delete_nesting;
-+ tstate->trash_delete_nesting = this->trash_delete_nesting;
- #endif
- }
-
-
-From 82f9a8869d88616decb777bc6afae3a751a4a9c0 Mon Sep 17 00:00:00 2001
-From: Michael Droettboom <mdboom(a)gmail.com>
-Date: Thu, 27 Apr 2023 17:29:10 -0400
-Subject: [PATCH 10/12] Print precise Python version
-
----
- .github/workflows/tests.yml | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
-index fa48066..aa14318 100644
---- a/.github/workflows/tests.yml
-+++ b/.github/workflows/tests.yml
-@@ -80,6 +80,7 @@ jobs:
- path: dist/*whl
- - name: Test
- run: |
-+ python -VV
- python -c 'import greenlet._greenlet as G; assert G.GREENLET_USE_STANDARD_THREADING'
- python -m unittest discover -v greenlet.tests
- - name: Doctest
-
-From 3629e46c49533a994aa8f12ed3b41ae6725ab2ce Mon Sep 17 00:00:00 2001
-From: Michael Droettboom <mdboom(a)gmail.com>
-Date: Tue, 2 May 2023 10:48:37 -0400
-Subject: [PATCH 11/12] Fix recursion depth updating
-
----
- src/greenlet/greenlet_greenlet.hpp | 19 ++++++++++++++++---
- 1 file changed, 16 insertions(+), 3 deletions(-)
-
-diff --git a/src/greenlet/greenlet_greenlet.hpp b/src/greenlet/greenlet_greenlet.hpp
-index ffb23a7..10244e0 100644
---- a/src/greenlet/greenlet_greenlet.hpp
-+++ b/src/greenlet/greenlet_greenlet.hpp
-@@ -143,7 +143,12 @@ namespace greenlet
- _PyCFrame* cframe;
- int use_tracing;
- #endif
-+#if GREENLET_PY312
-+ int py_recursion_depth;
-+ int c_recursion_depth;
-+#else
- int recursion_depth;
-+#endif
- int trash_delete_nesting;
- #if GREENLET_PY311
- _PyInterpreterFrame* current_frame;
-@@ -748,7 +753,12 @@ PythonState::PythonState()
- ,cframe(nullptr)
- ,use_tracing(0)
- #endif
-+#if GREENLET_PY312
-+ ,py_recursion_depth(0)
-+ ,c_recursion_depth(0)
-+#else
- ,recursion_depth(0)
-+#endif
- ,trash_delete_nesting(0)
- #if GREENLET_PY311
- ,current_frame(nullptr)
-@@ -834,7 +844,8 @@ void PythonState::operator<<(const PyThreadState *const tstate) G_NOEXCEPT
- #endif
- #if GREENLET_PY311
- #if GREENLET_PY312
-- this->recursion_depth = tstate->py_recursion_limit - tstate->py_recursion_remaining;
-+ this->py_recursion_depth = tstate->py_recursion_limit - tstate->py_recursion_remaining;
-+ this->c_recursion_depth = C_RECURSION_LIMIT - tstate->c_recursion_remaining;
- #else
- this->recursion_depth = tstate->recursion_limit - tstate->recursion_remaining;
- #endif
-@@ -879,7 +890,8 @@ void PythonState::operator>>(PyThreadState *const tstate) G_NOEXCEPT
- #endif
- #if GREENLET_PY311
- #if GREENLET_PY312
-- tstate->py_recursion_remaining = tstate->py_recursion_limit - this->recursion_depth;
-+ tstate->py_recursion_remaining = tstate->py_recursion_limit - this->py_recursion_depth;
-+ tstate->c_recursion_remaining = C_RECURSION_LIMIT - this->c_recursion_depth;
- #else
- tstate->recursion_remaining = tstate->recursion_limit - this->recursion_depth;
- #endif
-@@ -915,7 +927,8 @@ void PythonState::set_initial_state(const PyThreadState* const tstate) G_NOEXCEP
- {
- this->_top_frame = nullptr;
- #if GREENLET_PY312
-- this->recursion_depth = tstate->py_recursion_limit - tstate->py_recursion_remaining;
-+ this->py_recursion_depth = tstate->py_recursion_limit - tstate->py_recursion_remaining;
-+ this->c_recursion_depth = tstate->py_recursion_limit - tstate->py_recursion_remaining;
- #elif GREENLET_PY311
- this->recursion_depth = tstate->recursion_limit - tstate->recursion_remaining;
- #else
-
-From 6bba85fdfd0acd1484780fae7a537e3dac99c067 Mon Sep 17 00:00:00 2001
-From: Michael Droettboom <mdboom(a)gmail.com>
-Date: Tue, 30 May 2023 12:14:22 -0400
-Subject: [PATCH 12/12] Insert blank line
-
----
- src/greenlet/greenlet.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/greenlet/greenlet.cpp b/src/greenlet/greenlet.cpp
-index b382c5a..677fce8 100644
---- a/src/greenlet/greenlet.cpp
-+++ b/src/greenlet/greenlet.cpp
-@@ -3092,6 +3092,7 @@ static PyObject*
- mod_get_tstate_trash_delete_nesting(PyObject* UNUSED(module))
- {
- PyThreadState* tstate = PyThreadState_GET();
-+
- #if GREENLET_PY312
- return PyLong_FromLong(tstate->trash.delete_nesting);
- #else
diff --git a/python-greenlet.spec b/python-greenlet.spec
index 08cdd11..6de9f04 100644
--- a/python-greenlet.spec
+++ b/python-greenlet.spec
@@ -1,16 +1,12 @@
%global modname greenlet
Name: python-%{modname}
-Version: 2.0.2
-Release: 3%{?dist}
+Version: 3.0.0~a1
+Release: 1%{?dist}
Summary: Lightweight in-process concurrent programming
License: MIT AND PSF-2.0
URL: https://github.com/python-greenlet/greenlet
-Source0: %{url}/archive/%{version}/%{modname}-%{version}.tar.gz
-
-# Patch needed for compatibility with Python 3.12
-# From: https://github.com/python-greenlet/greenlet/pull/327
-Patch: https://github.com/python-greenlet/greenlet/pull/327.patch
+Source0: %{url}/archive/3.0.0a1/%{modname}-3.0.0a1.tar.gz
# Skip leak checking to avoid a missing dependency, `objgraph`
Patch: skip-leak-checks.patch
@@ -49,7 +45,7 @@ Requires: python3-%{modname}%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{rel
Python 3 version.
%prep
-%autosetup -n %{modname}-%{version} -p1
+%autosetup -n %{modname}-3.0.0a1 -p1
%build
%py3_build
@@ -74,6 +70,9 @@ PYTHONPATH="%{buildroot}%{python3_sitearch}" \
%{_includedir}/python%{python3_version}*/%{modname}/
%changelog
+* Sun Aug 13 2023 Orion Poplawski <orion(a)nwra.com> - 3.0.0~a1-1
+- Update to 3.0.0a1
+
* Sat Aug 05 2023 Ondřej Budai <ondrej(a)budai.cz> - 2.0.2-3
- SPDX migration
diff --git a/sources b/sources
index 1a884c1..d54ddc6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (greenlet-2.0.2.tar.gz) = 4817fa870a8c40c86a63d17edc870cb6514d074ff3e1a99b6319ec3124f5cb22146b036f0a4f5dd39d003c81eace894c6b89abc6d562c40558ea2d5351c89103
+SHA512 (greenlet-3.0.0a1.tar.gz) = 97560c4422a8dcf04521416c7184f78259ec64445d379328e70489abd3105d30466bd72120c83c5d08575863b589af9beef49bdfe749170c7c7db42ae5aa93c2
https://src.fedoraproject.org/rpms/python-greenlet/c/5df663d3e5614f76b006...
3Â months, 1Â week
decathorpe pushed to rpms/rust-gptman (rawhide). "Update to version
1.0.2; Fixes RHBZ#2233075"
by notificationsï¼ fedoraproject.org
Notification time stamped 2023-08-31 23:38:59 UTC
From 7067b3db4f15911a166b3f150da68bb41fae3e3f Mon Sep 17 00:00:00 2001
From: Fabio Valentini <decathorpe(a)gmail.com>
Date: Aug 31 2023 22:33:11 +0000
Subject: Update to version 1.0.2; Fixes RHBZ#2233075
---
diff --git a/.gitignore b/.gitignore
index 8838303..20fea88 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
/gptman-0.8.3.crate
/gptman-0.8.4.crate
/gptman-1.0.1.crate
+/gptman-1.0.2.crate
diff --git a/README.md b/README.md
deleted file mode 100644
index 9d80a07..0000000
--- a/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# rust-gptman
-
-GPT manager that allows you to copy partitions from one disk to another
\ No newline at end of file
diff --git a/gptman-fix-metadata.diff b/gptman-fix-metadata.diff
index 80c9b6d..5d1a915 100644
--- a/gptman-fix-metadata.diff
+++ b/gptman-fix-metadata.diff
@@ -1,6 +1,6 @@
---- gptman-1.0.1/Cargo.toml 1970-01-01T00:00:01+00:00
-+++ gptman-1.0.1/Cargo.toml 2023-07-28T04:32:45.803883+00:00
-@@ -39,49 +39,11 @@
+--- gptman-1.0.2/Cargo.toml 1970-01-01T00:00:01+00:00
++++ gptman-1.0.2/Cargo.toml 2023-08-31T22:31:09.528028+00:00
+@@ -40,49 +40,11 @@
[lib]
name = "gptman"
@@ -18,7 +18,7 @@
version = "1.3.1"
-[dependencies.clap]
--version = ">= 3, < 5"
+-version = "4"
-features = [
- "derive",
- "wrap_help",
@@ -50,7 +50,7 @@
[dependencies.serde]
version = "1.0.116"
-@@ -90,21 +52,5 @@
+@@ -91,21 +53,7 @@
[dependencies.thiserror]
version = "1.0"
@@ -58,7 +58,7 @@
-version = "0.1.8"
-optional = true
-
--[features]
+ [features]
-cli = [
- "lazy_static",
- "ansi_term",
@@ -69,6 +69,6 @@
- "clap",
- "count-zeroes",
-]
--
+ default = ["nix"]
+
[target."cfg(target_os = \"linux\")".dependencies.nix]
- version = ">= 0.22, < 0.27"
diff --git a/rust-gptman.spec b/rust-gptman.spec
index 6b10420..e987739 100644
--- a/rust-gptman.spec
+++ b/rust-gptman.spec
@@ -5,7 +5,7 @@
%global crate gptman
Name: rust-gptman
-Version: 1.0.1
+Version: 1.0.2
Release: %autorelease
Summary: GPT manager that allows you to copy partitions from one disk to another
@@ -51,6 +51,18 @@ use the "default" feature of the "%{crate}" crate.
%files -n %{name}+default-devel
%ghost %{crate_instdir}/Cargo.toml
+%package -n %{name}+nix-devel
+Summary: %{summary}
+BuildArch: noarch
+
+%description -n %{name}+nix-devel %{_description}
+
+This package contains library source intended for building other packages which
+use the "nix" feature of the "%{crate}" crate.
+
+%files -n %{name}+nix-devel
+%ghost %{crate_instdir}/Cargo.toml
+
%prep
%autosetup -n %{crate}-%{version_no_tilde} -p1
%cargo_prep
diff --git a/sources b/sources
index c6518ff..cd934ed 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (gptman-1.0.1.crate) = 793e7891e367cb279298fb74b25ce8e4dd94c27f9ba7b25fe0c3fc81f3215220d47fc68f01a81eba591dcaa1eab66f4dd8fa14d1ecc25a01a97047c93acf7b4b
+SHA512 (gptman-1.0.2.crate) = 2236243b2fc1aa8e67bb94fa2225e5e2babeaace1219d283635ef7903a089b0c3cad96a33680268657fe661ed6fc5f1ab3165c3a02e05d97c5f64595b078c8c3
https://src.fedoraproject.org/rpms/rust-gptman/c/7067b3db4f15911a166b3f15...
3Â months, 1Â week
pagure pushed to rpms/python-greenlet (rawhide). "Update to 3.0.0~a1"
by notificationsï¼ fedoraproject.org
Notification time stamped 2023-08-31 23:33:09 UTC
From 5df663d3e5614f76b006d899dc5669c21ab6455d Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion(a)nwra.com>
Date: Aug 13 2023 23:10:15 +0000
Subject: Update to 3.0.0~a1
---
diff --git a/.gitignore b/.gitignore
index e6e9d0c..e3ea0d5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,4 @@ greenlet-0.3.1.tar.gz
/greenlet-1.1.2.tar.gz
/greenlet-1.1.3.tar.gz
/greenlet-2.0.2.tar.gz
+/greenlet-3.0.0a1.tar.gz
diff --git a/327.patch b/327.patch
deleted file mode 100644
index 31a0bec..0000000
--- a/327.patch
+++ /dev/null
@@ -1,503 +0,0 @@
-From 0418516101d92159f74e69fdd1c29010db71c5cc Mon Sep 17 00:00:00 2001
-From: Thomas A Caswell <tcaswell(a)gmail.com>
-Date: Fri, 4 Nov 2022 11:11:58 -0400
-Subject: [PATCH 01/12] Fix #323: Support Python 3.12
-
----
- src/greenlet/greenlet_cpython_compat.hpp | 6 ++++++
- src/greenlet/greenlet_greenlet.hpp | 12 +++++++++++-
- 2 files changed, 17 insertions(+), 1 deletion(-)
-
-diff --git a/src/greenlet/greenlet_cpython_compat.hpp b/src/greenlet/greenlet_cpython_compat.hpp
-index 3fd13ac..6210586 100644
---- a/src/greenlet/greenlet_cpython_compat.hpp
-+++ b/src/greenlet/greenlet_cpython_compat.hpp
-@@ -48,6 +48,12 @@ We have to save and restore this as well.
- # define GREENLET_USE_CFRAME 0
- #endif
-
-+#if PY_VERSION_HEX >= 0x30C0000
-+# define GREENLET_PY312 1
-+#else
-+# define GREENLET_PY312 0
-+#endif
-+
- #if PY_VERSION_HEX >= 0x30B00A4
- /*
- Greenlet won't compile on anything older than Python 3.11 alpha 4 (see
-diff --git a/src/greenlet/greenlet_greenlet.hpp b/src/greenlet/greenlet_greenlet.hpp
-index cc02c5c..472902e 100644
---- a/src/greenlet/greenlet_greenlet.hpp
-+++ b/src/greenlet/greenlet_greenlet.hpp
-@@ -831,7 +831,11 @@ void PythonState::operator<<(const PyThreadState *const tstate) G_NOEXCEPT
- this->use_tracing = tstate->cframe->use_tracing;
- #endif
- #if GREENLET_PY311
-+ #if GREENLET_PY312
-+ this->recursion_depth = tstate->py_recursion_limit - tstate->py_recursion_remaining;
-+ #else
- this->recursion_depth = tstate->recursion_limit - tstate->recursion_remaining;
-+ #endif
- this->current_frame = tstate->cframe->current_frame;
- this->datastack_chunk = tstate->datastack_chunk;
- this->datastack_top = tstate->datastack_top;
-@@ -867,7 +871,11 @@ void PythonState::operator>>(PyThreadState *const tstate) G_NOEXCEPT
- tstate->cframe->use_tracing = this->use_tracing;
- #endif
- #if GREENLET_PY311
-+ #if GREENLET_PY312
-+ tstate->py_recursion_remaining = tstate->py_recursion_limit - this->recursion_depth;
-+ #else
- tstate->recursion_remaining = tstate->recursion_limit - this->recursion_depth;
-+ #endif
- tstate->cframe->current_frame = this->current_frame;
- tstate->datastack_chunk = this->datastack_chunk;
- tstate->datastack_top = this->datastack_top;
-@@ -895,7 +903,9 @@ void PythonState::will_switch_from(PyThreadState *const origin_tstate) G_NOEXCEP
- void PythonState::set_initial_state(const PyThreadState* const tstate) G_NOEXCEPT
- {
- this->_top_frame = nullptr;
--#if GREENLET_PY311
-+#if GREENLET_PY312
-+ this->recursion_depth = tstate->py_recursion_limit - tstate->py_recursion_remaining;
-+#elif GREENLET_PY311
- this->recursion_depth = tstate->recursion_limit - tstate->recursion_remaining;
- #else
- this->recursion_depth = tstate->recursion_depth;
-
-From 5c76aeda3709cafc8afe656ed7fa284369059d98 Mon Sep 17 00:00:00 2001
-From: Michael Droettboom <mdboom(a)gmail.com>
-Date: Fri, 4 Nov 2022 12:53:37 -0400
-Subject: [PATCH 02/12] Fix 3.12 testing
-
----
- .github/workflows/tests.yml | 12 ++++++++++--
- 1 file changed, 10 insertions(+), 2 deletions(-)
-
-diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
-index 27c91e0..237a85b 100644
---- a/.github/workflows/tests.yml
-+++ b/.github/workflows/tests.yml
-@@ -25,15 +25,23 @@ jobs:
- runs-on: ${{ matrix.os }}
- strategy:
- matrix:
-- python-version: [2.7, 3.5, 3.6, 3.7, 3.8, 3.9, "3.10", "3.11"]
-+ python-version: [2.7, 3.5, 3.6, 3.7, 3.8, 3.9, "3.10", "3.11", "3.12.0~a1"]
- # Jan 2023: We have pinned back from ubuntu-latest (which is
- # now ubuntu 22.04) because older Python versions like
- # 3.5, 3.6 and presumably 2.7 are not available in it.
-- os: [ubuntu-20.04, macos-latest]
-+ os: [ubuntu-latest, macos-latest]
-+ exclude:
-+ - os: macos-latest
-+ python-version: 3.12.0~a1
- steps:
- - uses: actions/checkout@v3
- - name: Set up Python
- uses: actions/setup-python@v4
-+ if: "!contains(matrix.python-version, '~')"
-+ with:
-+ python-version: ${{ matrix.python-version }}
-+ - uses: deadsnakes/action(a)v2.1.1
-+ if: "contains(matrix.python-version, '~')"
- with:
- python-version: ${{ matrix.python-version }}
- cache: 'pip'
-
-From dbe67e389158a5120bcaee857ce9df8d8e20240f Mon Sep 17 00:00:00 2001
-From: Michael Droettboom <mdboom(a)gmail.com>
-Date: Fri, 4 Nov 2022 12:56:25 -0400
-Subject: [PATCH 03/12] Try a different way to specify version
-
----
- .github/workflows/tests.yml | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
-index 237a85b..7d3c3d4 100644
---- a/.github/workflows/tests.yml
-+++ b/.github/workflows/tests.yml
-@@ -25,23 +25,23 @@ jobs:
- runs-on: ${{ matrix.os }}
- strategy:
- matrix:
-- python-version: [2.7, 3.5, 3.6, 3.7, 3.8, 3.9, "3.10", "3.11", "3.12.0~a1"]
-+ python-version: [2.7, 3.5, 3.6, 3.7, 3.8, 3.9, "3.10", "3.11", "3.12"]
- # Jan 2023: We have pinned back from ubuntu-latest (which is
- # now ubuntu 22.04) because older Python versions like
- # 3.5, 3.6 and presumably 2.7 are not available in it.
- os: [ubuntu-latest, macos-latest]
- exclude:
- - os: macos-latest
-- python-version: 3.12.0~a1
-+ python-version: 3.12
- steps:
- - uses: actions/checkout@v3
- - name: Set up Python
- uses: actions/setup-python@v4
-- if: "!contains(matrix.python-version, '~')"
-+ if: "!equals(matrix.python-version, '3.12')"
- with:
- python-version: ${{ matrix.python-version }}
- - uses: deadsnakes/action(a)v2.1.1
-- if: "contains(matrix.python-version, '~')"
-+ if: "equals(matrix.python-version, '3.12')"
- with:
- python-version: ${{ matrix.python-version }}
- cache: 'pip'
-
-From 8d0cb88cfba16226e5a5936b3f48d838a15fbe28 Mon Sep 17 00:00:00 2001
-From: Michael Droettboom <mdboom(a)gmail.com>
-Date: Fri, 4 Nov 2022 14:20:47 -0400
-Subject: [PATCH 04/12] Fix syntax
-
----
- .github/workflows/tests.yml | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
-index 7d3c3d4..90897af 100644
---- a/.github/workflows/tests.yml
-+++ b/.github/workflows/tests.yml
-@@ -37,11 +37,11 @@ jobs:
- - uses: actions/checkout@v3
- - name: Set up Python
- uses: actions/setup-python@v4
-- if: "!equals(matrix.python-version, '3.12')"
-+ if: "matrix.python-version != '3.12'"
- with:
- python-version: ${{ matrix.python-version }}
- - uses: deadsnakes/action(a)v2.1.1
-- if: "equals(matrix.python-version, '3.12')"
-+ if: "matrix.python-version == '3.12'"
- with:
- python-version: ${{ matrix.python-version }}
- cache: 'pip'
-
-From 51a334e65dafb171742f5a715ad89c3116900c04 Mon Sep 17 00:00:00 2001
-From: Michael Droettboom <mdboom(a)gmail.com>
-Date: Wed, 16 Nov 2022 09:14:29 -0500
-Subject: [PATCH 05/12] Use 3.12-dev instead of deadsnakes
-
-Co-authored-by: Andreas Motl <andreas.motl(a)elmyra.de>
----
- .github/workflows/tests.yml | 9 ++-------
- 1 file changed, 2 insertions(+), 7 deletions(-)
-
-diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
-index 90897af..060cc7f 100644
---- a/.github/workflows/tests.yml
-+++ b/.github/workflows/tests.yml
-@@ -25,23 +25,18 @@ jobs:
- runs-on: ${{ matrix.os }}
- strategy:
- matrix:
-- python-version: [2.7, 3.5, 3.6, 3.7, 3.8, 3.9, "3.10", "3.11", "3.12"]
-+ python-version: [2.7, 3.5, 3.6, 3.7, 3.8, 3.9, "3.10", "3.11", "3.12-dev"]
- # Jan 2023: We have pinned back from ubuntu-latest (which is
- # now ubuntu 22.04) because older Python versions like
- # 3.5, 3.6 and presumably 2.7 are not available in it.
- os: [ubuntu-latest, macos-latest]
- exclude:
- - os: macos-latest
-- python-version: 3.12
-+ python-version: 3.12-dev
- steps:
- - uses: actions/checkout@v3
- - name: Set up Python
- uses: actions/setup-python@v4
-- if: "matrix.python-version != '3.12'"
-- with:
-- python-version: ${{ matrix.python-version }}
-- - uses: deadsnakes/action(a)v2.1.1
-- if: "matrix.python-version == '3.12'"
- with:
- python-version: ${{ matrix.python-version }}
- cache: 'pip'
-
-From 387dee06179373e53b2d42447ea88f2acdcd2d1f Mon Sep 17 00:00:00 2001
-From: Michael Droettboom <mdboom(a)gmail.com>
-Date: Thu, 27 Apr 2023 09:52:14 -0400
-Subject: [PATCH 06/12] Updates for PEP669
-
----
- src/greenlet/greenlet.cpp | 4 ++++
- src/greenlet/greenlet_greenlet.hpp | 15 +++++++++------
- 2 files changed, 13 insertions(+), 6 deletions(-)
-
-diff --git a/src/greenlet/greenlet.cpp b/src/greenlet/greenlet.cpp
-index 1d6ddaa..b382c5a 100644
---- a/src/greenlet/greenlet.cpp
-+++ b/src/greenlet/greenlet.cpp
-@@ -3092,7 +3092,11 @@ static PyObject*
- mod_get_tstate_trash_delete_nesting(PyObject* UNUSED(module))
- {
- PyThreadState* tstate = PyThreadState_GET();
-+#if GREENLET_PY312
-+ return PyLong_FromLong(tstate->trash.delete_nesting);
-+#else
- return PyLong_FromLong(tstate->trash_delete_nesting);
-+#endif
- }
-
- static PyMethodDef GreenMethods[] = {
-diff --git a/src/greenlet/greenlet_greenlet.hpp b/src/greenlet/greenlet_greenlet.hpp
-index 472902e..7146214 100644
---- a/src/greenlet/greenlet_greenlet.hpp
-+++ b/src/greenlet/greenlet_greenlet.hpp
-@@ -828,7 +828,9 @@ void PythonState::operator<<(const PyThreadState *const tstate) G_NOEXCEPT
- the switch, use `will_switch_from`.
- */
- this->cframe = tstate->cframe;
-+ #if !GREENLET_PY312
- this->use_tracing = tstate->cframe->use_tracing;
-+ #endif
- #endif
- #if GREENLET_PY311
- #if GREENLET_PY312
-@@ -843,13 +845,12 @@ void PythonState::operator<<(const PyThreadState *const tstate) G_NOEXCEPT
- PyFrameObject *frame = PyThreadState_GetFrame((PyThreadState *)tstate);
- Py_XDECREF(frame); // PyThreadState_GetFrame gives us a new reference.
- this->_top_frame.steal(frame);
-+ this->trash_delete_nesting = tstate->trash.delete_nesting;
- #else
- this->recursion_depth = tstate->recursion_depth;
- this->_top_frame.steal(tstate->frame);
--#endif
--
-- // All versions of Python.
- this->trash_delete_nesting = tstate->trash_delete_nesting;
-+#endif
- }
-
- void PythonState::operator>>(PyThreadState *const tstate) G_NOEXCEPT
-@@ -868,7 +869,9 @@ void PythonState::operator>>(PyThreadState *const tstate) G_NOEXCEPT
- root_cframe here. See note above about why we can't
- just copy this from ``origin->cframe->use_tracing``.
- */
-+ #if !GREENLET_PY312
- tstate->cframe->use_tracing = this->use_tracing;
-+ #endif
- #endif
- #if GREENLET_PY311
- #if GREENLET_PY312
-@@ -881,17 +884,17 @@ void PythonState::operator>>(PyThreadState *const tstate) G_NOEXCEPT
- tstate->datastack_top = this->datastack_top;
- tstate->datastack_limit = this->datastack_limit;
- this->_top_frame.relinquish_ownership();
-+ tstate->trash.delete_nesting = this->trash_delete_nesting;
- #else
- tstate->frame = this->_top_frame.relinquish_ownership();
- tstate->recursion_depth = this->recursion_depth;
-+ tstate->trash.delete_nesting = this->trash_delete_nesting;
- #endif
-- // All versions of Python.
-- tstate->trash_delete_nesting = this->trash_delete_nesting;
- }
-
- void PythonState::will_switch_from(PyThreadState *const origin_tstate) G_NOEXCEPT
- {
--#if GREENLET_USE_CFRAME
-+#if GREENLET_USE_CFRAME && !GREENLET_PY312
- // The weird thing is, we don't actually save this for an
- // effect on the current greenlet, it's saved for an
- // effect on the target greenlet. That is, we want
-
-From db74f88454dd36c3c6769bec680a16a1ac284b96 Mon Sep 17 00:00:00 2001
-From: Michael Droettboom <mdboom(a)gmail.com>
-Date: Thu, 27 Apr 2023 09:54:50 -0400
-Subject: [PATCH 07/12] Fix Python 3.11
-
----
- src/greenlet/greenlet_greenlet.hpp | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/src/greenlet/greenlet_greenlet.hpp b/src/greenlet/greenlet_greenlet.hpp
-index 7146214..41fda8e 100644
---- a/src/greenlet/greenlet_greenlet.hpp
-+++ b/src/greenlet/greenlet_greenlet.hpp
-@@ -845,7 +845,11 @@ void PythonState::operator<<(const PyThreadState *const tstate) G_NOEXCEPT
- PyFrameObject *frame = PyThreadState_GetFrame((PyThreadState *)tstate);
- Py_XDECREF(frame); // PyThreadState_GetFrame gives us a new reference.
- this->_top_frame.steal(frame);
-+ #if GREENLET_PY312
- this->trash_delete_nesting = tstate->trash.delete_nesting;
-+ #else
-+ this->trash_delete_nesting = tstate->trash_delete_nesting;
-+ #endif
- #else
- this->recursion_depth = tstate->recursion_depth;
- this->_top_frame.steal(tstate->frame);
-@@ -884,7 +888,11 @@ void PythonState::operator>>(PyThreadState *const tstate) G_NOEXCEPT
- tstate->datastack_top = this->datastack_top;
- tstate->datastack_limit = this->datastack_limit;
- this->_top_frame.relinquish_ownership();
-+ #if GREENLET_PY312
- tstate->trash.delete_nesting = this->trash_delete_nesting;
-+ #else
-+ tstate->trash_delete_nesting = this->trash_delete_nesting;
-+ #endif
- #else
- tstate->frame = this->_top_frame.relinquish_ownership();
- tstate->recursion_depth = this->recursion_depth;
-
-From 132c4616f38e3c05899da1be22086d96e4981057 Mon Sep 17 00:00:00 2001
-From: Michael Droettboom <mdboom(a)gmail.com>
-Date: Thu, 27 Apr 2023 09:56:56 -0400
-Subject: [PATCH 08/12] Revert ubuntu-latest change
-
----
- .github/workflows/tests.yml | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
-index 060cc7f..fa48066 100644
---- a/.github/workflows/tests.yml
-+++ b/.github/workflows/tests.yml
-@@ -29,7 +29,7 @@ jobs:
- # Jan 2023: We have pinned back from ubuntu-latest (which is
- # now ubuntu 22.04) because older Python versions like
- # 3.5, 3.6 and presumably 2.7 are not available in it.
-- os: [ubuntu-latest, macos-latest]
-+ os: [ubuntu-20.04, macos-latest]
- exclude:
- - os: macos-latest
- python-version: 3.12-dev
-
-From d26952ec3fb74c1f1d68104a4ac80018deb0618c Mon Sep 17 00:00:00 2001
-From: Michael Droettboom <mdboom(a)gmail.com>
-Date: Thu, 27 Apr 2023 09:58:22 -0400
-Subject: [PATCH 09/12] Fix legacy versions
-
----
- src/greenlet/greenlet_greenlet.hpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/greenlet/greenlet_greenlet.hpp b/src/greenlet/greenlet_greenlet.hpp
-index 41fda8e..ffb23a7 100644
---- a/src/greenlet/greenlet_greenlet.hpp
-+++ b/src/greenlet/greenlet_greenlet.hpp
-@@ -896,7 +896,7 @@ void PythonState::operator>>(PyThreadState *const tstate) G_NOEXCEPT
- #else
- tstate->frame = this->_top_frame.relinquish_ownership();
- tstate->recursion_depth = this->recursion_depth;
-- tstate->trash.delete_nesting = this->trash_delete_nesting;
-+ tstate->trash_delete_nesting = this->trash_delete_nesting;
- #endif
- }
-
-
-From 82f9a8869d88616decb777bc6afae3a751a4a9c0 Mon Sep 17 00:00:00 2001
-From: Michael Droettboom <mdboom(a)gmail.com>
-Date: Thu, 27 Apr 2023 17:29:10 -0400
-Subject: [PATCH 10/12] Print precise Python version
-
----
- .github/workflows/tests.yml | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
-index fa48066..aa14318 100644
---- a/.github/workflows/tests.yml
-+++ b/.github/workflows/tests.yml
-@@ -80,6 +80,7 @@ jobs:
- path: dist/*whl
- - name: Test
- run: |
-+ python -VV
- python -c 'import greenlet._greenlet as G; assert G.GREENLET_USE_STANDARD_THREADING'
- python -m unittest discover -v greenlet.tests
- - name: Doctest
-
-From 3629e46c49533a994aa8f12ed3b41ae6725ab2ce Mon Sep 17 00:00:00 2001
-From: Michael Droettboom <mdboom(a)gmail.com>
-Date: Tue, 2 May 2023 10:48:37 -0400
-Subject: [PATCH 11/12] Fix recursion depth updating
-
----
- src/greenlet/greenlet_greenlet.hpp | 19 ++++++++++++++++---
- 1 file changed, 16 insertions(+), 3 deletions(-)
-
-diff --git a/src/greenlet/greenlet_greenlet.hpp b/src/greenlet/greenlet_greenlet.hpp
-index ffb23a7..10244e0 100644
---- a/src/greenlet/greenlet_greenlet.hpp
-+++ b/src/greenlet/greenlet_greenlet.hpp
-@@ -143,7 +143,12 @@ namespace greenlet
- _PyCFrame* cframe;
- int use_tracing;
- #endif
-+#if GREENLET_PY312
-+ int py_recursion_depth;
-+ int c_recursion_depth;
-+#else
- int recursion_depth;
-+#endif
- int trash_delete_nesting;
- #if GREENLET_PY311
- _PyInterpreterFrame* current_frame;
-@@ -748,7 +753,12 @@ PythonState::PythonState()
- ,cframe(nullptr)
- ,use_tracing(0)
- #endif
-+#if GREENLET_PY312
-+ ,py_recursion_depth(0)
-+ ,c_recursion_depth(0)
-+#else
- ,recursion_depth(0)
-+#endif
- ,trash_delete_nesting(0)
- #if GREENLET_PY311
- ,current_frame(nullptr)
-@@ -834,7 +844,8 @@ void PythonState::operator<<(const PyThreadState *const tstate) G_NOEXCEPT
- #endif
- #if GREENLET_PY311
- #if GREENLET_PY312
-- this->recursion_depth = tstate->py_recursion_limit - tstate->py_recursion_remaining;
-+ this->py_recursion_depth = tstate->py_recursion_limit - tstate->py_recursion_remaining;
-+ this->c_recursion_depth = C_RECURSION_LIMIT - tstate->c_recursion_remaining;
- #else
- this->recursion_depth = tstate->recursion_limit - tstate->recursion_remaining;
- #endif
-@@ -879,7 +890,8 @@ void PythonState::operator>>(PyThreadState *const tstate) G_NOEXCEPT
- #endif
- #if GREENLET_PY311
- #if GREENLET_PY312
-- tstate->py_recursion_remaining = tstate->py_recursion_limit - this->recursion_depth;
-+ tstate->py_recursion_remaining = tstate->py_recursion_limit - this->py_recursion_depth;
-+ tstate->c_recursion_remaining = C_RECURSION_LIMIT - this->c_recursion_depth;
- #else
- tstate->recursion_remaining = tstate->recursion_limit - this->recursion_depth;
- #endif
-@@ -915,7 +927,8 @@ void PythonState::set_initial_state(const PyThreadState* const tstate) G_NOEXCEP
- {
- this->_top_frame = nullptr;
- #if GREENLET_PY312
-- this->recursion_depth = tstate->py_recursion_limit - tstate->py_recursion_remaining;
-+ this->py_recursion_depth = tstate->py_recursion_limit - tstate->py_recursion_remaining;
-+ this->c_recursion_depth = tstate->py_recursion_limit - tstate->py_recursion_remaining;
- #elif GREENLET_PY311
- this->recursion_depth = tstate->recursion_limit - tstate->recursion_remaining;
- #else
-
-From 6bba85fdfd0acd1484780fae7a537e3dac99c067 Mon Sep 17 00:00:00 2001
-From: Michael Droettboom <mdboom(a)gmail.com>
-Date: Tue, 30 May 2023 12:14:22 -0400
-Subject: [PATCH 12/12] Insert blank line
-
----
- src/greenlet/greenlet.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/greenlet/greenlet.cpp b/src/greenlet/greenlet.cpp
-index b382c5a..677fce8 100644
---- a/src/greenlet/greenlet.cpp
-+++ b/src/greenlet/greenlet.cpp
-@@ -3092,6 +3092,7 @@ static PyObject*
- mod_get_tstate_trash_delete_nesting(PyObject* UNUSED(module))
- {
- PyThreadState* tstate = PyThreadState_GET();
-+
- #if GREENLET_PY312
- return PyLong_FromLong(tstate->trash.delete_nesting);
- #else
diff --git a/python-greenlet.spec b/python-greenlet.spec
index 08cdd11..6de9f04 100644
--- a/python-greenlet.spec
+++ b/python-greenlet.spec
@@ -1,16 +1,12 @@
%global modname greenlet
Name: python-%{modname}
-Version: 2.0.2
-Release: 3%{?dist}
+Version: 3.0.0~a1
+Release: 1%{?dist}
Summary: Lightweight in-process concurrent programming
License: MIT AND PSF-2.0
URL: https://github.com/python-greenlet/greenlet
-Source0: %{url}/archive/%{version}/%{modname}-%{version}.tar.gz
-
-# Patch needed for compatibility with Python 3.12
-# From: https://github.com/python-greenlet/greenlet/pull/327
-Patch: https://github.com/python-greenlet/greenlet/pull/327.patch
+Source0: %{url}/archive/3.0.0a1/%{modname}-3.0.0a1.tar.gz
# Skip leak checking to avoid a missing dependency, `objgraph`
Patch: skip-leak-checks.patch
@@ -49,7 +45,7 @@ Requires: python3-%{modname}%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{rel
Python 3 version.
%prep
-%autosetup -n %{modname}-%{version} -p1
+%autosetup -n %{modname}-3.0.0a1 -p1
%build
%py3_build
@@ -74,6 +70,9 @@ PYTHONPATH="%{buildroot}%{python3_sitearch}" \
%{_includedir}/python%{python3_version}*/%{modname}/
%changelog
+* Sun Aug 13 2023 Orion Poplawski <orion(a)nwra.com> - 3.0.0~a1-1
+- Update to 3.0.0a1
+
* Sat Aug 05 2023 Ondřej Budai <ondrej(a)budai.cz> - 2.0.2-3
- SPDX migration
diff --git a/sources b/sources
index 1a884c1..d54ddc6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (greenlet-2.0.2.tar.gz) = 4817fa870a8c40c86a63d17edc870cb6514d074ff3e1a99b6319ec3124f5cb22146b036f0a4f5dd39d003c81eace894c6b89abc6d562c40558ea2d5351c89103
+SHA512 (greenlet-3.0.0a1.tar.gz) = 97560c4422a8dcf04521416c7184f78259ec64445d379328e70489abd3105d30466bd72120c83c5d08575863b589af9beef49bdfe749170c7c7db42ae5aa93c2
https://src.fedoraproject.org/rpms/python-greenlet/c/5df663d3e5614f76b006...
3Â months, 1Â week
decathorpe pushed to rpms/rust-dolby_vision (f38). "Update to
version 3.2.0; Fixes RHBZ#2229769"
by notificationsï¼ fedoraproject.org
Notification time stamped 2023-08-31 23:27:30 UTC
From 433cfc957aefec3eea28fd602c8047e8bd94e540 Mon Sep 17 00:00:00 2001
From: Fabio Valentini <decathorpe(a)gmail.com>
Date: Aug 27 2023 15:05:51 +0000
Subject: Update to version 3.2.0; Fixes RHBZ#2229769
---
diff --git a/dolby_vision-fix-metadata.diff b/dolby_vision-fix-metadata.diff
new file mode 100644
index 0000000..d4bc602
--- /dev/null
+++ b/dolby_vision-fix-metadata.diff
@@ -0,0 +1,24 @@
+--- dolby_vision-3.2.0/Cargo.toml 1970-01-01T00:00:01+00:00
++++ dolby_vision-3.2.0/Cargo.toml 2023-08-27T14:45:23.250385+00:00
+@@ -39,10 +39,7 @@
+
+ [lib]
+ doctest = false
+-
+-[[bench]]
+-name = "bench_main"
+-harness = false
++crate-type = ["lib", "cdylib"]
+
+ [dependencies.anyhow]
+ version = "1.0.72"
+@@ -76,9 +73,6 @@
+ features = ["preserve_order"]
+ optional = true
+
+-[dev-dependencies.criterion]
+-version = "0.5.1"
+-
+ [features]
+ capi = ["libc"]
+ serde = [
diff --git a/rust-dolby_vision-deps.patch b/rust-dolby_vision-deps.patch
deleted file mode 100644
index 2c64305..0000000
--- a/rust-dolby_vision-deps.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -up dolby_vision-3.1.2/Cargo.toml.orig dolby_vision-3.1.2/Cargo.toml
---- dolby_vision-3.1.2/Cargo.toml.orig 1970-01-01 01:00:01.000000000 +0100
-+++ dolby_vision-3.1.2/Cargo.toml 2023-06-21 10:53:53.100347261 +0200
-@@ -76,9 +76,6 @@ version = "1.0.93"
- features = ["preserve_order"]
- optional = true
-
--[dev-dependencies.criterion]
--version = "0.4.0"
--
- [features]
- capi = ["libc"]
- serde = [
diff --git a/rust-dolby_vision.spec b/rust-dolby_vision.spec
index f80e36d..ee572db 100644
--- a/rust-dolby_vision.spec
+++ b/rust-dolby_vision.spec
@@ -1,26 +1,63 @@
# Generated by rust2rpm 24
%bcond_without check
-%global debug_package %{nil}
%global crate dolby_vision
Name: rust-dolby_vision
-Version: 3.1.2
+Version: 3.2.0
Release: %autorelease
Summary: Dolby Vision metadata parsing and writing
License: MIT
URL: https://crates.io/crates/dolby_vision
Source: %{crates_source}
-Patch: %{name}-deps.patch
+# Manually created patch for downstream crate metadata changes
+# * drop unused, benchmark-only criterion dev-dependency to speed up builds
+# * explicitly mark library as a "cdylib" type to fix spec generation
+Patch: dolby_vision-fix-metadata.diff
BuildRequires: cargo-rpm-macros >= 24
+BuildRequires: cargo-c
%global _description %{expand:
Dolby Vision metadata parsing and writing.}
%description %{_description}
+%package -n libdovi
+Summary: %{summary}
+# Apache-2.0 OR BSL-1.0
+# Apache-2.0 OR MIT
+# MIT
+# MIT OR Apache-2.0
+License: MIT AND (Apache-2.0 OR BSL-1.0) AND (Apache-2.0 OR MIT)
+# LICENSE.dependencies contains a full license breakdown
+
+%description -n libdovi %{_description}
+
+This package contains the C library.
+
+%files -n libdovi
+%license LICENSE
+%license LICENSE.dependencies
+%doc CHANGELOG.md
+%doc README.md
+%{_libdir}/libdovi.so.3{,.*}
+
+%package -n libdovi-devel
+Summary: %{summary}
+Requires: libdovi%{?_isa} = %{version}-%{release}
+
+%description -n libdovi-devel %{_description}
+
+This package contains the C library development files.
+
+%files -n libdovi-devel
+%{_libdir}/libdovi.so
+%{_libdir}/pkgconfig/dovi.pc
+%dir %{_includedir}/libdovi
+%{_includedir}/libdovi/rpu_parser.h
+
%package devel
Summary: %{summary}
BuildArch: noarch
@@ -108,74 +145,29 @@ use the "xml" feature of the "%{crate}" crate.
%files -n %{name}+xml-devel
%ghost %{crate_instdir}/Cargo.toml
-%package -n libdovi
-Summary: %{summary}
-BuildRequires: cargo-c
-BuildRequires: rust-indexmap-devel
-BuildRequires: rust-roxmltree-devel
-
-%description -n libdovi %{_description}
-
-This package contains the C library.
-
-%package -n libdovi-devel
-Summary: %{summary}
-Requires: libdovi%{_isa} = %{version}-%{release}
-
-%description -n libdovi-devel %{_description}
-
-This package contains the C library development files.
-
-
%prep
%autosetup -n %{crate}-%{version_no_tilde} -p1
%cargo_prep
%generate_buildrequires
-%cargo_generate_buildrequires
%cargo_generate_buildrequires -a
-echo "cargo-c"
%build
-%cargo_build
-%{__cargo} cbuild \
- %{__cargo_common_opts} \
- --release \
- --library-type=cdylib \
- --destdir=%{buildroot} \
- --prefix=%{_prefix} \
- --includedir=%{_includedir} \
- --libdir=%{_libdir} \
-
+%cargo_build -a
+%cargo_cbuild --all-features
+%{cargo_license_summary -a}
+%{cargo_license -a} > LICENSE.dependencies
%install
-%cargo_install
-%{__cargo} cinstall \
- %{?_smp_mflags} \
- --release \
- --library-type=cdylib \
- --destdir=%{buildroot} \
- --prefix=%{_prefix} \
- --includedir=%{_includedir} \
- --libdir=%{_libdir} \
-
+%cargo_install -a
+%cargo_cinstall --all-features
+rm %{buildroot}/%{_libdir}/libdovi.a
%if %{with check}
%check
-%cargo_test
+# * skip tests that require files that are not included in published crates
+%cargo_test -a -- -- --skip rpu::generate::tests::config_with_frame_edits --skip xml::tests::parse
%endif
-%files -n libdovi-devel
-%doc examples README.md
-%{_libdir}/libdovi.so
-%{_libdir}/pkgconfig/dovi.pc
-%dir %{_includedir}/libdovi
-%{_includedir}/libdovi/rpu_parser.h
-
-%files -n libdovi
-%license LICENSE
-%doc CHANGELOG.md
-%{_libdir}/libdovi.so.3{,.*}
-
%changelog
%autochangelog
diff --git a/rust2rpm.conf b/rust2rpm.conf
new file mode 100644
index 0000000..f626714
--- /dev/null
+++ b/rust2rpm.conf
@@ -0,0 +1,2 @@
+[DEFAULT]
+all-features = true
diff --git a/sources b/sources
index 6d01591..cbe4df1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (dolby_vision-3.1.2.crate) = 00047358237d284b9c0d144b5edf3fac83a1273bf7b2cd658bf3bcd8634358c3a2d026fcb4e49247b7c74be127a06a8b0c142d72dfbfc363a974007c1552bca4
+SHA512 (dolby_vision-3.2.0.crate) = 191d103aa52a5a1330b290145218420f4ff26b2772b4812873b6b455c6b976a3e2bdfb7195943dec0d58515ad338d42451fd4b8563e653ce5e49556c90e1bd2e
https://src.fedoraproject.org/rpms/rust-dolby_vision/c/433cfc957aefec3eea...
3Â months, 1Â week