From d85a77355441caa23e0b897378b7cb9e634006fbb9c9391e962e8a7b09c1a41c Mon Sep 17 00:00:00 2001 From: Alexei Sorokin Date: Wed, 22 Nov 2023 12:19:26 +0000 Subject: [PATCH] Accepting request 1128108 from home:krop:Appstream - Add patch (boo#1217047): * 0001-Fix-test-failures-with-appstream-1.0.patch OBS-URL: https://build.opensuse.org/request/show/1128108 OBS-URL: https://build.opensuse.org/package/show/network:pidgin/pidgin-sipe?expand=0&rev=15 --- ...Fix-test-failures-with-appstream-1.0.patch | 40 +++++++++++++++++++ pidgin-sipe.changes | 6 +++ pidgin-sipe.spec | 4 +- 3 files changed, 49 insertions(+), 1 deletion(-) create mode 100644 0001-Fix-test-failures-with-appstream-1.0.patch diff --git a/0001-Fix-test-failures-with-appstream-1.0.patch b/0001-Fix-test-failures-with-appstream-1.0.patch new file mode 100644 index 0000000..dcb6366 --- /dev/null +++ b/0001-Fix-test-failures-with-appstream-1.0.patch @@ -0,0 +1,40 @@ +From 2466171b73f25baf4ec3b1a34c6be2a90b2869d3 Mon Sep 17 00:00:00 2001 +From: Christophe Marin +Date: Wed, 22 Nov 2023 12:35:23 +0100 +Subject: [PATCH] Fix test failures with appstream 1.0 + +appstreamcli no longer accepts '--nonet'. Use '--no-net' +--- + src/purple/Makefile.am | 2 +- + src/purple/Makefile.in | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/purple/Makefile.am b/src/purple/Makefile.am +index 608a897..2ba6d5c 100644 +--- a/src/purple/Makefile.am ++++ b/src/purple/Makefile.am +@@ -160,7 +160,7 @@ check: validate-metainfo + + .PHONY: validate-metainfo + validate-metainfo: $(pidginmetainfofile_DATA) +- appstreamcli validate --pedantic --nonet $< || \ ++ appstreamcli validate --pedantic --no-net $< || \ + appstreamcli validate --pedantic $< || \ + appstream-validate $< + endif +diff --git a/src/purple/Makefile.in b/src/purple/Makefile.in +index af847c4..648950c 100644 +--- a/src/purple/Makefile.in ++++ b/src/purple/Makefile.in +@@ -1630,7 +1630,7 @@ install-exec-local: + + @SIPE_WITH_APPSTREAM_TRUE@.PHONY: validate-metainfo + @SIPE_WITH_APPSTREAM_TRUE@validate-metainfo: $(pidginmetainfofile_DATA) +-@SIPE_WITH_APPSTREAM_TRUE@ appstreamcli validate --pedantic --nonet $< || \ ++@SIPE_WITH_APPSTREAM_TRUE@ appstreamcli validate --pedantic --no-net $< || \ + @SIPE_WITH_APPSTREAM_TRUE@ appstreamcli validate --pedantic $< || \ + @SIPE_WITH_APPSTREAM_TRUE@ appstream-validate $< + +-- +2.42.1 + diff --git a/pidgin-sipe.changes b/pidgin-sipe.changes index 8930490..f8f8634 100644 --- a/pidgin-sipe.changes +++ b/pidgin-sipe.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Nov 22 11:36:56 UTC 2023 - Christophe Marin + +- Add patch (boo#1217047): + * 0001-Fix-test-failures-with-appstream-1.0.patch + ------------------------------------------------------------------- Mon Sep 20 20:19:33 UTC 2021 - Stanislav Brabec diff --git a/pidgin-sipe.spec b/pidgin-sipe.spec index df25fed..fd8f20f 100644 --- a/pidgin-sipe.spec +++ b/pidgin-sipe.spec @@ -24,6 +24,8 @@ License: GPL-2.0-or-later Group: Productivity/Networking/Instant Messenger URL: https://sipe.sourceforge.io/ Source: http://downloads.sf.net/sipe/%{name}-%{version}.tar.xz +# PATCH-FIX-OPENSUSE +Patch0: 0001-Fix-test-failures-with-appstream-1.0.patch BuildRequires: AppStream BuildRequires: intltool BuildRequires: libtool @@ -125,7 +127,7 @@ SIP/SIMPLE used by various products: * Reuters Messaging. %prep -%setup -q +%autosetup -p1 %build %configure \