From ea03175d0ebab04325841b9b7ec1ed0046a305964d3ccb13c04392eb0f6d7340 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Fri, 21 Jul 2023 06:42:12 +0000 Subject: [PATCH] Accepting request 1099675 from home:dimstar:Factory - Add 61d24fdc.patch: Fix typos for meson 1.2 compatibility. OBS-URL: https://build.opensuse.org/request/show/1099675 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/dLeyna?expand=0&rev=8 --- 61d24fdc.patch | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++ dLeyna.changes | 5 +++++ dLeyna.spec | 3 +++ 3 files changed, 63 insertions(+) create mode 100644 61d24fdc.patch diff --git a/61d24fdc.patch b/61d24fdc.patch new file mode 100644 index 0000000..436063e --- /dev/null +++ b/61d24fdc.patch @@ -0,0 +1,55 @@ +From 61d24fdccadc1c9a94f1351744376edcc2048105 Mon Sep 17 00:00:00 2001 +From: Sam James +Date: Mon, 17 Jul 2023 13:29:55 +0100 +Subject: [PATCH] subprojects: Fix typos for Meson 1.2 compatibility + +Bug: https://bugs.gentoo.org/909405 +Bug: https://bugs.gentoo.org/909431 +--- + subprojects/gssdp-1.6.wrap | 4 ++-- + subprojects/gupnp-1.6.wrap | 4 ++-- + subprojects/gupnp-av-1.0.wrap | 4 ++-- + 3 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/subprojects/gssdp-1.6.wrap b/subprojects/gssdp-1.6.wrap +index b0b6504..ac1de18 100644 +--- a/subprojects/gssdp-1.6.wrap ++++ b/subprojects/gssdp-1.6.wrap +@@ -3,6 +3,6 @@ url = https://gitlab.gnome.org/GNOME/gssdp.git + revision = master + depth = 1 + +-[provides] +-dependency_name = gssdp-1.6 ++[provide] ++dependency_names = gssdp-1.6 + +diff --git a/subprojects/gupnp-1.6.wrap b/subprojects/gupnp-1.6.wrap +index d7d55e7..bd164ee 100644 +--- a/subprojects/gupnp-1.6.wrap ++++ b/subprojects/gupnp-1.6.wrap +@@ -3,6 +3,6 @@ url = https://gitlab.gnome.org/GNOME/gupnp.git + revision = master + depth = 1 + +-[provides] +-dependency_name = gupnp-1.6 ++[provide] ++dependency_names = gupnp-1.6 + +diff --git a/subprojects/gupnp-av-1.0.wrap b/subprojects/gupnp-av-1.0.wrap +index 967e6d3..8c3b490 100644 +--- a/subprojects/gupnp-av-1.0.wrap ++++ b/subprojects/gupnp-av-1.0.wrap +@@ -3,6 +3,6 @@ url = https://gitlab.gnome.org/GNOME/gupnp-av.git + revision = master + depth = 1 + +-[provides] +-dependency_name = gupnp-av-1.0 ++[provide] ++dependency_names = gupnp-av-1.0 + +-- +GitLab + diff --git a/dLeyna.changes b/dLeyna.changes index acc3406..a1fb900 100644 --- a/dLeyna.changes +++ b/dLeyna.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Jul 20 08:53:12 UTC 2023 - Dominique Leuenberger + +- Add 61d24fdc.patch: Fix typos for meson 1.2 compatibility. + ------------------------------------------------------------------- Mon Jan 30 14:13:19 UTC 2023 - Dominique Leuenberger diff --git a/dLeyna.spec b/dLeyna.spec index b641b8e..04fa497 100644 --- a/dLeyna.spec +++ b/dLeyna.spec @@ -25,6 +25,8 @@ URL: https://gitlab.gnome.org/World/dLeyna Source0: %{name}-%{version}.tar.xz # PATCH-FIX-UPSTREAM dLeyna-no-python-shebang.patch -- Do not carry /usr/bin/python shebang in python module files Patch0: dLeyna-no-python-shebang.patch +# PATCH-FIX-UPSTREAM 61d24fdc.patch dimstar@opensuse.org -- Fix typos for Meson 1.2 compatibility +Patch1: https://gitlab.gnome.org/World/dLeyna/-/commit/61d24fdc.patch BuildRequires: docutils BuildRequires: meson >= 0.54.0 @@ -116,6 +118,7 @@ management and an IPC abstraction API. %{python_sitelib}/dLeyna/mediaconsole.py %{python_sitelib}/dLeyna/rendererconsole.py %{python_sitelib}/dLeyna/upload_sync_controller.py +%{python_sitelib}/dLeyna/__pycache__/ %files devel %{_includedir}/dleyna-1.0/