forked from pool/libzypp
Accepting request 915238 from zypp:Head
Softwarestack update OBS-URL: https://build.opensuse.org/request/show/915238 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libzypp?expand=0&rev=447
This commit is contained in:
commit
3e20dc5313
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:bd43be26af2a6ac277c86dfbd849eec2957b20e9873147f421354cbf1f641c95
|
||||
size 5354239
|
3
libzypp-17.28.2.tar.bz2
Normal file
3
libzypp-17.28.2.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:37bb6e5fd0053da561a31028951636c2f49e0e27725083fcd81abd297fb726c3
|
||||
size 5353982
|
@ -1,3 +1,10 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Aug 31 10:49:51 CEST 2021 - ma@suse.de
|
||||
|
||||
- Workaround Bug 1189788: Don't allow ZYPP_SINGLE_RPMTRANS=1 on a
|
||||
not UsrMerged Tumbleweed system.
|
||||
- version 17.28.2 (22)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Aug 23 08:39:15 CEST 2021 - ma@suse.de
|
||||
|
||||
|
15
libzypp.spec
15
libzypp.spec
@ -40,11 +40,11 @@
|
||||
%endif
|
||||
|
||||
Name: libzypp
|
||||
Version: 17.28.1
|
||||
Version: 17.28.2
|
||||
Release: 0
|
||||
License: GPL-2.0-or-later
|
||||
URL: https://github.com/openSUSE/libzypp
|
||||
Summary: Library for package, patch, pattern and product management
|
||||
License: GPL-2.0-or-later
|
||||
Group: System/Packages
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
Source: %{name}-%{version}.tar.bz2
|
||||
@ -245,8 +245,15 @@ Developer documentation for libzypp.
|
||||
%build
|
||||
mkdir build
|
||||
cd build
|
||||
%if 0%{?suse_version} > 1500
|
||||
# Bug 1189788 - UsrMerge: filesystem package breaks system when upgraded in a single rpm transaction
|
||||
# While the bug is not fixed, we don't allow ZYPP_SINGLE_RPMTRANS=1 on a not UsrMerged system
|
||||
export CFLAGS="%{optflags} -DNO_SINGLETRANS_USERMERGE"
|
||||
export CXXFLAGS="%{optflags} -DNO_SINGLETRANS_USERMERGE"
|
||||
%else
|
||||
export CFLAGS="%{optflags}"
|
||||
export CXXFLAGS="%{optflags}"
|
||||
%endif
|
||||
unset EXTRA_CMAKE_OPTIONS
|
||||
|
||||
cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \
|
||||
@ -344,14 +351,14 @@ match_type: glob
|
||||
echo "
|
||||
solvable_name: $1
|
||||
match_type: glob
|
||||
version: $2
|
||||
Version: $2
|
||||
" >> ${LOCKSFILE}
|
||||
;;
|
||||
3 ) #TODO version
|
||||
echo "
|
||||
solvable_name: $1
|
||||
match_type: glob
|
||||
version: $2 $3
|
||||
Version: $2 $3
|
||||
" >> ${LOCKSFILE}
|
||||
;;
|
||||
esac
|
||||
|
Loading…
x
Reference in New Issue
Block a user