remove multiarch cohexistence patch, build with -DFEDORA to fix multilib support [release 0.7.22-2mamba;Sat Apr 30 2022]

python bindings only for python3 and packaged apart [release 0.7.16-1mamba;Sat Nov 28 2020]

libsolv-0.7.15-x86_64-multiarch-coexistence.patch

@@ -0,0 +1,12 @@
+--- 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 && !s->supplements)
++			continue;
+ 		      /* optimization: do not add the same-name conflict rule if it was
+ 		       * already added when we looked at the other package.
+ 		       * (this assumes pool_colormatch is symmetric) */

libsolv.spec

@@ -1,12 +1,12 @@
 Name:          libsolv
-Version:       0.7.4
-Release:       3mamba
+Version:       0.7.22
+Release:       2mamba
 Summary:       Library for solving packages and reading repositories
 Group:         System/Libraries
 Vendor:        openmamba
 Distribution:  openmamba
 Packager:      Silvan Calarco <silvan.calarco@mambasoft.it>
-URL:           http://en.opensuse.org/openSUSE:Libzypp_satsolver
+URL:           https://en.opensuse.org/openSUSE:Libzypp_satsolver
 Source:        https://github.com/openSUSE/libsolv.git/%{version}/libsolv-%{version}.tar.bz2
 Patch0:        libsolv-0.6.35-rpm-5.patch
 Patch1:        libsolv-0.6.34-rpm-5.2.patch
@@ -14,21 +14,24 @@ 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.15-x86_64-multiarch-coexistence.patch
 License:       BSD
 ## AUTOBUILDREQ-BEGIN
 BuildRequires: glibc-devel
 BuildRequires: libbzip2-devel
-BuildRequires: libexpat-devel
 BuildRequires: liblzma-devel
 BuildRequires: libperl
-BuildRequires: libpython-devel
+BuildRequires: libpython3-devel
+BuildRequires: librpm-devel
 BuildRequires: libtcl-devel
+BuildRequires: libxml2-devel
 BuildRequires: libz-devel
+BuildRequires: libzck-devel
+BuildRequires: libzstd-devel
 BuildRequires: perl-devel
-BuildRequires: rpm-devel
 ## AUTOBUILDREQ-END
+BuildRequires: librpm-devel >= 4.16.1.2-1mamba
 BuildRequires: cmake
-BuildRoot:     %{_tmppath}/%{name}-%{version}-root
 
 %description
 Library for solving packages and reading repositories.
@@ -50,16 +53,22 @@ Requires:      %{name} = %{?epoch:%epoch:}%{version}-%{release}
 %description tools
 This package contains utility applications for %{name}.
 
+%package -n python-libsolv-py3
+Group:         System/Libraries/Python
+Summary:       Python bindings for %{name}
+Requires:      %{name} = %{?epoch:%epoch:}%{version}-%{release}
+
+%description -n python-libsolv-py3
+This package contains the Python bindings for %{name}.
+
 %debug_package
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
+#%patch2 -p1
+#%ifarch x86_64
+#%patch6 -p1
+#%endif
 
 %build
 %cmake -d build \
@@ -69,18 +78,26 @@ This package contains utility applications for %{name}.
 	-DENABLE_LZMA_COMPRESSION=ON \
 	-DENABLE_ZCHUNK_COMPRESSION=ON \
 	-DENABLE_RPMDB=ON \
-	-DENABLE_RPMPKG=ON \
+	-DENABLE_RPMDB_BYRPMHEADER=ON \
+	-DENABLE_RPMDB_LIBRPM=ON \
+	-DENABLE_RPMPKG_LIBRPM=ON \
 	-DENABLE_RPMMD=ON \
 	-DWITH_LIBXML2=ON \
-	-DRPM5=ON \
 	-DENABLE_PERL=ON \
 	-DENABLE_PYTHON=ON \
 	-DENABLE_RUBY=ON \
 	-DENABLE_TCL=ON \
