optimize Obsoletes version
(cherry picked from commit e854604758e3453b1b6233e041e145ca4e97747d)
This commit is contained in:
parent
6c31e7884f
commit
a7a1eff4c7
17
glibc.spec
17
glibc.spec
@ -62,7 +62,7 @@
|
|||||||
##############################################################################
|
##############################################################################
|
||||||
Name: glibc
|
Name: glibc
|
||||||
Version: 2.28
|
Version: 2.28
|
||||||
Release: 90
|
Release: 91
|
||||||
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/
|
||||||
@ -244,7 +244,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
|
||||||
@ -252,7 +252,7 @@ lang_provides = {}
|
|||||||
for line in io.lines(rpm.expand("%{SOURCE7}")) do
|
for line in io.lines(rpm.expand("%{SOURCE7}")) 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
|
||||||
}
|
}
|
||||||
@ -296,8 +296,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
|
||||||
@ -332,7 +332,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
|
||||||
@ -386,7 +386,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
|
||||||
@ -1213,6 +1213,9 @@ fi
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Jul 28 2022 Qingqing Li <liqingqing3@huawei.com> - 2.28-91
|
||||||
|
- optimize Obsoletes version
|
||||||
|
|
||||||
* Thu Jul 7 2022 Yang Yanchao <yangyanchao6@huawei.com> - 2.28-90
|
* Thu Jul 7 2022 Yang Yanchao <yangyanchao6@huawei.com> - 2.28-90
|
||||||
- add libpthread_nonshared.a in glibc-compat-2.17 for old applications
|
- add libpthread_nonshared.a in glibc-compat-2.17 for old applications
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user