Accepting request 691506 from zypp:Head

Softwarestack update

OBS-URL: https://build.opensuse.org/request/show/691506
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libzypp?expand=0&rev=414
This commit is contained in:
Dominique Leuenberger 2019-04-08 08:31:52 +00:00 committed by Git OBS Bridge
commit 946ce3157d
4 changed files with 28 additions and 10 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:63decf83805312365547e85febe50757c143aef6650f3bfd765ccb4deafdde7c
size 4728555

3
libzypp-17.11.4.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:665aa6c485c76a6fae19e370f7af3d351d51df69d4d200682992d61ac83fdf66
size 4729962

View File

@ -1,3 +1,22 @@
-------------------------------------------------------------------
Thu Apr 4 13:24:40 CEST 2019 - ma@suse.de
- Enhance scanning /sys for modaliases (bsc#1130161)
- version 17.11.4 (9)
-------------------------------------------------------------------
Tue Apr 2 18:15:12 CEST 2019 - ma@suse.de
- Prevent SEGV if the application sets an empty TextLocale (bsc#1127026)
-------------------------------------------------------------------
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 Thu Mar 21 12:35:39 CET 2019 - ma@suse.de

View File

@ -17,7 +17,7 @@
Name: libzypp Name: libzypp
Version: 17.11.3 Version: 17.11.4
Release: 0 Release: 0
Url: https://github.com/openSUSE/libzypp Url: https://github.com/openSUSE/libzypp
Summary: Library for package, patch, pattern and product management Summary: Library for package, patch, pattern and product management
@ -221,6 +221,9 @@ export EXTRA_CMAKE_OPTIONS="-DDISABLE_LIBPROXY=ON"
%endif %endif
cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \ cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \
-DENABLE_BUILD_DOCS=TRUE \
-DENABLE_BUILD_TRANS=TRUE \
-DENABLE_BUILD_TESTS=TRUE \
-DDOC_INSTALL_DIR=%{_docdir} \ -DDOC_INSTALL_DIR=%{_docdir} \
-DLIB=%{_lib} \ -DLIB=%{_lib} \
-DCMAKE_BUILD_TYPE=Release \ -DCMAKE_BUILD_TYPE=Release \
@ -228,14 +231,10 @@ cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \
${EXTRA_CMAKE_OPTIONS} \ ${EXTRA_CMAKE_OPTIONS} \
.. ..
make %{?_smp_mflags} VERBOSE=1 make %{?_smp_mflags} VERBOSE=1
make -C doc/autodoc %{?_smp_mflags}
make -C po %{?_smp_mflags} translations
make -C tests %{?_smp_mflags}
%install %install
cd build cd build
%make_install %make_install
%make_install -C doc/autodoc
%if 0%{?fedora_version} || 0%{?rhel_version} >= 600 || 0%{?centos_version} >= 600 %if 0%{?fedora_version} || 0%{?rhel_version} >= 600 || 0%{?centos_version} >= 600
ln -s %{_sysconfdir}/yum.repos.d %{buildroot}/%{_sysconfdir}/zypp/repos.d ln -s %{_sysconfdir}/yum.repos.d %{buildroot}/%{_sysconfdir}/zypp/repos.d
%else %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 sed -i "s|# solver.dupAllowVendorChange = true|solver.dupAllowVendorChange = false|g" %{buildroot}%{_sysconfdir}/zypp/zypp.conf
%endif %endif
%make_install -C po
# Create filelist with translations
cd .. cd ..
# Create filelist with translations
%{find_lang} zypp %{find_lang} zypp
%check %check