-	-DPythonLibs_FIND_VERSION=2 \
-	-DPythonLibs_FIND_VERSION_MAJOR=2 \
+	-DENABLE_LZMA_COMPRESSION=ON \
+	-DENABLE_BZIP2_COMPRESSION=ON \
+	-DENABLE_ZCHUNK_COMPRESSIO=ON \
+	-DWITH_SYSTEM_ZCHUNK=ON \
+	-DENABLE_PYTHON=OFF \
+	-DENABLE_PYTHON3=ON \
+	-DPYTHON3_EXECUTABLE=%{__python3} \
 	-DUSE_VENDORDIRS=ON \
-	-DCMAKE_C_FLAGS="%{optflags} -Doff64_t=__off64_t"
+	-DFEDORA=ON
+
+#	-DPYTHON_EXECUTABLE=%{__python27} \
 
 %make
 
@@ -101,11 +118,9 @@ 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
-%doc CREDITS
+%doc LICENSE.BSD CREDITS
 
 %files devel
 %defattr(-,root,root)
@@ -125,6 +140,7 @@ cp ext/*.h %{buildroot}%{_includedir}/solv/
 
 %files tools
 %defattr(-,root,root)
+%{_bindir}/solv
 %{_bindir}/appdata2solv
 %{_bindir}/deltainfoxml2solv
 %{_bindir}/dumpsolv
@@ -151,7 +167,54 @@ cp ext/*.h %{buildroot}%{_includedir}/solv/
 %{_mandir}/man1/rpms2solv.1*
 %{_mandir}/man1/updateinfoxml2solv.1*
 
+%files -n python-libsolv-py3
+%defattr(-,root,root)
+%{python3_sitelib}/_solv.so
+%{python3_sitelib}/solv.py
+
 %changelog
+* Sat Apr 30 2022 Silvan Calarco <silvan.calarco@mambasoft.it> 0.7.22-2mamba
+- remove multiarch cohexistence patch, build with -DFEDORA to fix multilib support
+
+* Tue Mar 29 2022 Automatic Build System <autodist@mambasoft.it> 0.7.22-1mamba
+- automatic version update by autodist
+
+* Fri Mar 04 2022 Automatic Build System <autodist@mambasoft.it> 0.7.21-1mamba
+- automatic version update by autodist
+
+* Tue Sep 28 2021 Automatic Build System <autodist@mambasoft.it> 0.7.20-1mamba
+- automatic version update by autodist
+
+* Thu Apr 08 2021 Automatic Build System <autodist@mambasoft.it> 0.7.19-1mamba
+- automatic version update by autodist
+
+* Sat Mar 27 2021 Automatic Build System <autodist@mambasoft.it> 0.7.18-1mamba
+- automatic version update by autodist
+
+* Sun Mar 07 2021 Silvan Calarco <silvan.calarco@mambasoft.it> 0.7.17-2mamba
+- rebuilt by autoport with build requirements: librpm-devel>=4.16.1.2-1mamba
+
+* Tue Feb 09 2021 Automatic Build System <autodist@mambasoft.it> 0.7.17-1mamba
+- automatic version update by autodist
+
+* Sat Nov 28 2020 Silvan Calarco <silvan.calarco@mambasoft.it> 0.7.16-1mamba
+- update to 0.7.16
+- python bindings only for python3 and packaged apart
+
+* 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
+
+* Sun Jun 23 2019 Silvan Calarco <silvan.calarco@mambasoft.it> 0.7.5-2mamba
+- x86_64: added patch to allow cohexistance of packages with same name if from different archs (x86)
+
+* Sat Jun 22 2019 Silvan Calarco <silvan.calarco@mambasoft.it> 0.7.5-1mamba
+- update to 0.7.5
+- rebuilt with rpm 4, removed rpm 5 patches
+
 * Wed Jun 05 2019 Silvan Calarco <silvan.calarco@mambasoft.it> 0.7.4-3mamba
 - added upstream patch to fix endianess with rpm 5.2