pool/libsolv
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update to last successful build

Browse Source 
cd6619abd00bcb85899353ed67561df57eb4c338 Merge pull request #195 from Conan-Kudo/enablemorefeatures
1d70d9a8fe8168de70d329bff0f1d7429f99e9ff Enable complex/rich dependencies for CentOS/RHEL 7
05aab7772cf55a8a7fd425e6727aa326056b756c Disable bzip2 and xz/lzma compression support for SLE <= 12
4720b411031146219c55a1767b89410325620685 Enable more libsolv features and rework spec distro conditionals

OBS-URL: https://build.opensuse.org/package/show/zypp:Head/libsolv?expand=0&rev=801
This commit is contained in:
ZYpp Developers 2017-05-30 08:41:51 +00:00 committed by Git OBS Bridge
parent b4707685a2
commit 4769f21d32
3 changed files with 65 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libsolv-0.6.27.tar.bz2
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:6149dfc5c20e66359b95d65a454e2693ce445d458d7bf6442815f754079b5019
size 473303
oid sha256:342392ecadfed2fdce8ab084a8fd3653e44a78abf5e33a70652de95f790ec63b
size 473666

20
libsolv.changes
View File

@ -1,3 +1,23 @@
-------------------------------------------------------------------
Sun May 28 13:32:15 UTC 2017 - ngompa13@gmail.com
- Enable complex/rich dependencies for CentOS/RHEL 7, matching how
libsolv is configured there.
-------------------------------------------------------------------
Thu May 11 12:41:07 UTC 2017 - ngompa13@gmail.com
- Disable bzip2 and xz/lzma compression support for SLE <= 12
-------------------------------------------------------------------
Mon May 8 13:15:09 UTC 2017 - ngompa13@gmail.com
- Enable bzip2 and xz/lzma compression support
- Enable complex/rich dependencies on distributions with RPM 4.13+
- Simplified CentOS/RHEL conditionals
- Added Mageia conditionals
- Fixed a few spec portability issues
-------------------------------------------------------------------
Tue Apr 25 14:11:05 CEST 2017 - mls@suse.de

50
libsolv.spec
View File

@ -31,18 +31,32 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build
%bcond_without ruby_binding
%bcond_with zypp
%if ! ((0%{?suse_version} && 0%{?suse_version} < 1330 && ! 0%{?is_opensuse}) || 0%{?suse_version} == 1110)
%bcond_without bz2
%bcond_without xz
%else
%bcond_with bz2
%bcond_with xz
%endif
%if 0%{?fedora} || 0%{?rhel} >= 7 || 0%{?mageia} >= 6 || 0%{?suse_version} >= 1330
%bcond_without richdeps
%else
%bcond_with richdeps
%endif
%if 0%{?mandriva_version}
# force this version on mandriva
BuildRequires: libneon0.26-devel
%endif
%if 0%{?fedora_version} || 0%{?rhel_version} >= 600 || 0%{?centos_version} >= 600
%if 0%{?fedora} || 0%{?rhel} >= 6 || 0%{?mageia}
BuildRequires: db-devel
%endif
BuildRequires: libxml2-devel
%if 0%{?suse_version} && 0%{?suse_version} < 1100
BuildRequires: graphviz
%endif
%if 0%{?suse_version} > 1020
%if 0%{?suse_version} > 1020 || 0%{?fedora} || 0%{?mageia}
BuildRequires: fdupes
%endif
BuildRequires: cmake
@ -52,7 +66,7 @@ BuildRequires: zlib-devel
%if %{with perl_binding}
BuildRequires: perl
%if 0%{?fedora_version} || 0%{?rhel_version} >= 600 || 0%{?centos_version} >= 600
%if 0%{?fedora} || 0%{?rhel} >= 6 || 0%{?mageia}
BuildRequires: perl-devel
%endif
BuildRequires: swig
@ -73,6 +87,22 @@ BuildRequires: swig
BuildRequires: python3-devel
%endif
%if %{with bz2}
%if 0%{?fedora} || 0%{?rhel} || 0%{?mageia}
BuildRequires: bzip2-devel
%endif
%if 0%{?suse_version}
BuildRequires: libbz2-devel
%endif
%endif
%if %{with xz}
BuildRequires: xz-devel
%endif
Summary: A new approach to package dependency solving
License: BSD-3-Clause
Group: Development/Libraries/C and C++
@ -119,7 +149,7 @@ A new approach to package dependency solving.
Summary: Applications demoing the libsolv library
Group: System/Management
Requires: curl
%if 0%{?fedora_version} || 0%{?rhel_version} >= 600 || 0%{?centos_version} >= 600
%if 0%{?fedora} || 0%{?rhel} >= 6 || 0%{?mageia}
Requires: gnupg2
%endif
%if 0%{?suse_version}
@ -170,8 +200,11 @@ export CFLAGS="$RPM_OPT_FLAGS"
export CXXFLAGS="$CFLAGS"
CMAKE_FLAGS=
%if 0%{?fedora_version} || 0%{?rhel_version} >= 600 || 0%{?centos_version} >= 600
CMAKE_FLAGS="-DFEDORA=1"
%if 0%{?fedora} || 0%{?rhel} >= 6
CMAKE_FLAGS="-DFEDORA=1 -DENABLE_APPDATA=1 -DENABLE_COMPS=1"
%endif
%if 0%{?mageia}
CMAKE_FLAGS="-DMAGEIA=1 -DENABLE_APPDATA=1 -DENABLE_COMPS=1"
%endif
%if 0%{?suse_version}
CMAKE_FLAGS="-DSUSE=1 -DENABLE_APPDATA=1 -DENABLE_COMPS=1"
@ -189,10 +222,13 @@ cmake $CMAKE_FLAGS \
%{?with_python_binding:-DENABLE_PYTHON=1} \
%{?with_python3_binding:-DENABLE_PYTHON3=1} \
%{?with_ruby_binding:-DENABLE_RUBY=1} \
%{?with_bz2:-DENABLE_BZIP2_COMPRESSION=1} \
%{?with_xz:-DENABLE_LZMA_COMPRESSION=1} \
%{?with_richdeps:-DENABLE_COMPLEX_DEPS=1} \
%{?with_zypp:-DENABLE_SUSEREPO=1 -DENABLE_HELIXREPO=1} \
-DUSE_VENDORDIRS=1 \
-DCMAKE_SKIP_RPATH=1
make %{?jobs:-j %jobs}
make %{?_smp_mflags}
%install
make DESTDIR=$RPM_BUILD_ROOT install