[packages/zif] - added xattr,rpm4.14 patches to refresh code

[qboosh]

commit b6cb100c94e08d48e1d3f8328f9835e1476d8633
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Mon Mar 28 21:29:21 2022 +0200

    - added xattr,rpm4.14 patches to refresh code

 zif-rpm4.14.patch | 10 ++++++++++
 zif-xattr.patch   | 22 ++++++++++++++++++++++
 zif.spec          | 16 ++++++++++++++--
 3 files changed, 46 insertions(+), 2 deletions(-)
---
diff --git a/zif.spec b/zif.spec
index ca64a68..49a05d6 100644
--- a/zif.spec
+++ b/zif.spec
@@ -1,4 +1,8 @@
 # NOTE: no longer developed; some code lives in hawkey backend in PackageKit
+#
+# Conditional build:
+%bcond_with	rpm5	# RPM 5.x instead of rpm.org
+
 Summary:	Simple wrapper for rpm and the Fedora package metadata
 Summary(pl.UTF-8):	Proste opakowanie dla rpm-a i metadanych pakietów Fedory
 Name:		zif
@@ -6,11 +10,13 @@ Version:	0.3.6
 Release:	0.2
 License:	GPL v2+
 Group:		Libraries
-Source0:	http://people.freedesktop.org/~hughsient/zif/releases/%{name}-%{version}.tar.xz
+Source0:	https://people.freedesktop.org/~hughsient/zif/releases/%{name}-%{version}.tar.xz
 # Source0-md5:	fcec454a8d839cfe4aa9ee7b6e20ed15
 Patch0:		%{name}-rpm5.patch
 Patch1:		%{name}-link.patch
-URL:		http://people.freedesktop.org/~hughsient/zif/
+Patch2:		%{name}-xattr.patch
+Patch3:		%{name}-rpm4.14.patch
+URL:		https://people.freedesktop.org/~hughsient/zif/
 BuildRequires:	attr-devel
 BuildRequires:	autoconf >= 2.63
 BuildRequires:	automake >= 1:1.9
@@ -98,10 +104,16 @@ Bashowe dopełnianie parametrów dla polecenia zif.
 
 %prep
 %setup -q
+%if %{with rpm5}
 %patch0 -p1
+%else
+%patch3 -p1
+%endif
 %patch1 -p1
+%patch2 -p1
 
 %build
+%{__gtkdocize}
 %{__libtoolize}
 %{__aclocal} -I m4
 %{__autoconf}
diff --git a/zif-rpm4.14.patch b/zif-rpm4.14.patch
new file mode 100644
index 0000000..1a4e15c
--- /dev/null
+++ b/zif-rpm4.14.patch
@@ -0,0 +1,10 @@
+--- zif-0.3.6/libzif/zif-state.c.orig	2013-05-08 09:33:04.000000000 +0200
++++ zif-0.3.6/libzif/zif-state.c	2022-03-28 21:13:12.027458197 +0200
+@@ -1246,7 +1246,6 @@ zif_state_cancel_on_signal (ZifState *st
+ #if GLIB_CHECK_VERSION(2,29,19)
+ 	/* undo librpms attempt to steal SIGINT, and instead fail
+ 	 * the transaction in a nice way */
+-	rpmsqEnable (-SIGINT, NULL);
+ 	g_unix_signal_add (signum,
+ 			   zif_state_cancel_on_signal_cb,
+ 			   state->priv->cancellable);
diff --git a/zif-xattr.patch b/zif-xattr.patch
new file mode 100644
index 0000000..4d09701
--- /dev/null
+++ b/zif-xattr.patch
@@ -0,0 +1,22 @@
+--- zif-0.3.6/configure.ac.orig	2022-03-28 20:22:46.743847565 +0200
++++ zif-0.3.6/configure.ac	2022-03-28 20:44:48.350021143 +0200
+@@ -130,7 +130,7 @@ PKG_CHECK_MODULES(SOUP, libsoup-2.4)
+ dnl ---------------------------------------------------------------------------
+ dnl - use xattr to speed up checksumming files using the mtime as a key
+ dnl ---------------------------------------------------------------------------
+-AC_CHECK_HEADERS([attr/xattr.h],
++AC_CHECK_HEADERS([sys/xattr.h],
+ 		 HAVE_XATTR_H="yes",
+ 		 HAVE_XATTR_H="no")
+ if test "x$HAVE_XATTR_H" = "xno"; then
+--- zif-0.3.6/libzif/zif-md.c.orig	2013-01-10 14:22:35.000000000 +0100
++++ zif-0.3.6/libzif/zif-md.c	2022-03-28 20:51:50.314401833 +0200
+@@ -37,7 +37,7 @@
+ #include <string.h>
+ #include <stdlib.h>
+ #include <sys/types.h>
+-#include <attr/xattr.h>
++#include <sys/xattr.h>
+ 
+ #include "zif-config.h"
+ #include "zif-md.h"
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/zif.git/commitdiff/b6cb100c94e08d48e1d3f8328f9835e1476d8633