packages/glibc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!470 optimize Obsoletes version

Browse Source 
From: @liqingqing_1229 
Reviewed-by: @wswsamao 
Signed-off-by: @wswsamao
This commit is contained in:
openeuler-ci-bot 2022-07-29 01:11:21 +00:00 committed by Gitee
commit b91a952fb4
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
glibc.spec
View File

@ -66,7 +66,7 @@
############################################################################## ##############################################################################
Name: glibc Name: glibc
Version: 2.34 Version: 2.34
Release: 91 Release: 92
Summary: The GNU libc libraries Summary: The GNU libc libraries
License: %{all_license} License: %{all_license}
URL: http://www.gnu.org/software/glibc/ URL: http://www.gnu.org/software/glibc/
@ -334,7 +334,7 @@ Summary: All language packs for %{name}.
Requires: %{name} = %{version}-%{release} Requires: %{name} = %{version}-%{release}
Requires: %{name}-common = %{version}-%{release} Requires: %{name}-common = %{version}-%{release}
Provides: %{name}-langpack = %{version}-%{release} Provides: %{name}-langpack = %{version}-%{release}
Obsoletes: %{name}-minimal-langpack = 2.28 Obsoletes: %{name}-minimal-langpack <= 2.28
%{lua: %{lua:
-- List the Symbol provided by all-langpacks -- List the Symbol provided by all-langpacks
@ -342,7 +342,7 @@ lang_provides = {}
for line in io.lines(rpm.expand("%{SOURCE5}")) do for line in io.lines(rpm.expand("%{SOURCE5}")) do
print(rpm.expand([[ print(rpm.expand([[
Provides:]]..line..[[ = %{version}-%{release} Provides:]]..line..[[ = %{version}-%{release}
Obsoletes:]]..line..[[ = 2.28 Obsoletes:]]..line..[[ <= 2.28
]])) ]]))
end end
} }
@ -400,8 +400,8 @@ Provides: %{name}-headers = %{version}-%{release}
Provides: %{name}-headers(%{_target_cpu}) Provides: %{name}-headers(%{_target_cpu})
Provides: %{name}-headers%{_isa} = %{version}-%{release} Provides: %{name}-headers%{_isa} = %{version}-%{release}
Obsoletes: %{name}-static = 2.28 Obsoletes: %{name}-static <= 2.28
Obsoletes: %{name}-headers = 2.28 Obsoletes: %{name}-headers <= 2.28
%description devel %description devel
The glibc-devel package contains the object files necessary for developing The glibc-devel package contains the object files necessary for developing
@ -436,7 +436,7 @@ Provides: nss_db = %{version}-%{release}
Provides: nss_db%{_isa} = %{version}-%{release} Provides: nss_db%{_isa} = %{version}-%{release}
Provides: nss_hesiod = %{version}-%{release} Provides: nss_hesiod = %{version}-%{release}
Provides: nss_hesiod%{_isa} = %{version}-%{release} Provides: nss_hesiod%{_isa} = %{version}-%{release}
Obsoletes: nss_db = 2.28, nss_hesiod = 2.28 Obsoletes: nss_db <= 2.28, nss_hesiod <= 2.28
%description -n nss_modules %description -n nss_modules
This package contains nss_db and nss_hesiod. The former uses hash-indexed files This package contains nss_db and nss_hesiod. The former uses hash-indexed files
@ -490,7 +490,7 @@ Requires: %{name} = %{version}-%{release}
Provides: %{name}-utils = %{version}-%{release} Provides: %{name}-utils = %{version}-%{release}
Provides: %{name}-utils%{_isa} = %{version}-%{release} Provides: %{name}-utils%{_isa} = %{version}-%{release}
Obsoletes: %{name}-utils = 2.28 Obsoletes: %{name}-utils <= 2.28
%description debugutils %description debugutils
This package provides memusage, a memory usage profiler, mtrace, a memory leak This package provides memusage, a memory usage profiler, mtrace, a memory leak
@ -1407,6 +1407,9 @@ fi
%endif %endif
%changelog %changelog
* Thu Jul 28 2022 Qingqing Li <liqingqing3@huawei.com> - 2.34-92
- optimize Obsoletes version
* Wed Jul 6 2022 Yang Yanchao <yangyanchao6@huawei.com> - 2.34-91 * Wed Jul 6 2022 Yang Yanchao <yangyanchao6@huawei.com> - 2.34-91
- add libpthread_nonshared.a in glibc-compat-2.17 for old applications - add libpthread_nonshared.a in glibc-compat-2.17 for old applications