22 Commits

Author SHA1 Message Date
03bdaceb90 automatic version update by autodist [release 0.7.35-1mamba;Tue Aug 05 2025] 2025-08-05 11:54:01 +02:00
2c2c5ea0ef automatic version update by autodist [release 0.7.34-1mamba;Tue Jul 08 2025] 2025-07-08 18:28:09 +02:00
0179a5d6b9 automatic version update by autodist [release 0.7.33-1mamba;Wed Jun 04 2025] 2025-06-04 12:17:42 +02:00
448b4cc652 automatic version update by autodist [release 0.7.32-1mamba;Fri Apr 04 2025] 2025-04-04 17:10:18 +02:00
f289603190 automatic version update by autodist [release 0.7.31-1mamba;Wed Nov 13 2024] 2024-11-13 22:43:06 +01:00
b41658c292 automatic version update by autodist [release 0.7.30-1mamba;Tue Jul 16 2024] 2024-07-19 11:12:35 +02:00
5e8ba2b414 rebuilt with ENABLE_COMPS and ENABLE_ZSTD_COMPRESSION [release 0.7.29-3mamba;Sun May 26 2024] 2024-05-26 12:30:03 +02:00
424e5af4dc rebuilt with rpm 4.19.1.1 [release 0.7.29-2mamba;Mon May 13 2024] 2024-05-18 19:51:11 +02:00
29b57136e6 automatic version update by autodist [release 0.7.29-1mamba;Tue Apr 30 2024] 2024-05-01 10:32:25 +02:00
51612e5013 automatic version update by autodist [release 0.7.28-1mamba;Fri Jan 26 2024] 2024-01-27 09:54:57 +01:00
6c4efc8731 automatic version update by autodist [release 0.7.27-1mamba;Fri Nov 24 2023] 2024-01-06 05:48:52 +01:00
57bbb26794 automatic version update by autodist [release 0.7.26-1mamba;Wed Nov 08 2023] 2024-01-06 05:48:52 +01:00
d32d72a039 automatic version update by autodist [release 0.7.25-1mamba;Fri Sep 15 2023] 2024-01-06 05:48:51 +01:00
9bf9694698 automatic version update by autodist [release 0.7.24-1mamba;Sun Apr 16 2023] 2024-01-06 05:48:50 +01:00
84a492bc6e automatic version update by autodist [release 0.7.23-1mamba;Sat Dec 17 2022] 2024-01-06 05:48:49 +01:00
6b41b9f4d6 remove multiarch cohexistence patch, build with -DFEDORA to fix multilib support [release 0.7.22-2mamba;Sat Apr 30 2022] 2024-01-06 05:48:49 +01:00
35a1c257cb automatic version update by autodist [release 0.7.22-1mamba;Tue Mar 29 2022] 2024-01-06 05:48:49 +01:00
d289a6dd95 automatic version update by autodist [release 0.7.21-1mamba;Fri Mar 04 2022] 2024-01-06 05:48:49 +01:00
eaed049a11 automatic version update by autodist [release 0.7.20-1mamba;Tue Sep 28 2021] 2024-01-06 05:48:48 +01:00
bea0f38f16 automatic version update by autodist [release 0.7.19-1mamba;Thu Apr 08 2021] 2024-01-06 05:48:48 +01:00
6659e638cc automatic version update by autodist [release 0.7.18-1mamba;Sat Mar 27 2021] 2024-01-06 05:48:48 +01:00
5fcf244956 rebuilt by autoport with build requirements: librpm-devel>=4.16.1.2-1mamba [release 0.7.17-2mamba;Sun Mar 07 2021] 2024-01-06 05:48:48 +01:00
8 changed files with 79 additions and 203 deletions

View File

@@ -1,11 +0,0 @@
--- libsolv-0.6.19/bindings/python/CMakeLists.txt.orig 2016-02-19 22:55:50.640253346 +0100
+++ libsolv-0.6.19/bindings/python/CMakeLists.txt 2016-02-19 23:16:50.826867127 +0100
@@ -2,7 +2,7 @@
FIND_PACKAGE (PythonLibs REQUIRED)
FIND_PACKAGE (PythonInterp ${PYTHONLIBS_VERSION_STRING} REQUIRED)
-EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "from sys import stdout; from distutils import sysconfig; stdout.write(sysconfig.get_python_lib(True))" OUTPUT_VARIABLE PYTHON_INSTALL_DIR)
+EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "from sys import stdout; from distutils import sysconfig; stdout.write(sysconfig.get_python_lib(plat_specific=True, prefix='/usr'))" OUTPUT_VARIABLE PYTHON_INSTALL_DIR)
IF (NOT DEFINED PYTHON_VERSION_MAJOR)
SET (PYTHON_VERSION_MAJOR 2)

