21 Commits

Author SHA1 Message Date
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
8fcd534523 automatic version update by autodist [release 0.7.17-1mamba;Tue Feb 09 2021] 2024-01-06 05:48:48 +01:00
66058d1077 update to 0.7.16
python bindings only for python3 and packaged apart [release 0.7.16-1mamba;Sat Nov 28 2020]
2024-01-06 05:48:47 +01:00
4324cde5bc update to 0.7.15
update x86_64-multiarch-coexistence patch to only resolve supplements of the main arch [release 0.7.15-1mamba;Sun Sep 13 2020]
2024-01-06 05:48:47 +01:00
9aa9d72e01 update to 0.7.10 [release 0.7.10-1mamba;Thu Jan 16 2020] 2024-01-06 05:48:47 +01:00
5c1a693bd4 x86_64: added patch to allow cohexistance of packages with same name if from different archs (x86) [release 0.7.5-2mamba;Sun Jun 23 2019] 2024-01-06 05:48:47 +01:00
501a71dcff added upstream patch to fix endianess with rpm 5.2 [release 0.7.4-3mamba;Wed Jun 05 2019] 2024-01-06 05:48:47 +01:00
5 changed files with 119 additions and 119 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,39 +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.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
@@ -30,6 +30,8 @@
#include <rpm/rpmpgp.h>
#ifndef RPM5
#include <rpm/header.h>
+#else
+#include <rpm/rpm46compat.h>
#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

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,32 +1,31 @@
Name: libsolv
Version: 0.6.34
Version: 0.7.29
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.34-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
License: BSD
## AUTOBUILDREQ-BEGIN
BuildRequires: glibc-devel
BuildRequires: libbzip2-devel
BuildRequires: libexpat-devel
BuildRequires: liblzma-devel
BuildRequires: libperl
BuildRequires: libpython-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
BuildRequires: rpm-devel
## AUTOBUILDREQ-END
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.
@@ -48,35 +47,45 @@ 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
%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=%{__python3} \
-DUSE_VENDORDIRS=ON \
-DCMAKE_C_FLAGS="%{optflags} -Doff64_t=__off64_t"
-DFEDORA=ON
%make
@@ -97,11 +106,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 +124,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 +144,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 +155,90 @@ cp ext/*.h %{buildroot}%{_includedir}/solv/
%{_mandir}/man1/rpms2solv.1*
%{_mandir}/man1/updateinfoxml2solv.1*
%files -n python-libsolv-py3
%defattr(-,root,root)
%{python3_sitearch}/_solv.so
%{python3_sitearch}/solv.py
%changelog
* 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
* 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