Accepting request 1102250 from GNOME:Factory

Forwarded request #1101496 from iznogood

New stable rel

OBS-URL: https://build.opensuse.org/request/show/1102250
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gupnp?expand=0&rev=80
This commit is contained in:
Dominique Leuenberger 2023-08-05 10:53:53 +00:00 committed by Git OBS Bridge
commit 08a8370c1a
6 changed files with 13 additions and 56 deletions

View File

@ -1,25 +0,0 @@
From 884639bd29323cbb8fbd36bc69d08097a2ae2cd1 Mon Sep 17 00:00:00 2001
From: Jan Beich <jbeich@FreeBSD.org>
Date: Sun, 9 Jul 2023 03:30:47 +0000
Subject: [PATCH] build: properly spell [provide] in *.wrap files
meson.build:1:0: ERROR: Unexpected "[provides]" section, did you mean "[provide]"?
---
subprojects/gssdp-1.6.wrap | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/subprojects/gssdp-1.6.wrap b/subprojects/gssdp-1.6.wrap
index b0b6504..8adc1a2 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]
+[provide]
dependency_name = gssdp-1.6
--
GitLab

View File

@ -1,23 +0,0 @@
From a10c57bd32fbd0dc59eb6703454360ea564e2ffc Mon Sep 17 00:00:00 2001
From: Jens Georg <mail@jensge.org>
Date: Sun, 9 Jul 2023 21:49:47 +0200
Subject: [PATCH] build: Add missing "s" to wrap file syntax
---
subprojects/gssdp-1.6.wrap | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/subprojects/gssdp-1.6.wrap b/subprojects/gssdp-1.6.wrap
index 8adc1a2..ac1de18 100644
--- a/subprojects/gssdp-1.6.wrap
+++ b/subprojects/gssdp-1.6.wrap
@@ -4,5 +4,5 @@ revision = master
depth = 1
[provide]
-dependency_name = gssdp-1.6
+dependency_names = gssdp-1.6
--
GitLab

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d6c3d03583844fa52abe003043186007f0c84145fe3b00fab25995beda9be55a
size 242944

BIN
gupnp-1.6.5.tar.xz (Stored with Git LFS) Normal file

Binary file not shown.

View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Mon Jul 31 09:41:12 UTC 2023 - Bjørn Lie <bjorn.lie@gmail.com>
- Update to version 1.6.5:
+ Fix build with meson 1.2
- Drop patches fixed upstream:
+ a10c57bd.patch
+ 884639bd.patch
-------------------------------------------------------------------
Tue Jul 18 08:06:15 UTC 2023 - Dominique Leuenberger <dimstar@opensuse.org>

View File

@ -21,7 +21,7 @@
%define sover 1.6
Name: gupnp
Version: 1.6.4
Version: 1.6.5
Release: 0
Summary: Implementation of the UPnP specification
License: LGPL-2.1-or-later
@ -29,10 +29,6 @@ Group: Development/Libraries/C and C++
URL: http://www.gupnp.org/
Source0: https://download.gnome.org/sources/gupnp/1.6/%{name}-%{version}.tar.xz
Source1: baselibs.conf
# PATCH-FIX-UPSTREAM 884639bd.patch dimstar@opensuse.org -- properly spell [provide] in *.wrap files.
Patch0: 884639bd.patch
# PATCH-FIX-UPSTREAM a10c57bd.patch dimstar@opensuse.org -- Add missing "s" to wrap file syntax.
Patch1: a10c57bd.patch
BuildRequires: docbook-xsl-stylesheets
BuildRequires: meson >= 0.54.0