View File

@@ -1,30 +0,0 @@
Only in libsolv-0.6.34.patched: build
diff -ru libsolv-0.6.34/ext/repo_pubkey.c libsolv-0.6.34.patched/ext/repo_pubkey.c
--- libsolv-0.6.34/ext/repo_pubkey.c 2018-05-17 00:43:25.000000000 +0200
+++ libsolv-0.6.34.patched/ext/repo_pubkey.c 2019-06-01 10:15:43.608634150 +0200
@@ -28,6 +28,7 @@
#ifndef RPM5
#include <rpm/header.h>
#endif
+#include <rpm/rpm46compat.h>
#include <rpm/rpmdb.h>
#include "pool.h"
@@ -757,7 +758,7 @@
#ifndef RPM5
dig = pgpNewDig();
#else
- dig = pgpDigNew(RPMVSF_DEFAULT, 0);
+ dig = pgpDigNew(RPMVSF_DEFAULT);
#endif
(void) pgpPrtPkts(pkts, pktsl, dig, 0);
#ifdef HAVE_PGPDIGGETPARAMS
@@ -782,7 +783,7 @@
#ifndef RPM5
(void)pgpFreeDig(dig);
#else
- (void)pgpDigFree(dig);
+ (void)pgpDigFree(dig, 0);
#endif
}

View File

@@ -1,11 +0,0 @@
--- libsolv-0.6.34/bindings/solv.i.orig 2019-06-01 10:55:51.388501920 +0200
+++ libsolv-0.6.34/bindings/solv.i 2019-06-01 10:56:02.810556652 +0200
@@ -573,7 +573,7 @@
#if defined(SWIGRUBY)
SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_Pool, SWIG_POINTER_DISOWN | 0 );
#elif defined(SWIGPYTHON)
- SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Pool, SWIG_POINTER_DISOWN | 0 );
+ SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Pool, SWIG_POINTER_DISOWN | 0 );
#elif defined(SWIGPERL)
SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_Pool, SWIG_POINTER_DISOWN | 0 );
#elif defined(SWIGTCL)

View File

@@ -1,27 +0,0 @@
(partial, not finished: rpmdbIndex* and headerImport APIs are used)
--- libsolv-0.6.34/ext/repo_rpmdb_librpm.h.orig 2018-03-23 12:04:14.000000000 +0100
+++ libsolv-0.6.34/ext/repo_rpmdb_librpm.h 2018-05-10 20:28:01.213443653 +0200
@@ -15,6 +15,12 @@
#include <rpm/rpmts.h>
#include <rpm/rpmmacro.h>
+#ifdef RPM5
+#define _RPMVSF_NOSIGNATURES (RPMVSF_NODSAHEADER | RPMVSF_NORSAHEADER | RPMVSF_NODSA | RPMVSF_NORSA)
+#define _RPMVSF_NODIGESTS (RPMVSF_NOSHA1HEADER | RPMVSF_NOMD5HEADER | RPMVSF_NOSHA1 | RPMVSF_NOMD5)
+#define _RPMVSF_NOHEADER (RPMVSF_NOSHA1HEADER | RPMVSF_NOMD5HEADER | RPMVSF_NODSAHEADER | RPMVSF_NORSAHEADER)
+#endif
+
struct rpmdbstate {
Pool *pool;
char *rootdir;
--- 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
#include <rpm/header.h>
+#else
+#include <rpm/rpm46compat.h>
#endif
#include <rpm/rpmdb.h>

View File

@@ -1,12 +0,0 @@
--- 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) */

View File

@@ -1,50 +0,0 @@
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)

View File

@@ -1,38 +0,0 @@
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

View File

