testing/glibc
SHA256
3
0
Fork 0
forked from pool/glibc
Code Pull Requests Activity

Accepting request 900350 from home:lnussel:usrmove

Browse Source 
- Enable usrmerge in Factory always as it's default there
- Add conflict with pre-usrmerge filesystem package

OBS-URL: https://build.opensuse.org/request/show/900350
OBS-URL: https://build.opensuse.org/package/show/Base:System/glibc?expand=0&rev=599
This commit is contained in:
Andreas Schwab 2021-06-16 14:37:05 +00:00 committed by Git OBS Bridge
parent 75f810d685
commit 73b0bc57c8
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
glibc.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Jun 11 11:42:10 UTC 2021 - Ludwig Nussel <lnussel@suse.de>
- Enable usrmerge in Factory always as it's default there
- Add conflict with pre-usrmerge filesystem package
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Jun 10 13:24:39 UTC 2021 - Andreas Schwab <schwab@suse.de> Thu Jun 10 13:24:39 UTC 2021 - Andreas Schwab <schwab@suse.de>

6
glibc.spec
View File

@ -25,7 +25,7 @@
%define flavor @BUILD_FLAVOR@%{nil} %define flavor @BUILD_FLAVOR@%{nil}
%if 0%{?usrmerged} %if 0%{?usrmerged} || 0%{?suse_version} >= 1550
%bcond_without usrmerged %bcond_without usrmerged
%else %else
%bcond_with usrmerged %bcond_with usrmerged
@ -165,6 +165,10 @@ Obsoletes: ngpt-devel < 2.2.2
Provides: ngpt = 2.2.2 Provides: ngpt = 2.2.2
Provides: ngpt-devel = 2.2.2 Provides: ngpt-devel = 2.2.2
Conflicts: kernel < %{enablekernel} Conflicts: kernel < %{enablekernel}
%if %{with usrmerged}
# make sure we have post-usrmerge filesystem package
Conflicts: filesystem < 15.6
%endif
# bug437293 - handle update from SLES10 on PowerPC # bug437293 - handle update from SLES10 on PowerPC
%ifarch ppc64 %ifarch ppc64
Obsoletes: glibc-64bit Obsoletes: glibc-64bit