Compare commits
3 Commits
0.7.5-2mam
...
0.7.16-1ma
Author | SHA1 | Date | |
---|---|---|---|
66058d1077 | |||
4324cde5bc | |||
9aa9d72e01 |
@@ -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.
|
55
libsolv.spec
55
libsolv.spec
@@ -1,6 +1,6 @@
|
||||
Name: libsolv
|
||||
Version: 0.7.5
|
||||
Release: 2mamba
|
||||
Version: 0.7.16
|
||||
Release: 1mamba
|
||||
Summary: Library for solving packages and reading repositories
|
||||
Group: System/Libraries
|
||||
Vendor: openmamba
|
||||
@@ -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
|
||||
@@ -22,7 +22,7 @@ BuildRequires: libbzip2-devel
|
||||
BuildRequires: libdb53-devel
|
||||
BuildRequires: liblzma-devel
|
||||
BuildRequires: libperl
|
||||
BuildRequires: libpython-devel
|
||||
BuildRequires: libpython3-devel
|
||||
BuildRequires: libtcl-devel
|
||||
BuildRequires: libxml2-devel
|
||||
BuildRequires: libz-devel
|
||||
@@ -53,16 +53,19 @@ 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
|
||||
@@ -88,14 +91,12 @@ This package contains utility applications for %{name}.
|
||||
-DENABLE_BZIP2_COMPRESSION=ON \
|
||||
-DENABLE_ZCHUNK_COMPRESSIO=ON \
|
||||
-DWITH_SYSTEM_ZCHUNK=ON \
|
||||
-DENABLE_PYTHON=ON \
|
||||
-DPYTHON_EXECUTABLE=%{__python27} \
|
||||
-DENABLE_PYTHON=OFF \
|
||||
-DENABLE_PYTHON3=ON \
|
||||
-DPYTHON3_EXECUTABLE=%{__python36} \
|
||||
-DPYTHON3_EXECUTABLE=%{__python3} \
|
||||
-DUSE_VENDORDIRS=ON
|
||||
|
||||
# -DPythonLibs_FIND_VERSION=2 \
|
||||
# -DPythonLibs_FIND_VERSION_MAJOR=2 \
|
||||
# -DPYTHON_EXECUTABLE=%{__python27} \
|
||||
|
||||
%make
|
||||
|
||||
@@ -116,13 +117,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
|
||||
%{python36_sitearch}/_solv.so
|
||||
%{python36_sitearch}/solv.py
|
||||
%doc CREDITS
|
||||
%doc LICENSE.BSD CREDITS
|
||||
|
||||
%files devel
|
||||
%defattr(-,root,root)
|
||||
@@ -168,7 +165,23 @@ 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
|
||||
* 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)
|
||||
|
||||
|
Reference in New Issue
Block a user