- leave uname() and cpuinfo() deps resolution to rpmlib, rel 2

diff --git a/libsolv.spec b/libsolv.spec
index 980d622fbdb4c7a7cfc36c86935d5bd7d720e0f2..2ff08fd00f2eed0630dd563b4af687d295fffe01 100644 (file)
--- a/libsolv.spec
+++ b/libsolv.spec
@@ -10,7 +10,7 @@ Summary:      Package dependency solver
 Summary(pl.UTF-8):     Biblioteka do rozwiązywania zależności pakietów
 Name:          libsolv
 Version:       0.7.22
-Release:       1
+Release:       2
 License:       BSD
 Group:         Libraries
 #Source0Download: https://github.com/openSUSE/libsolv/tags
@@ -19,6 +19,7 @@ Source0:      https://github.com/openSUSE/libsolv/archive/%{version}/%{name}-%{versio
 Patch0:                ruby.patch
 Patch1:                %{name}-python.patch
 Patch2:                %{name}-rpm5.patch
+Patch3:                uname-cpuinfo-deps.patch
 URL:           https://github.com/openSUSE/libsolv
 BuildRequires: bzip2-devel
 BuildRequires: cmake >= 2.8.5
@@ -180,6 +181,7 @@ Wiązania języka Tcl do bibliotek libsolv.
 %patch0 -p1
 %patch1 -p1
 %{?with_rpm5:%patch2 -p1}
+%patch3 -p1
 
 # use system one
 %{__rm} cmake/modules/FindRuby.cmake

diff --git a/uname-cpuinfo-deps.patch b/uname-cpuinfo-deps.patch
new file mode 100644 (file)
index 0000000..02efd29
--- /dev/null
+++ b/uname-cpuinfo-deps.patch
@@ -0,0 +1,24 @@
+--- libsolv-0.7.22/src/order.c.orig    2022-03-21 10:19:54.000000000 +0100
++++ libsolv-0.7.22/src/order.c 2022-05-13 11:47:48.372551371 +0200
+@@ -1387,6 +1387,10 @@
+           continue;
+         if (!strncmp(pool_id2str(pool, req), "rpmlib(", 7))
+           continue;
++        if (!strncmp(pool_id2str(pool, req), "uname(", 6))
++          continue;
++        if (!strncmp(pool_id2str(pool, req), "cpuinfo(", 8))
++          continue;
+         good = 0;
+         /* first check kept packages, then freshly installed, then not yet uninstalled */
+         FOR_PROVIDES(p, pp, req)
+--- libsolv-0.7.22/src/pool.c.orig     2022-03-21 10:19:54.000000000 +0100
++++ libsolv-0.7.22/src/pool.c  2022-05-13 11:48:11.742261108 +0200
+@@ -1413,7 +1413,7 @@
+         queue_push(&plist, p);
+       }
+       /* make our system solvable provide all unknown rpmlib() stuff */
+-      if (plist.count == 0 && !strncmp(pool_id2str(pool, name), "rpmlib(", 7))
++      if (plist.count == 0 && (!strncmp(pool_id2str(pool, name), "rpmlib(", 7) || !strncmp(pool_id2str(pool, name), "uname(", 6) || !strncmp(pool_id2str(pool, name), "cpuinfo(", 8)))
+       queue_push(&plist, SYSTEMSOLVABLE);
+     }
+   /* add providers to whatprovides */