Compare commits
6 Commits
0.7.10-1ma
...
0.7.19-1ma
Author | SHA1 | Date | |
---|---|---|---|
bea0f38f16 | |||
6659e638cc | |||
5fcf244956 | |||
8fcd534523 | |||
66058d1077 | |||
4324cde5bc |
@@ -1,12 +1,11 @@
|
|||||||
diff -Nru libsolv-0.7.5/src/rules.c libsolv-0.7.5.patched/src/rules.c
|
--- libsolv-0.7.15/src/rules.c.orig 2020-09-13 11:49:27.386000000 +0200
|
||||||
--- libsolv-0.7.5/src/rules.c 2019-06-22 17:43:42.000000000 +0200
|
+++ libsolv-0.7.15/src/rules.c 2020-09-13 11:46:18.006000000 +0200
|
||||||
+++ libsolv-0.7.5.patched/src/rules.c 2019-06-23 19:29:11.527890506 +0200
|
@@ -1075,6 +1075,9 @@
|
||||||
@@ -1016,6 +1016,9 @@
|
|
||||||
p = 0;
|
p = 0;
|
||||||
if (s->name == ps->name)
|
if (s->name == ps->name)
|
||||||
{
|
{
|
||||||
+ /* x86-64: allow cohexistence with x86 arch packages */
|
+ /* x86-64: allow cohexistence with x86 arch packages */
|
||||||
+ if (ps->arch != s->arch)
|
+ if (ps->arch != s->arch && !s->supplements)
|
||||||
+ continue;
|
+ continue;
|
||||||
/* optimization: do not add the same-name conflict rule if it was
|
/* optimization: do not add the same-name conflict rule if it was
|
||||||
* already added when we looked at the other package.
|
* already added when we looked at the other package.
|
60
libsolv.spec
60
libsolv.spec
@@ -1,12 +1,12 @@
|
|||||||
Name: libsolv
|
Name: libsolv
|
||||||
Version: 0.7.10
|
Version: 0.7.19
|
||||||
Release: 1mamba
|
Release: 1mamba
|
||||||
Summary: Library for solving packages and reading repositories
|
Summary: Library for solving packages and reading repositories
|
||||||
Group: System/Libraries
|
Group: System/Libraries
|
||||||
Vendor: openmamba
|
Vendor: openmamba
|
||||||
Distribution: openmamba
|
Distribution: openmamba
|
||||||
Packager: Silvan Calarco <silvan.calarco@mambasoft.it>
|
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
|
Source: https://github.com/openSUSE/libsolv.git/%{version}/libsolv-%{version}.tar.bz2
|
||||||
Patch0: libsolv-0.6.35-rpm-5.patch
|
Patch0: libsolv-0.6.35-rpm-5.patch
|
||||||
Patch1: libsolv-0.6.34-rpm-5.2.patch
|
Patch1: libsolv-0.6.34-rpm-5.2.patch
|
||||||
@@ -14,7 +14,7 @@ Patch2: libsolv-0.6.34-python.patch
|
|||||||
Patch3: libsolv-0.6.34-swig-4.0.0.patch
|
Patch3: libsolv-0.6.34-swig-4.0.0.patch
|
||||||
Patch4: libsolv-0.7.4-rpm5-5.2-endianess-fix.patch
|
Patch4: libsolv-0.7.4-rpm5-5.2-endianess-fix.patch
|
||||||
Patch5: libsolv-0.7.4-rpm5.2-still-has-array-index.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
|
License: BSD
|
||||||
## AUTOBUILDREQ-BEGIN
|
## AUTOBUILDREQ-BEGIN
|
||||||
BuildRequires: glibc-devel
|
BuildRequires: glibc-devel
|
||||||
@@ -22,16 +22,15 @@ BuildRequires: libbzip2-devel
|
|||||||
BuildRequires: libdb53-devel
|
BuildRequires: libdb53-devel
|
||||||
BuildRequires: liblzma-devel
|
BuildRequires: liblzma-devel
|
||||||
BuildRequires: libperl
|
BuildRequires: libperl
|
||||||
BuildRequires: libpython-devel
|
BuildRequires: libpython3-devel
|
||||||
BuildRequires: libtcl-devel
|
BuildRequires: libtcl-devel
|
||||||
BuildRequires: libxml2-devel
|
BuildRequires: libxml2-devel
|
||||||
BuildRequires: libz-devel
|
BuildRequires: libz-devel
|
||||||
BuildRequires: libzstd-devel
|
BuildRequires: libzstd-devel
|
||||||
BuildRequires: perl-devel
|
BuildRequires: perl-devel
|
||||||
## AUTOBUILDREQ-END
|
## AUTOBUILDREQ-END
|
||||||
BuildRequires: librpm-devel >= 1:4.14.2.1
|
BuildRequires: librpm-devel >= 4.16.1.2-1mamba
|
||||||
BuildRequires: cmake
|
BuildRequires: cmake
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-root
|
|
||||||
|
|
||||||
%description
|
%description
|
||||||
Library for solving packages and reading repositories.
|
Library for solving packages and reading repositories.
|
||||||
@@ -53,6 +52,14 @@ Requires: %{name} = %{?epoch:%epoch:}%{version}-%{release}
|
|||||||
%description tools
|
%description tools
|
||||||
This package contains utility applications for %{name}.
|
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
|
%debug_package
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
@@ -83,14 +90,12 @@ This package contains utility applications for %{name}.
|
|||||||
-DENABLE_BZIP2_COMPRESSION=ON \
|
-DENABLE_BZIP2_COMPRESSION=ON \
|
||||||
-DENABLE_ZCHUNK_COMPRESSIO=ON \
|
-DENABLE_ZCHUNK_COMPRESSIO=ON \
|
||||||
-DWITH_SYSTEM_ZCHUNK=ON \
|
-DWITH_SYSTEM_ZCHUNK=ON \
|
||||||
-DENABLE_PYTHON=ON \
|
-DENABLE_PYTHON=OFF \
|
||||||
-DPYTHON_EXECUTABLE=%{__python27} \
|
|
||||||
-DENABLE_PYTHON3=ON \
|
-DENABLE_PYTHON3=ON \
|
||||||
-DPYTHON3_EXECUTABLE=%{__python36} \
|
-DPYTHON3_EXECUTABLE=%{__python3} \
|
||||||
-DUSE_VENDORDIRS=ON
|
-DUSE_VENDORDIRS=ON
|
||||||
|
|
||||||
# -DPythonLibs_FIND_VERSION=2 \
|
# -DPYTHON_EXECUTABLE=%{__python27} \
|
||||||
# -DPythonLibs_FIND_VERSION_MAJOR=2 \
|
|
||||||
|
|
||||||
%make
|
%make
|
||||||
|
|
||||||
@@ -111,13 +116,9 @@ cp ext/*.h %{buildroot}%{_includedir}/solv/
|
|||||||
%{_libdir}/libsolv.so.*
|
%{_libdir}/libsolv.so.*
|
||||||
%{_libdir}/libsolvext.so.*
|
%{_libdir}/libsolvext.so.*
|
||||||
%{perl_vendorarch}/solv.*
|
%{perl_vendorarch}/solv.*
|
||||||
%{_libdir}/ruby/vendor_ruby/*/*-linux-gnu*/solv.so
|
%{_libdir}/ruby/vendor_ruby/*/*/solv.so
|
||||||
%{_prefix}/lib/tcl8/*/solv-%{version}.*
|
%{_prefix}/lib/tcl8/*/solv-%{version}.*
|
||||||
%{python27_sitearch}/_solv.so
|
%doc LICENSE.BSD CREDITS
|
||||||
%{python27_sitearch}/solv.py
|
|
||||||
%{python36_sitearch}/_solv.so
|
|
||||||
%{python36_sitearch}/solv.py
|
|
||||||
%doc CREDITS
|
|
||||||
|
|
||||||
%files devel
|
%files devel
|
||||||
%defattr(-,root,root)
|
%defattr(-,root,root)
|
||||||
@@ -163,7 +164,32 @@ cp ext/*.h %{buildroot}%{_includedir}/solv/
|
|||||||
%{_mandir}/man1/rpms2solv.1*
|
%{_mandir}/man1/rpms2solv.1*
|
||||||
%{_mandir}/man1/updateinfoxml2solv.1*
|
%{_mandir}/man1/updateinfoxml2solv.1*
|
||||||
|
|
||||||
|
%files -n python-libsolv-py3
|
||||||
|
%defattr(-,root,root)
|
||||||
|
%{python3_sitearch}/_solv.so
|
||||||
|
%{python3_sitearch}/solv.py
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* 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
|
* Thu Jan 16 2020 Silvan Calarco <silvan.calarco@mambasoft.it> 0.7.10-1mamba
|
||||||
- update to 0.7.10
|
- update to 0.7.10
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user