automatic version update by autodist [release 0.7.24-1mamba;Sun Apr 16 2023]

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

libsolv-0.6.35-rpm-5.patch

@@ -14,8 +14,8 @@
  struct rpmdbstate {
    Pool *pool;
    char *rootdir;
---- libsolv-0.6.34/ext/repo_rpmdb.c.orig	2018-03-23 12:04:14.000000000 +0100
-+++ libsolv-0.6.34/ext/repo_rpmdb.c	2018-05-10 19:30:12.563483259 +0200
+--- libsolv-0.6.35/ext/repo_rpmdb.c.orig	2019-06-04 17:32:58.000000000 +0200
++++ libsolv-0.6.35/ext/repo_rpmdb.c	2019-06-04 17:33:15.457951815 +0200
 @@ -30,6 +30,8 @@
  #include <rpm/rpmpgp.h>
  #ifndef RPM5
@@ -25,15 +25,3 @@
  #endif
  #include <rpm/rpmdb.h>
  
-@@ -457,7 +459,11 @@
- static int
- headissourceheuristic(RpmHead *h)
- {
-+#ifdef RPM5
-+  return !headerIsEntry(h, RPMTAG_SOURCERPM);
-+#else
-   return headerIsSource(h);
-+#endif
- }
- 
- static inline void

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-0.7.4-rpm5-5.2-endianess-fix.patch

@@ -0,0 +1,50 @@
+From 68d72a88d5dc983aff2ff5dce65581de0ee42b6d Mon Sep 17 00:00:00 2001
+From: Michael Schroeder <mls@suse.de>
+Date: Wed, 5 Jun 2019 15:58:55 +0200
+Subject: [PATCH] Make libsolv work with rpm 5.2
+
+Version 5.2 still used native endian encoding for the database ids.
+---
+ ext/repo_rpmdb_bdb.h | 12 +++++++++---
+ 1 file changed, 9 insertions(+), 3 deletions(-)
+
+diff --git a/ext/repo_rpmdb_bdb.h b/ext/repo_rpmdb_bdb.h
+index ed82a69c..d0053f71 100644
+--- a/ext/repo_rpmdb_bdb.h
++++ b/ext/repo_rpmdb_bdb.h
+@@ -27,6 +27,13 @@
+ # define RPM_INDEX_SIZE 8	/* rpmdbid + array index */
+ #endif
+ 
++#ifdef RPM5
++# include <rpm/rpmversion.h>
++# if RPMLIB_VERSION_GE(5,3,_,0,0,_)
++#  define RPM5_BIG_ENDIAN_ID
++# endif
++#endif
++
+ 
+ /******************************************************************/
+ /*  Rpm Database stuff
+@@ -66,11 +73,10 @@ stat_database(struct rpmdbstate *state, char *dbname, struct stat *statbuf, int
+   return 0;
+ }
+ 
+-
+ static inline Id
+ db2rpmdbid(unsigned char *db, int byteswapped)
+ {
+-#ifdef RPM5
++#ifdef RPM5_BIG_ENDIAN_ID
+   return db[0] << 24 | db[1] << 16 | db[2] << 8 | db[3];
+ #else
+ # if defined(WORDS_BIGENDIAN)
+@@ -87,7 +93,7 @@ db2rpmdbid(unsigned char *db, int byteswapped)
+ static inline void
+ rpmdbid2db(unsigned char *db, Id id, int byteswapped)
+ {
+-#ifdef RPM5
++#ifdef RPM5_BIG_ENDIAN_ID
+   db[0] = id >> 24, db[1] = id >> 16, db[2] = id >> 8, db[3] = id;
+ #else
+ # if defined(WORDS_BIGENDIAN)

libsolv-0.7.4-rpm5.2-still-has-array-index.patch

@@ -0,0 +1,38 @@
+From 841287dfb7a5992b374aa5326e776cd7d54fc0da Mon Sep 17 00:00:00 2001
+From: Michael Schroeder <mls@suse.de>
+Date: Wed, 5 Jun 2019 16:16:09 +0200
+Subject: [PATCH] rpm-5.2 still had an array index
+
+---
+ ext/repo_rpmdb_bdb.h | 15 +++++++--------
+ 1 file changed, 7 insertions(+), 8 deletions(-)
+
+diff --git a/ext/repo_rpmdb_bdb.h b/ext/repo_rpmdb_bdb.h
+index d0053f71..c680da6b 100644
+--- a/ext/repo_rpmdb_bdb.h
++++ b/ext/repo_rpmdb_bdb.h
+@@ -21,17 +21,16 @@
+ # endif
+ #endif
+ 
+-#ifdef RPM5
+-# define RPM_INDEX_SIZE 4	/* just the rpmdbid */
+-#else
+-# define RPM_INDEX_SIZE 8	/* rpmdbid + array index */
+-#endif
+-
+ #ifdef RPM5
+ # include <rpm/rpmversion.h>
+-# if RPMLIB_VERSION_GE(5,3,_,0,0,_)
++# if RPMLIB_VERSION < RPMLIB_VERSION_ENCODE(5,3,_,0,0,_)
++#  define RPM_INDEX_SIZE 8	/* rpmdbid + array index */
++# else
++#  define RPM_INDEX_SIZE 4	/* just the rpmdbid */
+ #  define RPM5_BIG_ENDIAN_ID
+-# endif
++#endif
++#else
++# define RPM_INDEX_SIZE 8	/* rpmdbid + array index */
+ #endif
+ 
+ 

libsolv.spec

@@ -1,32 +1,37 @@
 Name:          libsolv
-Version:       0.6.34
-Release:       2mamba
+Version:       0.7.24
+Release:       1mamba
 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.34-rpm-5.patch
+Patch0:        libsolv-0.6.35-rpm-5.patch
 Patch1:        libsolv-0.6.34-rpm-5.2.patch
 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: libpython310-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.
@@ -48,35 +53,51 @@ 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
+#%patch2 -p1
+#%ifarch x86_64
+#%patch6 -p1
+#%endif
 
 %build
 %cmake -d build \
 	-DENABLE_APPDATA=ON \
 	-DENABLE_BZIP2_COMPRESSION=ON \
 	-DENABLE_COMPLEX_DEPS=ON \
-	-DENABLE_HELIXREPO=ON \
 	-DENABLE_LZMA_COMPRESSION=ON \
-	-DENABLE_PUBKEY=ON \
+	-DENABLE_ZCHUNK_COMPRESSION=ON \
 	-DENABLE_RPMDB=ON \
 	-DENABLE_RPMDB_BYRPMHEADER=ON \
+	-DENABLE_RPMDB_LIBRPM=ON \
+	-DENABLE_RPMPKG_LIBRPM=ON \
 	-DENABLE_RPMMD=ON \
-	-DRPM5=ON \
+	-DWITH_LIBXML2=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=%{__python310} \
 	-DUSE_VENDORDIRS=ON \
-	-DCMAKE_C_FLAGS="%{optflags} -Doff64_t=__off64_t"
+	-DFEDORA=ON
+
+#	-DPYTHON_EXECUTABLE=%{__python27} \
 
 %make
 
@@ -97,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)
@@ -117,17 +136,17 @@ cp ext/*.h %{buildroot}%{_includedir}/solv/
 %{_mandir}/man3/libsolv-history.3*
 %{_mandir}/man3/libsolv-pool.3*
 %{_mandir}/man3/libsolv.3*
-%doc BUGS NEWS README
+%doc NEWS README
 
 %files tools
 %defattr(-,root,root)
+%{_bindir}/solv
 %{_bindir}/appdata2solv
 %{_bindir}/deltainfoxml2solv
 %{_bindir}/dumpsolv
-%{_bindir}/helix2solv
 %{_bindir}/installcheck
 %{_bindir}/mergesolv
-%{_bindir}/repo2solv.sh
+%{_bindir}/repo2solv
 %{_bindir}/testsolv
 %{_bindir}/repomdxml2solv
 %{_bindir}/rpmdb2solv
@@ -137,9 +156,10 @@ cp ext/*.h %{buildroot}%{_includedir}/solv/
 %{_mandir}/man1/appdata2solv.1*
 %{_mandir}/man1/deltainfoxml2solv.1*
 %{_mandir}/man1/dumpsolv.1*
-%{_mandir}/man1/helix2solv.1*
 %{_mandir}/man1/installcheck.1*
 %{_mandir}/man1/mergesolv.1*
+%{_mandir}/man1/repo2solv.1*
+%{_mandir}/man1/solv.1*
 %{_mandir}/man1/testsolv.1*
 %{_mandir}/man1/repomdxml2solv.1*
 %{_mandir}/man1/rpmdb2solv.1*
@@ -147,7 +167,72 @@ cp ext/*.h %{buildroot}%{_includedir}/solv/
 %{_mandir}/man1/rpms2solv.1*
 %{_mandir}/man1/updateinfoxml2solv.1*
 
+%files -n python-libsolv-py3
+%defattr(-,root,root)
+%{python310_sitearch}/_solv.so
+%{python310_sitearch}/solv.py
+
 %changelog
+* Sun Apr 16 2023 Automatic Build System <autodist@mambasoft.it> 0.7.24-1mamba
+- automatic version update by autodist
+
+* Sat Dec 17 2022 Automatic Build System <autodist@mambasoft.it> 0.7.23-1mamba
+- automatic version update by autodist
+
+* 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
+
+* Tue Jun 04 2019 Silvan Calarco <silvan.calarco@mambasoft.it> 0.7.4-2mamba
+- rebuilt with ENABLE_RPMMD=ON for fedora like repository (yum)
+
+* Tue Jun 04 2019 Silvan Calarco <silvan.calarco@mambasoft.it> 0.7.4-1mamba
+- update to 0.7.4
+
+* Tue Jun 04 2019 Silvan Calarco <silvan.calarco@mambasoft.it> 0.6.35-1mamba
+- update to 0.6.35
+
 * Sat Jun 01 2019 Silvan Calarco <silvan.calarco@mambasoft.it> 0.6.34-2mamba
 - rebuilt with rpm5 patch and build options from pld