carlwgeorge pushed to rpms/python-gunicorn (f39). "Update to version
21.2.0, resolves rhbz#2223435"
by notificationsï¼ fedoraproject.org
Notification time stamped 2023-09-01 02:03:26 UTC
From 90a96a7248e280ba53f7ddfe24db88a4aa3a4319 Mon Sep 17 00:00:00 2001
From: Carl George <carlwgeorge(a)fedoraproject.org>
Date: Sep 01 2023 00:27:41 +0000
Subject: Update to version 21.2.0, resolves rhbz#2223435
---
diff --git a/.gitignore b/.gitignore
index 7333972..1b42e02 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,4 @@
/gunicorn-20.0.2.tar.gz
/gunicorn-20.0.4.tar.gz
/gunicorn-20.1.0.tar.gz
+/gunicorn-21.2.0.tar.gz
diff --git a/0002-eventlet-worker-ALREADY_HANDLED-WSGI_LOCAL.patch b/0002-eventlet-worker-ALREADY_HANDLED-WSGI_LOCAL.patch
deleted file mode 100644
index 7067d9c..0000000
--- a/0002-eventlet-worker-ALREADY_HANDLED-WSGI_LOCAL.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 153bf73a2ea2f23681f5cec19a90f212a36fdab9 Mon Sep 17 00:00:00 2001
-From: Sergey Shepelev <temotor(a)gmail.com>
-Date: Thu, 6 May 2021 12:54:06 +0300
-Subject: [PATCH 2/2] eventlet worker: ALREADY_HANDLED -> WSGI_LOCAL
-
-Eventlet v0.30.3+ removed wsgi.ALREADY_HANDLED in favor of
-`wsgi.WSGI_LOCAL.already_handled: bool`
-
-Sorry, this breaking change happened during only patch
-version increase 0.30.2 -> 0.30.3
-
-https://github.com/eventlet/eventlet/issues/543
-https://github.com/eventlet/eventlet/pull/544
-(cherry picked from commit 6a8ebb4844b2f28596ffe7421eb9f7d08c8dc4d8)
----
- gunicorn/workers/geventlet.py | 11 ++++++++++-
- 1 file changed, 10 insertions(+), 1 deletion(-)
-
-diff --git a/gunicorn/workers/geventlet.py b/gunicorn/workers/geventlet.py
-index ffdb206c..ea82f3d6 100644
---- a/gunicorn/workers/geventlet.py
-+++ b/gunicorn/workers/geventlet.py
-@@ -17,11 +17,16 @@ else:
-
- from eventlet import hubs, greenthread
- from eventlet.greenio import GreenSocket
--from eventlet.wsgi import ALREADY_HANDLED as EVENTLET_ALREADY_HANDLED
-+import eventlet.wsgi
- import greenlet
-
- from gunicorn.workers.base_async import AsyncWorker
-
-+# ALREADY_HANDLED is removed in 0.30.3+ now it's `WSGI_LOCAL.already_handled: bool`
-+# https://github.com/eventlet/eventlet/pull/544
-+EVENTLET_WSGI_LOCAL = getattr(eventlet.wsgi, "WSGI_LOCAL", None)
-+EVENTLET_ALREADY_HANDLED = getattr(eventlet.wsgi, "ALREADY_HANDLED", None)
-+
-
- def _eventlet_socket_sendfile(self, file, offset=0, count=None):
- # Based on the implementation in gevent which in turn is slightly
-@@ -125,6 +130,10 @@ class EventletWorker(AsyncWorker):
- patch_sendfile()
-
- def is_already_handled(self, respiter):
-+ # eventlet >= 0.30.3
-+ if getattr(EVENTLET_WSGI_LOCAL, "already_handled", None):
-+ raise StopIteration()
-+ # eventlet < 0.30.3
- if respiter == EVENTLET_ALREADY_HANDLED:
- raise StopIteration()
- return super().is_already_handled(respiter)
---
-2.35.3
-
diff --git a/gunicorn-20.1.0-remove-setuptools.patch b/gunicorn-20.1.0-remove-setuptools.patch
deleted file mode 100644
index b50d0fe..0000000
--- a/gunicorn-20.1.0-remove-setuptools.patch
+++ /dev/null
@@ -1,163 +0,0 @@
-From 3e27f6b994358cba4768e8d9b6dc4905ed46e227 Mon Sep 17 00:00:00 2001
-From: Tal Einat <532281+taleinat(a)users.noreply.github.com>
-Date: Wed, 22 Mar 2023 21:53:05 +0200
-Subject: [PATCH 1/3] Replace pkg_resources.parse_version with
- packaging.version.parse
-
-This is a step towards removing the dependency on pkg_resources, which is part
-of setuptools, and thus makes setuptools a runtime dependency.
----
- gunicorn/workers/geventlet.py | 2 +-
- gunicorn/workers/ggevent.py | 2 +-
- setup.py | 1 +
- 3 files changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/gunicorn/workers/geventlet.py b/gunicorn/workers/geventlet.py
-index ffdb206c..349abe28 100644
---- a/gunicorn/workers/geventlet.py
-+++ b/gunicorn/workers/geventlet.py
-@@ -11,7 +11,7 @@ try:
- except ImportError:
- raise RuntimeError("eventlet worker requires eventlet 0.24.1 or higher")
- else:
-- from pkg_resources import parse_version
-+ from packaging.version import parse as parse_version
- if parse_version(eventlet.__version__) < parse_version('0.24.1'):
- raise RuntimeError("eventlet worker requires eventlet 0.24.1 or higher")
-
-diff --git a/gunicorn/workers/ggevent.py b/gunicorn/workers/ggevent.py
-index 3941814f..347b8623 100644
---- a/gunicorn/workers/ggevent.py
-+++ b/gunicorn/workers/ggevent.py
-@@ -14,7 +14,7 @@ try:
- except ImportError:
- raise RuntimeError("gevent worker requires gevent 1.4 or higher")
- else:
-- from pkg_resources import parse_version
-+ from packaging.version import parse as parse_version
- if parse_version(gevent.__version__) < parse_version('1.4'):
- raise RuntimeError("gevent worker requires gevent 1.4 or higher")
-
-diff --git a/setup.py b/setup.py
-index fb220d90..dab2b9f4 100644
---- a/setup.py
-+++ b/setup.py
-@@ -74,6 +74,7 @@ install_requires = [
- # is the first version to support Python 3.4 which we require as a
- # floor.
- 'setuptools>=3.0',
-+ 'packaging',
- ]
-
- extras_require = {
---
-2.39.2
-
-
-From 28109b2239ec72f1ed2e98ee7fa41ee0faac3f25 Mon Sep 17 00:00:00 2001
-From: Tal Einat <532281+taleinat(a)users.noreply.github.com>
-Date: Wed, 22 Mar 2023 21:56:52 +0200
-Subject: [PATCH 2/3] Add myself to THANKS
-
----
- THANKS | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/THANKS b/THANKS
-index 2b226f35..4cd47416 100644
---- a/THANKS
-+++ b/THANKS
-@@ -163,6 +163,7 @@ Stephen DiCato <Locker537(a)gmail.com>
- Stephen Holsapple <sholsapp(a)gmail.com>
- Steven Cummings <estebistec(a)gmail.com>
- Sébastien Fievet <zyegfryed(a)gmail.com>
-+Tal Einat <532281+taleinat(a)users.noreply.github.com>
- Talha Malik <talham7391(a)hotmail.com>
- TedWantsMore <TedWantsMore(a)gmx.com>
- Thomas Grainger <tagrain(a)gmail.com>
---
-2.39.2
-
-
-From b1815efd5430b29b0ec0dd61c238e4815eaf3c12 Mon Sep 17 00:00:00 2001
-From: Maxwell G <maxwell(a)gtmx.me>
-Date: Tue, 4 Apr 2023 18:50:22 +0000
-Subject: [PATCH 3/3] replace pkg_resources.load_entry_point
-
-pkg_resources is deprecated. Use the corresponding importlib.metadata
-interface instead. Use the stdlib version on python >= 3.8 and use the
-importlib_metadata backport on older versions.
----
- gunicorn/util.py | 17 ++++++++++++++---
- setup.py | 6 +-----
- 2 files changed, 15 insertions(+), 8 deletions(-)
-
-diff --git a/gunicorn/util.py b/gunicorn/util.py
-index a821e357..c490852e 100644
---- a/gunicorn/util.py
-+++ b/gunicorn/util.py
-@@ -22,7 +22,10 @@ import time
- import traceback
- import warnings
-
--import pkg_resources
-+try:
-+ import importlib.metadata as importlib_metadata
-+except:
-+ import importlib_metadata
-
- from gunicorn.errors import AppImportError
- from gunicorn.workers import SUPPORTED_WORKERS
-@@ -53,6 +56,14 @@ except ImportError:
- def _setproctitle(title):
- pass
-
-+def load_entry_point(distribution, group, name):
-+ dist_obj = importlib_metadata.distribution(distribution)
-+ eps = [ep for ep in dist_obj.entry_points
-+ if ep.group == group and ep.name == name]
-+ if not eps:
-+ raise ImportError("Entry point %r not found" % ((group, name),))
-+ return eps[0].load()
-+
-
- def load_class(uri, default="gunicorn.workers.sync.SyncWorker",
- section="gunicorn.workers"):
-@@ -68,7 +79,7 @@ def load_class(uri, default="gunicorn.workers.sync.SyncWorker",
- name = default
-
- try:
-- return pkg_resources.load_entry_point(dist, section, name)
-+ return load_entry_point(dist, section, name)
- except Exception:
- exc = traceback.format_exc()
- msg = "class uri %r invalid or not found: \n\n[%s]"
-@@ -85,7 +96,7 @@ def load_class(uri, default="gunicorn.workers.sync.SyncWorker",
- break
-
- try:
-- return pkg_resources.load_entry_point(
-+ return load_entry_point(
- "gunicorn", section, uri
- )
- except Exception:
-diff --git a/setup.py b/setup.py
-index dab2b9f4..4bc3566b 100644
---- a/setup.py
-+++ b/setup.py
-@@ -69,11 +69,7 @@ class PyTestCommand(TestCommand):
-
-
- install_requires = [
-- # We depend on functioning pkg_resources.working_set.add_entry() and
-- # pkg_resources.load_entry_point(). These both work as of 3.0 which
-- # is the first version to support Python 3.4 which we require as a
-- # floor.
-- 'setuptools>=3.0',
-+ 'importlib_metadata; python_version<"3.8"',
- 'packaging',
- ]
-
---
-2.39.2
-
diff --git a/python-gunicorn.spec b/python-gunicorn.spec
index aabf838..aae5fd9 100644
--- a/python-gunicorn.spec
+++ b/python-gunicorn.spec
@@ -6,34 +6,14 @@ web frameworks, simply implemented, light on server resources, and fairly
speedy.}
Name: python-%{srcname}
-Version: 20.1.0
-Release: 12%{?dist}
+Version: 21.2.0
+Release: 1%{?dist}
Summary: Python WSGI HTTP Server
License: MIT
URL: https://gunicorn.org/
Source: %pypi_source %{srcname}
# distro-specific, not upstreamable
Patch: 0001-use-dev-log-for-syslog.patch
-# Patch for newer eventlet
-# https://github.com/benoitc/gunicorn/commit/6a8ebb4844b2f28596ffe7421eb9f7...
-Patch: 0002-eventlet-worker-ALREADY_HANDLED-WSGI_LOCAL.patch
-# The following patch contains the changes from the following two upstream
-# PR’s, rebased on the 20.1.0 release and combined into a single patch file.
-#
-# 2747-Replace pkg_resources.parse_version with packaging.version.parse
-# https://github.com/benoitc/gunicorn/pull/2958
-#
-# replace pkg_resources.load_entry_point
-# https://github.com/benoitc/gunicorn/pull/2963
-#
-# Applying this patch eliminates a DeprecationWarning that was produced when
-# importing pkg_resources (with recent setuptools versions). That warning was
-# treated as an error in the tests for python-aiohttp, so this patch also
-# fixes:
-#
-# python-aiohttp fails to build with the latest setuptools version
-# https://bugzilla.redhat.com/show_bug.cgi?id=2183385
-Patch: gunicorn-20.1.0-remove-setuptools.patch
BuildArch: noarch
%description %{_description}
@@ -55,8 +35,6 @@ Documentation for the %{name} package.
%autosetup -n %{srcname}-%{version} -p 1
# disable code coverage checks
sed -e '/coverage/d' -e '/pytest-cov/d' -i requirements_test.txt
-# Unneeded - https://github.com/benoitc/gunicorn/issues/3014
-sed -e '/aiohttp/d' -i requirements_test.txt
sed -e '/addopts/d' -i setup.cfg
%generate_buildrequires
@@ -87,6 +65,9 @@ ln -s %{_bindir}/gunicorn %{buildroot}%{_bindir}/gunicorn-%{python3_version}
%doc docs/build/html/*
%changelog
+* Thu Aug 31 2023 Carl George <carlwgeorge(a)fedoraproject.org> - 21.2.0-1
+- Update to version 21.2.0, resolves rhbz#2223435
+
* Fri Jul 21 2023 Fedora Release Engineering <releng(a)fedoraproject.org> - 20.1.0-12
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
diff --git a/sources b/sources
index 02996da..cc9c972 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (gunicorn-20.1.0.tar.gz) = 586c7373504b4018fd462dc9c728991a8cc9f2be71fc2fb5aa23707ff6157dd3953121f6a070cae64d58b10f9ddf77ad59b66ed33981d37919b4764c60609027
+SHA512 (gunicorn-21.2.0.tar.gz) = 5d3117133ecbf9b8fded9c0ce69206916d273c284726d2a62e1d1d107560f22593baab032afa51e71b004a8b1e47afafd3fd1350b850ca45c1d7064075b795d3
https://src.fedoraproject.org/rpms/python-gunicorn/c/90a96a7248e280ba53f7...
9Â months
pagure pushed to rpms/python-gunicorn (rawhide). "Update to version
21.2.0, resolves rhbz#2223435"
by notificationsï¼ fedoraproject.org
Notification time stamped 2023-09-01 02:01:45 UTC
From 90a96a7248e280ba53f7ddfe24db88a4aa3a4319 Mon Sep 17 00:00:00 2001
From: Carl George <carlwgeorge(a)fedoraproject.org>
Date: Sep 01 2023 00:27:41 +0000
Subject: Update to version 21.2.0, resolves rhbz#2223435
---
diff --git a/.gitignore b/.gitignore
index 7333972..1b42e02 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,4 @@
/gunicorn-20.0.2.tar.gz
/gunicorn-20.0.4.tar.gz
/gunicorn-20.1.0.tar.gz
+/gunicorn-21.2.0.tar.gz
diff --git a/0002-eventlet-worker-ALREADY_HANDLED-WSGI_LOCAL.patch b/0002-eventlet-worker-ALREADY_HANDLED-WSGI_LOCAL.patch
deleted file mode 100644
index 7067d9c..0000000
--- a/0002-eventlet-worker-ALREADY_HANDLED-WSGI_LOCAL.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 153bf73a2ea2f23681f5cec19a90f212a36fdab9 Mon Sep 17 00:00:00 2001
-From: Sergey Shepelev <temotor(a)gmail.com>
-Date: Thu, 6 May 2021 12:54:06 +0300
-Subject: [PATCH 2/2] eventlet worker: ALREADY_HANDLED -> WSGI_LOCAL
-
-Eventlet v0.30.3+ removed wsgi.ALREADY_HANDLED in favor of
-`wsgi.WSGI_LOCAL.already_handled: bool`
-
-Sorry, this breaking change happened during only patch
-version increase 0.30.2 -> 0.30.3
-
-https://github.com/eventlet/eventlet/issues/543
-https://github.com/eventlet/eventlet/pull/544
-(cherry picked from commit 6a8ebb4844b2f28596ffe7421eb9f7d08c8dc4d8)
----
- gunicorn/workers/geventlet.py | 11 ++++++++++-
- 1 file changed, 10 insertions(+), 1 deletion(-)
-
-diff --git a/gunicorn/workers/geventlet.py b/gunicorn/workers/geventlet.py
-index ffdb206c..ea82f3d6 100644
---- a/gunicorn/workers/geventlet.py
-+++ b/gunicorn/workers/geventlet.py
-@@ -17,11 +17,16 @@ else:
-
- from eventlet import hubs, greenthread
- from eventlet.greenio import GreenSocket
--from eventlet.wsgi import ALREADY_HANDLED as EVENTLET_ALREADY_HANDLED
-+import eventlet.wsgi
- import greenlet
-
- from gunicorn.workers.base_async import AsyncWorker
-
-+# ALREADY_HANDLED is removed in 0.30.3+ now it's `WSGI_LOCAL.already_handled: bool`
-+# https://github.com/eventlet/eventlet/pull/544
-+EVENTLET_WSGI_LOCAL = getattr(eventlet.wsgi, "WSGI_LOCAL", None)
-+EVENTLET_ALREADY_HANDLED = getattr(eventlet.wsgi, "ALREADY_HANDLED", None)
-+
-
- def _eventlet_socket_sendfile(self, file, offset=0, count=None):
- # Based on the implementation in gevent which in turn is slightly
-@@ -125,6 +130,10 @@ class EventletWorker(AsyncWorker):
- patch_sendfile()
-
- def is_already_handled(self, respiter):
-+ # eventlet >= 0.30.3
-+ if getattr(EVENTLET_WSGI_LOCAL, "already_handled", None):
-+ raise StopIteration()
-+ # eventlet < 0.30.3
- if respiter == EVENTLET_ALREADY_HANDLED:
- raise StopIteration()
- return super().is_already_handled(respiter)
---
-2.35.3
-
diff --git a/gunicorn-20.1.0-remove-setuptools.patch b/gunicorn-20.1.0-remove-setuptools.patch
deleted file mode 100644
index b50d0fe..0000000
--- a/gunicorn-20.1.0-remove-setuptools.patch
+++ /dev/null
@@ -1,163 +0,0 @@
-From 3e27f6b994358cba4768e8d9b6dc4905ed46e227 Mon Sep 17 00:00:00 2001
-From: Tal Einat <532281+taleinat(a)users.noreply.github.com>
-Date: Wed, 22 Mar 2023 21:53:05 +0200
-Subject: [PATCH 1/3] Replace pkg_resources.parse_version with
- packaging.version.parse
-
-This is a step towards removing the dependency on pkg_resources, which is part
-of setuptools, and thus makes setuptools a runtime dependency.
----
- gunicorn/workers/geventlet.py | 2 +-
- gunicorn/workers/ggevent.py | 2 +-
- setup.py | 1 +
- 3 files changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/gunicorn/workers/geventlet.py b/gunicorn/workers/geventlet.py
-index ffdb206c..349abe28 100644
---- a/gunicorn/workers/geventlet.py
-+++ b/gunicorn/workers/geventlet.py
-@@ -11,7 +11,7 @@ try:
- except ImportError:
- raise RuntimeError("eventlet worker requires eventlet 0.24.1 or higher")
- else:
-- from pkg_resources import parse_version
-+ from packaging.version import parse as parse_version
- if parse_version(eventlet.__version__) < parse_version('0.24.1'):
- raise RuntimeError("eventlet worker requires eventlet 0.24.1 or higher")
-
-diff --git a/gunicorn/workers/ggevent.py b/gunicorn/workers/ggevent.py
-index 3941814f..347b8623 100644
---- a/gunicorn/workers/ggevent.py
-+++ b/gunicorn/workers/ggevent.py
-@@ -14,7 +14,7 @@ try:
- except ImportError:
- raise RuntimeError("gevent worker requires gevent 1.4 or higher")
- else:
-- from pkg_resources import parse_version
-+ from packaging.version import parse as parse_version
- if parse_version(gevent.__version__) < parse_version('1.4'):
- raise RuntimeError("gevent worker requires gevent 1.4 or higher")
-
-diff --git a/setup.py b/setup.py
-index fb220d90..dab2b9f4 100644
---- a/setup.py
-+++ b/setup.py
-@@ -74,6 +74,7 @@ install_requires = [
- # is the first version to support Python 3.4 which we require as a
- # floor.
- 'setuptools>=3.0',
-+ 'packaging',
- ]
-
- extras_require = {
---
-2.39.2
-
-
-From 28109b2239ec72f1ed2e98ee7fa41ee0faac3f25 Mon Sep 17 00:00:00 2001
-From: Tal Einat <532281+taleinat(a)users.noreply.github.com>
-Date: Wed, 22 Mar 2023 21:56:52 +0200
-Subject: [PATCH 2/3] Add myself to THANKS
-
----
- THANKS | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/THANKS b/THANKS
-index 2b226f35..4cd47416 100644
---- a/THANKS
-+++ b/THANKS
-@@ -163,6 +163,7 @@ Stephen DiCato <Locker537(a)gmail.com>
- Stephen Holsapple <sholsapp(a)gmail.com>
- Steven Cummings <estebistec(a)gmail.com>
- Sébastien Fievet <zyegfryed(a)gmail.com>
-+Tal Einat <532281+taleinat(a)users.noreply.github.com>
- Talha Malik <talham7391(a)hotmail.com>
- TedWantsMore <TedWantsMore(a)gmx.com>
- Thomas Grainger <tagrain(a)gmail.com>
---
-2.39.2
-
-
-From b1815efd5430b29b0ec0dd61c238e4815eaf3c12 Mon Sep 17 00:00:00 2001
-From: Maxwell G <maxwell(a)gtmx.me>
-Date: Tue, 4 Apr 2023 18:50:22 +0000
-Subject: [PATCH 3/3] replace pkg_resources.load_entry_point
-
-pkg_resources is deprecated. Use the corresponding importlib.metadata
-interface instead. Use the stdlib version on python >= 3.8 and use the
-importlib_metadata backport on older versions.
----
- gunicorn/util.py | 17 ++++++++++++++---
- setup.py | 6 +-----
- 2 files changed, 15 insertions(+), 8 deletions(-)
-
-diff --git a/gunicorn/util.py b/gunicorn/util.py
-index a821e357..c490852e 100644
---- a/gunicorn/util.py
-+++ b/gunicorn/util.py
-@@ -22,7 +22,10 @@ import time
- import traceback
- import warnings
-
--import pkg_resources
-+try:
-+ import importlib.metadata as importlib_metadata
-+except:
-+ import importlib_metadata
-
- from gunicorn.errors import AppImportError
- from gunicorn.workers import SUPPORTED_WORKERS
-@@ -53,6 +56,14 @@ except ImportError:
- def _setproctitle(title):
- pass
-
-+def load_entry_point(distribution, group, name):
-+ dist_obj = importlib_metadata.distribution(distribution)
-+ eps = [ep for ep in dist_obj.entry_points
-+ if ep.group == group and ep.name == name]
-+ if not eps:
-+ raise ImportError("Entry point %r not found" % ((group, name),))
-+ return eps[0].load()
-+
-
- def load_class(uri, default="gunicorn.workers.sync.SyncWorker",
- section="gunicorn.workers"):
-@@ -68,7 +79,7 @@ def load_class(uri, default="gunicorn.workers.sync.SyncWorker",
- name = default
-
- try:
-- return pkg_resources.load_entry_point(dist, section, name)
-+ return load_entry_point(dist, section, name)
- except Exception:
- exc = traceback.format_exc()
- msg = "class uri %r invalid or not found: \n\n[%s]"
-@@ -85,7 +96,7 @@ def load_class(uri, default="gunicorn.workers.sync.SyncWorker",
- break
-
- try:
-- return pkg_resources.load_entry_point(
-+ return load_entry_point(
- "gunicorn", section, uri
- )
- except Exception:
-diff --git a/setup.py b/setup.py
-index dab2b9f4..4bc3566b 100644
---- a/setup.py
-+++ b/setup.py
-@@ -69,11 +69,7 @@ class PyTestCommand(TestCommand):
-
-
- install_requires = [
-- # We depend on functioning pkg_resources.working_set.add_entry() and
-- # pkg_resources.load_entry_point(). These both work as of 3.0 which
-- # is the first version to support Python 3.4 which we require as a
-- # floor.
-- 'setuptools>=3.0',
-+ 'importlib_metadata; python_version<"3.8"',
- 'packaging',
- ]
-
---
-2.39.2
-
diff --git a/python-gunicorn.spec b/python-gunicorn.spec
index aabf838..aae5fd9 100644
--- a/python-gunicorn.spec
+++ b/python-gunicorn.spec
@@ -6,34 +6,14 @@ web frameworks, simply implemented, light on server resources, and fairly
speedy.}
Name: python-%{srcname}
-Version: 20.1.0
-Release: 12%{?dist}
+Version: 21.2.0
+Release: 1%{?dist}
Summary: Python WSGI HTTP Server
License: MIT
URL: https://gunicorn.org/
Source: %pypi_source %{srcname}
# distro-specific, not upstreamable
Patch: 0001-use-dev-log-for-syslog.patch
-# Patch for newer eventlet
-# https://github.com/benoitc/gunicorn/commit/6a8ebb4844b2f28596ffe7421eb9f7...
-Patch: 0002-eventlet-worker-ALREADY_HANDLED-WSGI_LOCAL.patch
-# The following patch contains the changes from the following two upstream
-# PR’s, rebased on the 20.1.0 release and combined into a single patch file.
-#
-# 2747-Replace pkg_resources.parse_version with packaging.version.parse
-# https://github.com/benoitc/gunicorn/pull/2958
-#
-# replace pkg_resources.load_entry_point
-# https://github.com/benoitc/gunicorn/pull/2963
-#
-# Applying this patch eliminates a DeprecationWarning that was produced when
-# importing pkg_resources (with recent setuptools versions). That warning was
-# treated as an error in the tests for python-aiohttp, so this patch also
-# fixes:
-#
-# python-aiohttp fails to build with the latest setuptools version
-# https://bugzilla.redhat.com/show_bug.cgi?id=2183385
-Patch: gunicorn-20.1.0-remove-setuptools.patch
BuildArch: noarch
%description %{_description}
@@ -55,8 +35,6 @@ Documentation for the %{name} package.
%autosetup -n %{srcname}-%{version} -p 1
# disable code coverage checks
sed -e '/coverage/d' -e '/pytest-cov/d' -i requirements_test.txt
-# Unneeded - https://github.com/benoitc/gunicorn/issues/3014
-sed -e '/aiohttp/d' -i requirements_test.txt
sed -e '/addopts/d' -i setup.cfg
%generate_buildrequires
@@ -87,6 +65,9 @@ ln -s %{_bindir}/gunicorn %{buildroot}%{_bindir}/gunicorn-%{python3_version}
%doc docs/build/html/*
%changelog
+* Thu Aug 31 2023 Carl George <carlwgeorge(a)fedoraproject.org> - 21.2.0-1
+- Update to version 21.2.0, resolves rhbz#2223435
+
* Fri Jul 21 2023 Fedora Release Engineering <releng(a)fedoraproject.org> - 20.1.0-12
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
diff --git a/sources b/sources
index 02996da..cc9c972 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (gunicorn-20.1.0.tar.gz) = 586c7373504b4018fd462dc9c728991a8cc9f2be71fc2fb5aa23707ff6157dd3953121f6a070cae64d58b10f9ddf77ad59b66ed33981d37919b4764c60609027
+SHA512 (gunicorn-21.2.0.tar.gz) = 5d3117133ecbf9b8fded9c0ce69206916d273c284726d2a62e1d1d107560f22593baab032afa51e71b004a8b1e47afafd3fd1350b850ca45c1d7064075b795d3
https://src.fedoraproject.org/rpms/python-gunicorn/c/90a96a7248e280ba53f7...
9Â months
justinz pushed to rpms/haruna (f39). "Update to 0.12.1 and simplify
gitignore"
by notificationsï¼ fedoraproject.org
Notification time stamped 2023-09-01 01:36:23 UTC
From dd4e230f22a7457b4becd7b51412dc37efe5cf4f Mon Sep 17 00:00:00 2001
From: Justin Zobel <justin.zobel(a)gmail.com>
Date: Sep 01 2023 01:23:09 +0000
Subject: Update to 0.12.1 and simplify gitignore
---
diff --git a/.gitignore b/.gitignore
index 6d31323..183a167 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,20 +1,2 @@
-/haruna-0.9.1.tar.xz
-/haruna-0.9.1.tar.xz.sig
-/haruna-0.9.3.tar.xz
-/haruna-0.9.3.tar.xz.sig
-/haruna-0.10.0.tar.xz
-/haruna-0.10.0.tar.xz.sig
-/haruna-0.10.2.tar.xz
-/haruna-0.10.2.tar.xz.sig
-/haruna-0.10.3.tar.xz
-/haruna-0.10.3.tar.xz.sig
-/haruna-0.11.0.tar.xz
-/haruna-0.11.0.tar.xz.sig
-/haruna-0.11.1.tar.xz
-/haruna-0.11.1.tar.xz.sig
-/haruna-0.11.2.tar.xz
-/haruna-0.11.2.tar.xz.sig
-/haruna-0.11.3.tar.xz
-/haruna-0.11.3.tar.xz.sig
-/haruna-0.12.0.tar.xz
-/haruna-0.12.0.tar.xz.sig
+/haruna-*.tar.xz
+/haruna-*.tar.xz.sig
diff --git a/haruna.spec b/haruna.spec
index 5ffc444..9887bc3 100644
--- a/haruna.spec
+++ b/haruna.spec
@@ -1,5 +1,5 @@
Name: haruna
-Version: 0.12.0
+Version: 0.12.1
Release: %autorelease
Summary: Open source video player built with Qt/QML and libmpv
diff --git a/sources b/sources
index ca41511..df7264f 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (haruna-0.12.0.tar.xz) = 2129308bc471920f97a58031bb70bc08c7f24e49889482a62aa6c860e8f722f8d13a096c251b5e6c92969b06a19d0fa86c56ef98b16471544bb90aa319cee9c9
-SHA512 (haruna-0.12.0.tar.xz.sig) = 77561c9b88a1196ed813ceb4fb18764153c82add20e0fb2b692df2be758940667552c5aa72fc4c6c6faf178b0b3526553d88169582ed2a243a233d949ec3a64c
+SHA512 (haruna-0.12.1.tar.xz) = 58b2fd934c24e930848c11c3a361139a9fc4b4400a61256f1b9a3de0ce13cfbb2bd2a60cca5b757523c4f6c6f6b1452a5278b55559d8ebf736f82911cf8d548d
+SHA512 (haruna-0.12.1.tar.xz.sig) = 90c7e669eb9cd7e315d7388db6c7c591d295b2a1d3a5ac30d88a3cf814447db19af66930115c7ee67ee525f76e2ee898af8d95aabdca9d14ad208a261bd96b85
https://src.fedoraproject.org/rpms/haruna/c/dd4e230f22a7457b4becd7b51412d...
9Â months
justinz pushed to rpms/haruna (rawhide). "Update to 0.12.1 and
simplify gitignore"
by notificationsï¼ fedoraproject.org
Notification time stamped 2023-09-01 01:23:18 UTC
From dd4e230f22a7457b4becd7b51412dc37efe5cf4f Mon Sep 17 00:00:00 2001
From: Justin Zobel <justin.zobel(a)gmail.com>
Date: Sep 01 2023 01:23:09 +0000
Subject: Update to 0.12.1 and simplify gitignore
---
diff --git a/.gitignore b/.gitignore
index 6d31323..183a167 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,20 +1,2 @@
-/haruna-0.9.1.tar.xz
-/haruna-0.9.1.tar.xz.sig
-/haruna-0.9.3.tar.xz
-/haruna-0.9.3.tar.xz.sig
-/haruna-0.10.0.tar.xz
-/haruna-0.10.0.tar.xz.sig
-/haruna-0.10.2.tar.xz
-/haruna-0.10.2.tar.xz.sig
-/haruna-0.10.3.tar.xz
-/haruna-0.10.3.tar.xz.sig
-/haruna-0.11.0.tar.xz
-/haruna-0.11.0.tar.xz.sig
-/haruna-0.11.1.tar.xz
-/haruna-0.11.1.tar.xz.sig
-/haruna-0.11.2.tar.xz
-/haruna-0.11.2.tar.xz.sig
-/haruna-0.11.3.tar.xz
-/haruna-0.11.3.tar.xz.sig
-/haruna-0.12.0.tar.xz
-/haruna-0.12.0.tar.xz.sig
+/haruna-*.tar.xz
+/haruna-*.tar.xz.sig
diff --git a/haruna.spec b/haruna.spec
index 5ffc444..9887bc3 100644
--- a/haruna.spec
+++ b/haruna.spec
@@ -1,5 +1,5 @@
Name: haruna
-Version: 0.12.0
+Version: 0.12.1
Release: %autorelease
Summary: Open source video player built with Qt/QML and libmpv
diff --git a/sources b/sources
index ca41511..df7264f 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (haruna-0.12.0.tar.xz) = 2129308bc471920f97a58031bb70bc08c7f24e49889482a62aa6c860e8f722f8d13a096c251b5e6c92969b06a19d0fa86c56ef98b16471544bb90aa319cee9c9
-SHA512 (haruna-0.12.0.tar.xz.sig) = 77561c9b88a1196ed813ceb4fb18764153c82add20e0fb2b692df2be758940667552c5aa72fc4c6c6faf178b0b3526553d88169582ed2a243a233d949ec3a64c
+SHA512 (haruna-0.12.1.tar.xz) = 58b2fd934c24e930848c11c3a361139a9fc4b4400a61256f1b9a3de0ce13cfbb2bd2a60cca5b757523c4f6c6f6b1452a5278b55559d8ebf736f82911cf8d548d
+SHA512 (haruna-0.12.1.tar.xz.sig) = 90c7e669eb9cd7e315d7388db6c7c591d295b2a1d3a5ac30d88a3cf814447db19af66930115c7ee67ee525f76e2ee898af8d95aabdca9d14ad208a261bd96b85
https://src.fedoraproject.org/rpms/haruna/c/dd4e230f22a7457b4becd7b51412d...
9Â months
limb pushed to rpms/libreoffice (f39). "7.6.1.1"
by notificationsï¼ fedoraproject.org
Notification time stamped 2023-09-01 01:14:50 UTC
From 36004e2be45df8c0442c6ea67bf676e37819dc23 Mon Sep 17 00:00:00 2001
From: Gwyn Ciesla <gwync(a)protonmail.com>
Date: Aug 31 2023 20:09:45 +0000
Subject: 7.6.1.1
---
diff --git a/.gitignore b/.gitignore
index 47a6d53..f5226fa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,3 +29,9 @@
/libreoffice-help-7.6.0.3.tar.xz.asc
/libreoffice-translations-7.6.0.3.tar.xz
/libreoffice-translations-7.6.0.3.tar.xz.asc
+/libreoffice-7.6.1.1.tar.xz
+/libreoffice-7.6.1.1.tar.xz.asc
+/libreoffice-help-7.6.1.1.tar.xz
+/libreoffice-help-7.6.1.1.tar.xz.asc
+/libreoffice-translations-7.6.1.1.tar.xz
+/libreoffice-translations-7.6.1.1.tar.xz.asc
diff --git a/0001-Adapt-test-code-to-cURL-8.2.0.patch b/0001-Adapt-test-code-to-cURL-8.2.0.patch
deleted file mode 100644
index bfe94fc..0000000
--- a/0001-Adapt-test-code-to-cURL-8.2.0.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-From 2a68dc02bd19a717d3c86873206fabed1098f228 Mon Sep 17 00:00:00 2001
-From: Stephan Bergmann <sbergman(a)redhat.com>
-Date: Mon, 31 Jul 2023 17:09:32 +0200
-Subject: [PATCH] Adapt test code to cURL 8.2.0
-
-...for which CppunitTest_ucb_webdav_core would fail with
-
-> ucb/qa/cppunit/webdav/webdav_local_neon.cxx:60:(anonymous namespace)::webdav_local_test::WebdavUriTest
-> equality assertion failed
-> - Expected: ?query#fragment
-> - Actual : /?query#fragment
-
-and
-
-> ucb/qa/cppunit/webdav/webdav_local_neon.cxx:89:(anonymous namespace)::webdav_local_test::WebdavUriTest2
-> equality assertion failed
-> - Expected: ?query
-> - Actual : /?query
-
-because of
-<https://github.com/bch/curl/commit/5752e71080cb3aafa8b24c3261419345b832bc92>
-"urlapi: have *set(PATH) prepend a slash if one is missing".
-
-All that test code had been added with b03e070420606d407df2ec5e9dfa7043ecc46177
-"ucb: webdav-curl: fix CurlUri::CloneWithRelativeRefPathAbsolute()", and it
-looks harmless for our use cases that cURL started to behave differently there
-now. So instead of accepting either of the outcomes depending on what cURL
-version is being used, just change the test code to not leave out the
-path-absolute in the calls to CloneWithRelativeRefPathAbsolute (which is
-documented in ucb/source/ucp/webdav-curl/CurlUri.hxx to take
-
-> /// @param matches: relative-ref = path-absolute [ "?" query ] [ "#" fragment ]
-
-and path-absolute cannot be empty as per RFC 3986 "Uniform Resource Identifier
-(URI): Generic Syntax").
-
-Change-Id: If07a28598dfa047ebe89d8bcda19e8fcaa36aed0
-Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155099
-Reviewed-by: Michael Stahl <michael.stahl(a)allotropia.de>
-Tested-by: Jenkins
-Reviewed-by: Stephan Bergmann <sbergman(a)redhat.com>
----
- ucb/qa/cppunit/webdav/webdav_local_neon.cxx | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/ucb/qa/cppunit/webdav/webdav_local_neon.cxx b/ucb/qa/cppunit/webdav/webdav_local_neon.cxx
-index bde7652b9ffa..a457bc6d2b28 100644
---- a/ucb/qa/cppunit/webdav/webdav_local_neon.cxx
-+++ b/ucb/qa/cppunit/webdav/webdav_local_neon.cxx
-@@ -52,12 +52,12 @@ namespace
- CPPUNIT_ASSERT_EQUAL( OUString("/foo/bar"), uri2.GetRelativeReference() );
- CPPUNIT_ASSERT_EQUAL( OUString("http://user%40anothername@server.biz:8040/foo/bar"), uri2.GetURI() );
-
-- CurlUri uri3(aURI.CloneWithRelativeRefPathAbsolute(u"?query#fragment"));
-+ CurlUri uri3(aURI.CloneWithRelativeRefPathAbsolute(u"/?query#fragment"));
- CPPUNIT_ASSERT_EQUAL( OUString("http"), uri3.GetScheme() );
- CPPUNIT_ASSERT_EQUAL( OUString("server.biz"), uri3.GetHost() );
- CPPUNIT_ASSERT_EQUAL( OUString("user%40anothername"), uri3.GetUser() );
- CPPUNIT_ASSERT_EQUAL( sal_uInt16(8040), uri3.GetPort() );
-- CPPUNIT_ASSERT_EQUAL( OUString("?query#fragment"), uri3.GetRelativeReference() );
-+ CPPUNIT_ASSERT_EQUAL( OUString("/?query#fragment"), uri3.GetRelativeReference() );
- CPPUNIT_ASSERT_EQUAL( OUString("http://user%40anothername@server.biz:8040/?query#fragment"), uri3.GetURI() );
- }
-
-@@ -80,13 +80,13 @@ namespace
- CPPUNIT_ASSERT_EQUAL( OUString("/foo/bar"), uri2.GetRelativeReference() );
- CPPUNIT_ASSERT_EQUAL( OUString("https://foo:bar@server.biz:8040/foo/bar"), uri2.GetURI() );
-
-- CurlUri uri3(aURI.CloneWithRelativeRefPathAbsolute(u"?query"));
-+ CurlUri uri3(aURI.CloneWithRelativeRefPathAbsolute(u"/?query"));
- CPPUNIT_ASSERT_EQUAL( OUString("https"), uri3.GetScheme() );
- CPPUNIT_ASSERT_EQUAL( OUString("server.biz"), uri3.GetHost() );
- CPPUNIT_ASSERT_EQUAL( OUString("foo"), uri3.GetUser() );
- CPPUNIT_ASSERT_EQUAL( OUString("bar"), uri3.GetPassword() );
- CPPUNIT_ASSERT_EQUAL( sal_uInt16(8040), uri3.GetPort() );
-- CPPUNIT_ASSERT_EQUAL( OUString("?query"), uri3.GetRelativeReference() );
-+ CPPUNIT_ASSERT_EQUAL( OUString("/?query"), uri3.GetRelativeReference() );
- CPPUNIT_ASSERT_EQUAL( OUString("https://foo:bar@server.biz:8040/?query"), uri3.GetURI() );
- }
-
---
-2.41.0
-
diff --git a/0002-Fix-heap-use-after-free.patch b/0002-Fix-heap-use-after-free.patch
deleted file mode 100644
index d79a629..0000000
--- a/0002-Fix-heap-use-after-free.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 694bacca057c9f1d93ab27d61199aec9d060b868 Mon Sep 17 00:00:00 2001
-From: Tibor Nagy <nagy.tibor2(a)nisz.hu>
-Date: Fri, 4 Aug 2023 00:39:24 +0200
-Subject: [PATCH] Fix heap-use-after-free
-
-The issue is caused by commit Ic87983fa6e3279a64841babc565fbe97710ff730
-(tdf#99808 sc: fix background of conditional formatting in merged cell)
-
-Change-Id: Ic72ba16c2649537dc3b486e07c12e2486cdf1957
-Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155328
-Tested-by: Jenkins
-Reviewed-by: Stephan Bergmann <sbergman(a)redhat.com>
----
- sc/qa/unit/ucalc_condformat.cxx | 12 +++++-------
- 1 file changed, 5 insertions(+), 7 deletions(-)
-
-diff --git a/sc/qa/unit/ucalc_condformat.cxx b/sc/qa/unit/ucalc_condformat.cxx
-index 6b79a4318501..7a0abc7cf026 100644
---- a/sc/qa/unit/ucalc_condformat.cxx
-+++ b/sc/qa/unit/ucalc_condformat.cxx
-@@ -1394,21 +1394,19 @@ CPPUNIT_TEST_FIXTURE(TestCondformat, testConditionStyleInMergedCell)
- // Add a conditional format.
- auto pFormat = std::make_unique<ScConditionalFormat>(1, m_pDoc);
- pFormat->SetRange(ScRange(0, 0, 0, 0, 0, 0));
-- auto pFormatTmp = pFormat.get();
-- sal_uLong nKey = m_pDoc->AddCondFormat(std::move(pFormat), 0);
-
- // Add condition in which if the value equals 1, set the "Good" style.
- ScCondFormatEntry* pEntry = new ScCondFormatEntry(
- ScConditionMode::Equal, "=1", "", *m_pDoc, ScAddress(0, 0, 0), ScResId(STR_STYLENAME_GOOD));
-- pFormatTmp->AddEntry(pEntry);
-+ pFormat->AddEntry(pEntry);
-
- // Apply the format to the range.
-- m_pDoc->AddCondFormatData(pFormatTmp->GetRange(), 0, nKey);
-+ m_pDoc->AddCondFormatData(pFormat->GetRange(), 0, 1);
-
- ScDocFunc& rFunc = m_xDocShell->GetDocFunc();
-- sal_uInt32 nOldFormat = pFormatTmp->GetKey();
-- const ScRangeList& rRangeList = pFormatTmp->GetRange();
-- rFunc.ReplaceConditionalFormat(nOldFormat, pFormatTmp->Clone(), 0, rRangeList);
-+ sal_uInt32 nOldFormat = pFormat->GetKey();
-+ const ScRangeList& rRangeList = pFormat->GetRange();
-+ rFunc.ReplaceConditionalFormat(nOldFormat, std::move(pFormat), 0, rRangeList);
-
- CPPUNIT_ASSERT_EQUAL(true, aListener.mbPaintAllMergedCell);
-
---
-2.41.0
-
diff --git a/libreoffice.spec b/libreoffice.spec
index d53928b..f306ae1 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -1,5 +1,5 @@
# download path contains version without the last (fourth) digit
-%global libo_version 7.6.0
+%global libo_version 7.6.1
# Should contain .alphaX / .betaX, if this is pre-release (actually
# pre-RC) version. The pre-release string is part of tarball file names,
# so we need a way to define it easily at one place.
@@ -57,8 +57,8 @@ ExcludeArch: %{ix86}
Summary: Free Software Productivity Suite
Name: libreoffice
Epoch: 1
-Version: %{libo_version}.3
-Release: 4%{?libo_prerelease}%{?dist}
+Version: %{libo_version}.1
+Release: 1%{?libo_prerelease}%{?dist}
# default new files are: MPLv2
# older files are typically: MPLv2 incorporating work under ASLv2
# nlpsolver is: LGPLv3
@@ -243,6 +243,7 @@ BuildRequires: dejavu-sans-fonts
BuildRequires: dejavu-serif-fonts
BuildRequires: google-carlito-fonts
BuildRequires: google-rubik-fonts
+BuildRequires: google-crosextra-caladea-fonts
# Amiri used in vcl/qa/cppunit tests
BuildRequires: amiri-fonts
BuildRequires: amiri-quran-fonts
@@ -271,9 +272,7 @@ Patch2: 0001-Resolves-rhbz-1432468-disable-opencl-by-default.patch
Patch3: 0001-Revert-tdf-101630-gdrive-support-w-oAuth-and-Drive-A.patch
Patch4: 0001-default-to-sifr-for-gnome-light-mode.patch
# backported
-Patch8: 0001-Only-pass-I.-arguments-to-g-ir-scanner-by-using-pkg-.patch
-Patch9: 0001-Adapt-test-code-to-cURL-8.2.0.patch
-Patch10: 0002-Fix-heap-use-after-free.patch
+Patch5: 0001-Only-pass-I.-arguments-to-g-ir-scanner-by-using-pkg-.patch
# not upstreamed
# fix FTB in ppc64le from sharkcz
Patch11: lo-7.6-ppc64le-tests.patch
@@ -2258,6 +2257,9 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor &>/dev/null || :
%{_includedir}/LibreOfficeKit
%changelog
+* Mon Aug 28 2023 Gwyn Ciesla <gwync(a)protonmail.com> - 1:7.6.1.1-1
+- 7.6.1.1
+
* Sun Aug 27 2023 Mattia Verga <mattia.verga(a)proton.me> - 1:7.6.0.3-4
- Remove test exclusions from aarch64
- Link aarch64 executable with standard -g level
diff --git a/sources b/sources
index b178851..690bfe9 100644
--- a/sources
+++ b/sources
@@ -1,9 +1,9 @@
-SHA512 (libreoffice-7.6.0.3.tar.xz) = e8f3d4bede14427027cd69e3a9a21ebe6f8dcf3cd002f67b850fe3a1657ef06b312a34864780280d7a7c713ea906947130239708dcd0a45509b133710fd330be
-SHA512 (libreoffice-7.6.0.3.tar.xz.asc) = 511a0d3896def87f02e8c5aad161482249d39e2739643b0ddc8b905bc9ec9775bbc5cb18572d55320aabddb5e4cdf99f7d3cc77e3e01452fd6b3411b6de708c9
-SHA512 (libreoffice-help-7.6.0.3.tar.xz) = 5293158a51ee62f1df664ff5b49f12e7dee3d25e2e485a53a546db2bca16bb2699e795d21cf8aa8b3e87ba2f159e9cf03fb2f71c6f17307faa8ff60fa0948217
-SHA512 (libreoffice-help-7.6.0.3.tar.xz.asc) = a69db87e55b07985721cea7064268bccfc16fb48919d471063ce21ac3baccdd3b3958830c617b6df34b72ba5ddd2e256cf8a527ebf6a6e8cdc52f4de1aeb52f5
-SHA512 (libreoffice-translations-7.6.0.3.tar.xz) = 2bc9888f3cb7131397585aa8321c703b983e7003eed37b49113128c89b7a0e7350d5f02bd0c7ba3718016eec08a9c50e246391344f54b0137150b4b2b65de1f5
-SHA512 (libreoffice-translations-7.6.0.3.tar.xz.asc) = 841a690149fd9eab6a56c3461a6209ccd448e4de09087bc5cc32972827df56b744fdde40e60512f0f6ea74cf66a57c66375e2bfb18d9e65d56caf7751c4948dc
+SHA512 (libreoffice-7.6.1.1.tar.xz) = 3ef29b11abb40e3a2d6048b38648d677bbe9b9012dd2b262fd81dc1e97485a8f5a3c8a5fa2776171ce9344ea083c1874cc1da66164516ed1691796b34be44341
+SHA512 (libreoffice-7.6.1.1.tar.xz.asc) = 63357bd8220c0023acd0d38c20f9bae20741dae008412313803d9456a8db7c7018a56b97355c76456c37ae9b17d47cc4080b1007221bde8cda7e3527ccceeffd
+SHA512 (libreoffice-help-7.6.1.1.tar.xz) = 75a5c05b7fa0a51e6e33cef1fae742f623d6c92a8a453478474c603909ff0f8fad2a0ffeb5e1903d3be1e6285add67ae34b08a4d2e7135a7d3461695d4fd561e
+SHA512 (libreoffice-help-7.6.1.1.tar.xz.asc) = f2b3dc3fd959de41d62e3c674cb160e9ebb96a1a3de74c8ead99a214b8e4e26682fafb0b689bc843108470009c9c3d031273da488f64fe0abda4728ecd24fe7e
+SHA512 (libreoffice-translations-7.6.1.1.tar.xz) = ff48388aeb2388d7db0c464f5179fd968a021fa99216877cc21742e816d08b5387116c9f6c547ac50aaee427e692d05ffa41c496b177968f1bf856fc7041af22
+SHA512 (libreoffice-translations-7.6.1.1.tar.xz.asc) = 60ef64efafac73ea22bdba85f96e3689988cdf604d192c8c7898788f5d3b303eea9fc32a32d2840a0528e95f536828f3360fc14a53fdf79551ec40bc6f8b341a
SHA512 (17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip) = a231eba4a1baca11766ef292ab45e302081115477fe23018652882923308856835cf8c9ecba61a5cf22543474ccef3136965d794a90c9e4e9e6dcc21f9af6e1a
SHA512 (185d60944ea767075d27247c3162b3bc-unowinreg.dll) = 854b8ae29b57b40ba6bb6ff66e723a0e8dad053fcc2849f0ad763cd8a31352f4aeba9636fd4e3f0f2a0cd985a6f49b4261b9ace68d6be821ed42cfa7a73eb13c
SHA512 (a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip) = 2d3835f7ac356805025cafedcad97faa48d0f5da386e6ac7b7451030059df8e2fdb0861ade07a576ebf9fb5b88a973585ab0437944b06aac9289d6898ba8586a
https://src.fedoraproject.org/rpms/libreoffice/c/36004e2be45df8c0442c6ea6...
9Â months
limb pushed to rpms/libreoffice (f39). "Remove test exclusions for aarch64"
by notificationsï¼ fedoraproject.org
Notification time stamped 2023-09-01 01:14:50 UTC
From 256e9ad7ec17c433e72d7ed64204434b74f9691f Mon Sep 17 00:00:00 2001
From: Mattia Verga <mattia.verga(a)tiscali.it>
Date: Aug 27 2023 06:53:10 +0000
Subject: Remove test exclusions for aarch64
---
diff --git a/0001-aarch64-failing-here.patch b/0001-aarch64-failing-here.patch
deleted file mode 100644
index a2e22de..0000000
--- a/0001-aarch64-failing-here.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 52792b066bc98ae2a0813f5713756aff47a17910 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm(a)redhat.com>
-Date: Thu, 19 Jan 2023 19:50:35 +0000
-Subject: [PATCH] aarch64 failing here
-
-Change-Id: I5f9b28814424cb3c490308875182ea675ec73866
----
- sw/qa/extras/htmlimport/htmlimport.cxx | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/sw/qa/extras/htmlimport/htmlimport.cxx b/sw/qa/extras/htmlimport/htmlimport.cxx
-index c97d4e4cbde4..7ff74bd32d02 100644
---- a/sw/qa/extras/htmlimport/htmlimport.cxx
-+++ b/sw/qa/extras/htmlimport/htmlimport.cxx
-@@ -299,6 +299,7 @@ CPPUNIT_TEST_FIXTURE(HtmlImportTest, testTableBorder1px)
- CPPUNIT_ASSERT_MESSAGE("Missing cell right border", aBorder.InnerLineWidth > 0);
- }
-
-+#if 0
- CPPUNIT_TEST_FIXTURE(HtmlImportTest, testOutlineLevel)
- {
- createSwWebDoc("outline-level.html");
-@@ -307,6 +308,7 @@ CPPUNIT_TEST_FIXTURE(HtmlImportTest, testOutlineLevel)
- CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(1),
- getProperty<sal_Int32>(getParagraph(1), "OutlineLevel"));
- }
-+#endif
-
- CPPUNIT_TEST_FIXTURE(HtmlImportTest, testReqIfBr)
- {
---
-2.39.0
-
diff --git a/libreoffice.spec b/libreoffice.spec
index 860447c..90f17e3 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -58,7 +58,7 @@ Summary: Free Software Productivity Suite
Name: libreoffice
Epoch: 1
Version: %{libo_version}.3
-Release: 3%{?libo_prerelease}%{?dist}
+Release: 4%{?libo_prerelease}%{?dist}
# default new files are: MPLv2
# older files are typically: MPLv2 incorporating work under ASLv2
# nlpsolver is: LGPLv3
@@ -270,8 +270,6 @@ Patch2: 0001-Resolves-rhbz-1432468-disable-opencl-by-default.patch
# backported
Patch3: 0001-Revert-tdf-101630-gdrive-support-w-oAuth-and-Drive-A.patch
Patch4: 0001-default-to-sifr-for-gnome-light-mode.patch
-# TODO investigate these
-Patch5: 0001-aarch64-failing-here.patch
# backported
Patch8: 0001-Only-pass-I.-arguments-to-g-ir-scanner-by-using-pkg-.patch
Patch9: 0001-Adapt-test-code-to-cURL-8.2.0.patch
@@ -1027,8 +1025,7 @@ sed -i -e /CppunitTest_dbaccess_hsqldb_test/d dbaccess/Module_dbaccess.mk
sed -i -e s/CppunitTest_dbaccess_RowSetClones// dbaccess/Module_dbaccess.mk
%endif
%ifarch aarch64
-sed -i -e /CppunitTest_sc_addin_functions_test/d sc/Module_sc.mk
-sed -i -e /CppunitTest_sc_statistical_functions_test/d sc/Module_sc.mk
+# Nothing to do
%endif
%ifarch s390x
sed -i -e /CppunitTest_sc_array_functions_test/d sc/Module_sc.mk
@@ -2261,6 +2258,9 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor &>/dev/null || :
%{_includedir}/LibreOfficeKit
%changelog
+* Sun Aug 27 2023 Mattia Verga <mattia.verga(a)proton.me> - 1:7.6.0.3-4
+- Remove test exclusions from aarch64
+
* Wed Aug 23 2023 Mattia Verga <mattia.verga(a)proton.me> - 1:7.6.0.3-3
- Disable other failing tests under s390x
- Add patch to fix FTB under ppc64le
https://src.fedoraproject.org/rpms/libreoffice/c/256e9ad7ec17c433e72d7ed6...
9Â months
limb pushed to rpms/libreoffice (f39). "Link aarch64 executable with
standard -g level"
by notificationsï¼ fedoraproject.org
Notification time stamped 2023-09-01 01:14:50 UTC
From 8240bfa27ba2d39603a8d71c658b1d7ec5d66225 Mon Sep 17 00:00:00 2001
From: Mattia Verga <mattia.verga(a)tiscali.it>
Date: Aug 28 2023 07:27:38 +0000
Subject: Link aarch64 executable with standard -g level
---
diff --git a/libreoffice.spec b/libreoffice.spec
index 90f17e3..d53928b 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -1054,7 +1054,7 @@ for i in $RPM_OPT_FLAGS; do
esac
ARCH_FLAGS="$ARCH_FLAGS $i"
done
-%ifarch s390 s390x %{arm} aarch64
+%ifarch s390 s390x %{arm}
# these builders typically do not have enough memory to link the big libs with -g2
ARCH_FLAGS="$ARCH_FLAGS -g1"
%endif
@@ -2260,6 +2260,7 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor &>/dev/null || :
%changelog
* Sun Aug 27 2023 Mattia Verga <mattia.verga(a)proton.me> - 1:7.6.0.3-4
- Remove test exclusions from aarch64
+- Link aarch64 executable with standard -g level
* Wed Aug 23 2023 Mattia Verga <mattia.verga(a)proton.me> - 1:7.6.0.3-3
- Disable other failing tests under s390x
https://src.fedoraproject.org/rpms/libreoffice/c/8240bfa27ba2d39603a8d71c...
9Â months
packagerbot pushed to rpms/dummy-test-package-gloster (rawhide).
"Bump release (..more)"
by notificationsï¼ fedoraproject.org
Notification time stamped 2023-09-01 01:04:00 UTC
From c6e7036c67332096806adf3a15098bd5c4bb04e7 Mon Sep 17 00:00:00 2001
From: packagerbot <admin(a)fedoraproject.org>
Date: Sep 01 2023 01:03:53 +0000
Subject: Bump release
Signed-off-by: packagerbot <admin(a)fedoraproject.org>
---
diff --git a/dummy-test-package-gloster.spec b/dummy-test-package-gloster.spec
index cfc0568..aedecda 100644
--- a/dummy-test-package-gloster.spec
+++ b/dummy-test-package-gloster.spec
@@ -3,7 +3,7 @@
Name: dummy-test-package-gloster
Version: 0
-Release: 10851%{?dist}
+Release: 10852%{?dist}
Summary: Dummy Test Package called Gloster
License: CC0
URL: http://fedoraproject.org/wiki/DummyTestPackages
@@ -32,6 +32,9 @@ cp -p uuid %{buildroot}%{_datadir}/%{name}
%{_datadir}/%{name}
%changelog
+* Fri Sep 01 2023 packagerbot <admin(a)fedoraproject.org> - 0-10852
+- rebuilt
+
* Thu Aug 31 2023 packagerbot <admin(a)fedoraproject.org> - 0-10851
- rebuilt
https://src.fedoraproject.org/rpms/dummy-test-package-gloster/c/c6e7036c6...
9Â months