From 3f9d9021d1cb16d327e691839074cc2daac8d68e Mon Sep 17 00:00:00 2001 From: guojin17 Date: Thu, 29 Dec 2022 11:14:18 +0800 Subject: [PATCH] spec Drop libproxy dependency --- 0004-spec-Drop-libproxy-dependency.patch | 43 ++++++++++++++++++++++++ libreport.spec | 6 +++- 2 files changed, 48 insertions(+), 1 deletion(-) create mode 100644 0004-spec-Drop-libproxy-dependency.patch diff --git a/0004-spec-Drop-libproxy-dependency.patch b/0004-spec-Drop-libproxy-dependency.patch new file mode 100644 index 0000000..213dbce --- /dev/null +++ b/0004-spec-Drop-libproxy-dependency.patch @@ -0,0 +1,43 @@ +From 696ba97d7d77e89cb71f13fa1e9f53a192f71de6 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Mat=C4=9Bj=20Grabovsk=C3=BD?= +Date: Tue, 24 Aug 2021 12:40:35 +0200 +Subject: [PATCH] spec: Drop libproxy dependency + +Dependency on libproxy was factually removed in 11df7ffc. This change +follows up by removing the formal dependency in the spec and pkgconfig +files. + +Signed-off-by: guojin17 +--- + libreport-web.pc.in | 2 +- + libreport.spec | 1 - + 2 files changed, 1 insertion(+), 2 deletions(-) + +diff --git a/libreport-web.pc.in b/libreport-web.pc.in +index afdd6dc..e370758 100644 +--- a/libreport-web.pc.in ++++ b/libreport-web.pc.in +@@ -6,7 +6,7 @@ includedir=@includedir@ + Name: libreport + Description: Library providing network API for libreport + Version: @VERSION@ +-Requires: glib-2.0 libcurl libproxy-1.0 libxml-2.0 xmlrpc xmlrpc_client @JSON_C_PACKAGE@ satyr libreport ++Requires: glib-2.0 libcurl libxml-2.0 xmlrpc xmlrpc_client @JSON_C_PACKAGE@ satyr libreport + Libs: -L${libdir} -lreport-web + Cflags: + +diff --git a/libreport.spec b/libreport.spec +index 6786dd5..ae9b9b3 100644 +--- a/libreport.spec ++++ b/libreport.spec +@@ -33,7 +33,6 @@ BuildRequires: texinfo + BuildRequires: asciidoc + BuildRequires: xmlto + BuildRequires: newt-devel +-BuildRequires: libproxy-devel + BuildRequires: satyr-devel >= 0.24 + BuildRequires: glib2-devel >= %{glib_ver} + BuildRequires: git-core +-- +1.8.3.1 + diff --git a/libreport.spec b/libreport.spec index 7d08c3a..d3e7f23 100644 --- a/libreport.spec +++ b/libreport.spec @@ -2,7 +2,7 @@ Name: libreport Version: 2.15.2 -Release: 5 +Release: 6 License: GPLv2+ Summary: Generic library for reporting various problems URL: https://abrt.readthedocs.org/ @@ -12,6 +12,7 @@ Patch9000: fix-bug-delete-gtk-deprecation-warnings.patch Patch9001: 0001-Use-g_free-for-GLib-alloc-d-memory.patch Patch9002: 0002-changelog-Fix-links-to-commits.patch Patch9003: 0003-Avoid-direct-use-of-libproxy.patch +Patch9004: 0004-spec-Drop-libproxy-dependency.patch BuildRequires: dbus-devel gtk3-devel curl-devel desktop-file-utils python3-devel BuildRequires: gettext libxml2-devel libtar-devel intltool libtool texinfo asciidoc xmlto @@ -316,6 +317,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_mandir}/man5/bugzilla_format_kernel.conf.5.* %changelog +* Thu Dec 29 2022 guojin17 - 2.15.2-6 +- spec Drop libproxy dependency + * Thu Dec 29 2022 guojin17 - 2.15.2-5 - Avoid direct use of libproxy -- Gitee