rpms/libsolv
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to 0.7.15

Browse Source 
update x86_64-multiarch-coexistence patch to only resolve supplements of the main arch [release 0.7.15-1mamba;Sun Sep 13 2020]
This commit is contained in:
Silvan Calarco 2024-01-06 05:48:47 +01:00
parent 9aa9d72e01
commit 4324cde5bc
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libsolv-0.7.5-x86_64-multiarch-cohexistance.patch → libsolv-0.7.15-x86_64-multiarch-coexistence.patch
View File

@ -1,12 +1,11 @@
diff -Nru libsolv-0.7.5/src/rules.c libsolv-0.7.5.patched/src/rules.c
--- libsolv-0.7.5/src/rules.c 2019-06-22 17:43:42.000000000 +0200
+++ libsolv-0.7.5.patched/src/rules.c 2019-06-23 19:29:11.527890506 +0200
@@ -1016,6 +1016,9 @@
--- libsolv-0.7.15/src/rules.c.orig 2020-09-13 11:49:27.386000000 +0200
+++ libsolv-0.7.15/src/rules.c 2020-09-13 11:46:18.006000000 +0200
@@ -1075,6 +1075,9 @@
p = 0;
if (s->name == ps->name)
{
+ /* x86-64: allow cohexistence with x86 arch packages */
+ if (ps->arch != s->arch)
+ if (ps->arch != s->arch && !s->supplements)
+ continue;
/* optimization: do not add the same-name conflict rule if it was
* already added when we looked at the other package.

12
libsolv.spec
View File

@ -1,5 +1,5 @@
Name: libsolv
Version: 0.7.10
Version: 0.7.15
Release: 1mamba
Summary: Library for solving packages and reading repositories
Group: System/Libraries
@ -14,7 +14,7 @@ Patch2: libsolv-0.6.34-python.patch
Patch3: libsolv-0.6.34-swig-4.0.0.patch
Patch4: libsolv-0.7.4-rpm5-5.2-endianess-fix.patch
Patch5: libsolv-0.7.4-rpm5.2-still-has-array-index.patch
Patch6: libsolv-0.7.5-x86_64-multiarch-cohexistance.patch
Patch6: libsolv-0.7.15-x86_64-multiarch-coexistence.patch
License: BSD
## AUTOBUILDREQ-BEGIN
BuildRequires: glibc-devel
@ -111,13 +111,13 @@ cp ext/*.h %{buildroot}%{_includedir}/solv/
%{_libdir}/libsolv.so.*
%{_libdir}/libsolvext.so.*
%{perl_vendorarch}/solv.*
%{_libdir}/ruby/vendor_ruby/*/*-linux-gnu*/solv.so
%{_libdir}/ruby/vendor_ruby/*/*/solv.so
%{_prefix}/lib/tcl8/*/solv-%{version}.*
%{python27_sitearch}/_solv.so
%{python27_sitearch}/solv.py
%{python36_sitearch}/_solv.so
%{python36_sitearch}/solv.py
%doc CREDITS
%doc LICENSE.BSD CREDITS
%files devel
%defattr(-,root,root)
@ -164,6 +164,10 @@ cp ext/*.h %{buildroot}%{_includedir}/solv/
%{_mandir}/man1/updateinfoxml2solv.1*
%changelog
* Sun Sep 13 2020 Silvan Calarco <silvan.calarco@mambasoft.it> 0.7.15-1mamba
- update to 0.7.15
- update x86_64-multiarch-coexistence patch to only resolve supplements of the main arch
* Thu Jan 16 2020 Silvan Calarco <silvan.calarco@mambasoft.it> 0.7.10-1mamba
- update to 0.7.10