Update to last successful build

d718eacfcd26d7f15893b994971ddf3de9161cba Fix the openSUSE package with CMake >= 3.14

OBS-URL: https://build.opensuse.org/package/show/zypp:Head/libzypp?expand=0&rev=2091
This commit is contained in:
ZYpp Developers 2019-04-02 16:13:30 +00:00 committed by Git OBS Bridge
parent 8fe282b587
commit d70ef39189
3 changed files with 15 additions and 8 deletions

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d19861119f956f579d485a8ec0d9d8bc9a40799d540b3522c839054b93789adc
size 4729433
oid sha256:cad342fa0633162e42ddb30f9ef6455fef622873cd1e19f1ec433643c605d5fb
size 4729485

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Mon Apr 1 08:49:45 UTC 2019 - Christophe Giboudeaux <christophe@krop.fr>
- Fix build with CMake >= 3.14.0:
Starting with CMake 3.14, EXCLUDE_FROM_ALL now spreads from
directories to targets. 'make -C someSubdir' when 'someSubdir'
uses the 'EXCLUDE_FROM_ALL' keyword does nothing. (gh/libzypp#libzypp#165)
-------------------------------------------------------------------
Thu Mar 21 12:35:39 CET 2019 - ma@suse.de

View File

@ -221,6 +221,9 @@ export EXTRA_CMAKE_OPTIONS="-DDISABLE_LIBPROXY=ON"
%endif
cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \
-DENABLE_BUILD_DOCS=TRUE \
-DENABLE_BUILD_TRANS=TRUE \
-DENABLE_BUILD_TESTS=TRUE \
-DDOC_INSTALL_DIR=%{_docdir} \
-DLIB=%{_lib} \
-DCMAKE_BUILD_TYPE=Release \
@ -228,14 +231,10 @@ cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \
${EXTRA_CMAKE_OPTIONS} \
..
make %{?_smp_mflags} VERBOSE=1
make -C doc/autodoc %{?_smp_mflags}
make -C po %{?_smp_mflags} translations
make -C tests %{?_smp_mflags}
%install
cd build
%make_install
%make_install -C doc/autodoc
%if 0%{?fedora_version} || 0%{?rhel_version} >= 600 || 0%{?centos_version} >= 600
ln -s %{_sysconfdir}/yum.repos.d %{buildroot}/%{_sysconfdir}/zypp/repos.d
%else
@ -264,9 +263,9 @@ mkdir -p %{buildroot}/%{_var}/cache/zypp
sed -i "s|# solver.dupAllowVendorChange = true|solver.dupAllowVendorChange = false|g" %{buildroot}%{_sysconfdir}/zypp/zypp.conf
%endif
%make_install -C po
# Create filelist with translations
cd ..
# Create filelist with translations
%{find_lang} zypp
%check