@@ -1,5 +1,5 @@
Name: libsolv
Version: 0.7.17
Version: 0.7.35
Release: 1mamba
Summary: Library for solving packages and reading repositories
Group: System/Libraries
@@ -8,30 +8,24 @@ Distribution: openmamba
Packager: Silvan Calarco <silvan.calarco@mambasoft.it>
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
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: libdb53-devel
BuildRequires: liblzma-devel
BuildRequires: libperl
BuildRequires: libpython3-devel
BuildRequires: libpython311-devel
BuildRequires: librpm-devel
BuildRequires: libtcl-devel
BuildRequires: libxml2-devel
BuildRequires: libz-devel
BuildRequires: libzck-devel
BuildRequires: libzstd-devel
BuildRequires: perl-devel
## AUTOBUILDREQ-END
BuildRequires: librpm-devel >= 1:4.14.2.1
BuildRequires: librpm-devel >= 4.19.1.1
BuildRequires: libtk-devel
BuildRequires: cmake
BuildRoot: %{_tmppath}/%{name}-%{version}-root
%description
Library for solving packages and reading repositories.
@@ -61,22 +55,16 @@ Requires: %{name} = %{?epoch:%epoch:}%{version}-%{release}
%description -n python-libsolv-py3
This package contains the Python bindings for %{name}.
%debug_package
%prep
%setup -q
#%patch2 -p1
%ifarch x86_64
%patch6 -p1
%endif
%build
%cmake -d build \
-DENABLE_APPDATA=ON \
-DENABLE_BZIP2_COMPRESSION=ON \
-DENABLE_COMPLEX_DEPS=ON \
-DENABLE_LZMA_COMPRESSION=ON \
-DENABLE_ZCHUNK_COMPRESSION=ON \
-DENABLE_COMPS=ON \
-DENABLE_RPMDB=ON \
-DENABLE_RPMDB_BYRPMHEADER=ON \
-DENABLE_RPMDB_LIBRPM=ON \
@@ -89,14 +77,14 @@ This package contains the Python bindings for %{name}.
-DENABLE_TCL=ON \
-DENABLE_LZMA_COMPRESSION=ON \
-DENABLE_BZIP2_COMPRESSION=ON \
-DENABLE_ZSTD_COMPRESSION=ON \
-DENABLE_ZCHUNK_COMPRESSIO=ON \
-DWITH_SYSTEM_ZCHUNK=ON \
-DENABLE_PYTHON=OFF \
-DENABLE_PYTHON3=ON \
-DPYTHON3_EXECUTABLE=%{__python3} \
-DUSE_VENDORDIRS=ON
# -DPYTHON_EXECUTABLE=%{__python27} \
-DUSE_VENDORDIRS=ON \
-DFEDORA=ON
%make
@@ -109,8 +97,6 @@ cp ext/*.h %{buildroot}%{_includedir}/solv/
%clean
[ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%files
%defattr(-,root,root)
@@ -139,7 +125,9 @@ cp ext/*.h %{buildroot}%{_includedir}/solv/
%files tools
%defattr(-,root,root)
%{_bindir}/solv
%{_bindir}/appdata2solv
%{_bindir}/comps2solv
%{_bindir}/deltainfoxml2solv
%{_bindir}/dumpsolv
%{_bindir}/installcheck
@@ -152,6 +140,7 @@ cp ext/*.h %{buildroot}%{_includedir}/solv/
%{_bindir}/rpms2solv
%{_bindir}/updateinfoxml2solv
%{_mandir}/man1/appdata2solv.1*
%{_mandir}/man1/comps2solv.1*
%{_mandir}/man1/deltainfoxml2solv.1*
%{_mandir}/man1/dumpsolv.1*
%{_mandir}/man1/installcheck.1*
@@ -171,6 +160,72 @@ cp ext/*.h %{buildroot}%{_includedir}/solv/
%{python3_sitearch}/solv.py
%changelog
* Tue Aug 05 2025 Automatic Build System <autodist@openmamba.org> 0.7.35-1mamba
- automatic version update by autodist
* Tue Jul 08 2025 Automatic Build System <autodist@openmamba.org> 0.7.34-1mamba
- automatic version update by autodist
* Wed Jun 04 2025 Automatic Build System <autodist@openmamba.org> 0.7.33-1mamba
- automatic version update by autodist
* Fri Apr 04 2025 Automatic Build System <autodist@openmamba.org> 0.7.32-1mamba
- automatic version update by autodist
* Wed Nov 13 2024 Automatic Build System <autodist@openmamba.org> 0.7.31-1mamba
- automatic version update by autodist
* Tue Jul 16 2024 Automatic Build System <autodist@openmamba.org> 0.7.30-1mamba
- automatic version update by autodist
* Sun May 26 2024 Silvan Calarco <silvan.calarco@mambasoft.it> 0.7.29-3mamba
- rebuilt with ENABLE_COMPS and ENABLE_ZSTD_COMPRESSION
* Mon May 13 2024 Automatic Build System <autodist@openmamba.org> 0.7.29-2mamba
- rebuilt with rpm 4.19.1.1
* Tue Apr 30 2024 Automatic Build System <autodist@openmamba.org> 0.7.29-1mamba
- automatic version update by autodist
* Fri Jan 26 2024 Automatic Build System <autodist@openmamba.org> 0.7.28-1mamba
- automatic version update by autodist
* Fri Nov 24 2023 Automatic Build System <autodist@mambasoft.it> 0.7.27-1mamba
- automatic version update by autodist
* Wed Nov 08 2023 Automatic Build System <autodist@mambasoft.it> 0.7.26-1mamba
- automatic version update by autodist
* Fri Sep 15 2023 Automatic Build System <autodist@mambasoft.it> 0.7.25-1mamba
- automatic version update by autodist
* 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