Del Specific Fields

This commit is contained in:
mgb01105731 2023-03-28 17:01:55 +08:00
parent 89392b4044
commit 11cff34268

View file

@ -1,4 +1,4 @@
%define anolis_release 5 %define anolis_release 6
%bcond_without testsuite %bcond_without testsuite
# Default: Always build the benchtests. # Default: Always build the benchtests.
@ -540,10 +540,6 @@ This package contains all iconv converter modules built in %{name}.
# migration from old systems that previously had the old nss_db package # migration from old systems that previously had the old nss_db package
# installed. Note that this doesn't make the migration that smooth, the # installed. Note that this doesn't make the migration that smooth, the
# databases still need rebuilding because the formats were different. # databases still need rebuilding because the formats were different.
# The nss_db package was deprecated in F16 and onwards:
# https://lists.fedoraproject.org/pipermail/devel/2011-July/153665.html
# The different database format does cause some issues for users:
# https://lists.fedoraproject.org/pipermail/devel/2011-December/160497.html
%package -n nss_db %package -n nss_db
Summary: Name Service Switch (NSS) module using hash-indexed files Summary: Name Service Switch (NSS) module using hash-indexed files
Requires: %{name} = %{version}-%{release} Requires: %{name} = %{version}-%{release}
@ -724,7 +720,6 @@ rpm_inherit_flags \
# -D_FORTIFY_SOURCE. The object files need to be marked as to be # -D_FORTIFY_SOURCE. The object files need to be marked as to be
# skipped in annobin annotations. (The -specs= variant of activating # skipped in annobin annotations. (The -specs= variant of activating
# annobin does not work here because of flag ordering issues.) # annobin does not work here because of flag ordering issues.)
# See <https://bugzilla.redhat.com/show_bug.cgi?id=1668822>.
BuildFlagsNonshared="-fplugin=annobin -fplugin-arg-annobin-disable -Wa,--generate-missing-build-notes=yes" BuildFlagsNonshared="-fplugin=annobin -fplugin-arg-annobin-disable -Wa,--generate-missing-build-notes=yes"
%endif %endif
@ -810,8 +805,7 @@ GCC=`cat Gcc`
%ifarch riscv64 %ifarch riscv64
# RISC-V ABI wants to install everything in /lib64/lp64d or /usr/lib64/lp64d. # RISC-V ABI wants to install everything in /lib64/lp64d or /usr/lib64/lp64d.
# Make these be symlinks to /lib64 or /usr/lib64 respectively. See: # Make these be symlinks to /lib64 or /usr/lib64 respectively.
# https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/DRHT5YTPK4WWVGL3GIN5BF2IKX2ODHZ3/
for d in %{glibc_sysroot}%{_libdir} %{glibc_sysroot}/%{_lib}; do for d in %{glibc_sysroot}%{_libdir} %{glibc_sysroot}/%{_lib}; do
mkdir -p $d mkdir -p $d
(cd $d && ln -sf . lp64d) (cd $d && ln -sf . lp64d)
@ -1736,6 +1730,9 @@ update_gconv_modules_cache ()
%files -f compat-libpthread-nonshared.filelist -n compat-libpthread-nonshared %files -f compat-libpthread-nonshared.filelist -n compat-libpthread-nonshared
%changelog %changelog
* Tue Mar 28 2023 mgb01105731 <mgb01105731@alibaba-inc.com> - 2.36-6
- Del Specific Fields
* Wed Feb 22 2023 Chunmei Xu <xuchunmei@linux.alibaba.com> - 2.36-5 * Wed Feb 22 2023 Chunmei Xu <xuchunmei@linux.alibaba.com> - 2.36-5
- recover to provide glibc-minimal-langpack - recover to provide glibc-minimal-langpack
@ -1757,7 +1754,6 @@ update_gconv_modules_cache ()
* Mon Jul 11 2022 Weisson <wenshu.hx@alibaba-inc.com> - 2.35-2 * Mon Jul 11 2022 Weisson <wenshu.hx@alibaba-inc.com> - 2.35-2
- Add support for riscv64 - Add support for riscv64
- RISC-V ABI wants to install everything in /lib64/lp64d or /usr/lib64/lp64d. Make these be symlinks to /lib64 or /usr/lib64 respectively. - RISC-V ABI wants to install everything in /lib64/lp64d or /usr/lib64/lp64d. Make these be symlinks to /lib64 or /usr/lib64 respectively.
- See: https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/DRHT5YTPK4WWVGL3GIN5BF2IKX2ODHZ3/
* Tue Feb 22 2022 Chunmei Xu <xuchunmei@linux.alibaba.com> - 2.35-1 * Tue Feb 22 2022 Chunmei Xu <xuchunmei@linux.alibaba.com> - 2.35-1
- upstream 2.35 release tarball and add patches from release/2.35/master - upstream 2.35 release tarball and add patches from release/2.35/master