rpms/glibc
7
0
Fork 1
Code Issues Pull Requests Releases Activity

Move makedb from glibc-common to nss_db (#1704334)

Browse Source 
The makedb program is only used to make databases for the nss_db
module, so it makes sense to only install them together.
This commit is contained in:
DJ Delorie 2019-08-27 15:07:36 -04:00
parent 5846004b81
commit 1fa217076e
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
glibc.spec
View File

@ -87,7 +87,7 @@
Summary: The GNU libc libraries Summary: The GNU libc libraries
Name: glibc Name: glibc
Version: %{glibcversion} Version: %{glibcversion}
Release: 4%{?dist} Release: 5%{?dist}
# In general, GPLv2+ is used by programs, LGPLv2+ is used for # In general, GPLv2+ is used by programs, LGPLv2+ is used for
# libraries. # libraries.
@ -1433,8 +1433,10 @@ grep '%{_libdir}/lib.*\.a' < master.filelist \
# iconvconfig which needs to go in glibc. Likewise nscd is excluded because # iconvconfig which needs to go in glibc. Likewise nscd is excluded because
# it goes in nscd. The iconvconfig binary is kept in the main glibc package # it goes in nscd. The iconvconfig binary is kept in the main glibc package
# because we use it in the post-install scriptlet to rebuild the # because we use it in the post-install scriptlet to rebuild the
# gconv-modules.cache. # gconv-modules.cache. The makedb binary is in nss_db.
grep '%{_prefix}/bin' master.filelist >> common.filelist grep '%{_prefix}/bin' master.filelist \
| grep -v '%{_prefix}/bin/makedb' \
>> common.filelist
grep '%{_prefix}/sbin' master.filelist \ grep '%{_prefix}/sbin' master.filelist \
| grep -v '%{_prefix}/sbin/iconvconfig' \ | grep -v '%{_prefix}/sbin/iconvconfig' \
| grep -v 'nscd' >> common.filelist | grep -v 'nscd' >> common.filelist
@ -1482,6 +1484,7 @@ for module in db hesiod; do
grep -E "/libnss_$module(\.so\.[0-9.]+|-[0-9.]+\.so)$" \ grep -E "/libnss_$module(\.so\.[0-9.]+|-[0-9.]+\.so)$" \
master.filelist > nss_$module.filelist master.filelist > nss_$module.filelist
done done
grep -E "%{_prefix}/bin/makedb$" master.filelist >> nss_db.filelist
############################################################################### ###############################################################################
# nss-devel # nss-devel
@ -2008,6 +2011,9 @@ fi
%files -f compat-libpthread-nonshared.filelist -n compat-libpthread-nonshared %files -f compat-libpthread-nonshared.filelist -n compat-libpthread-nonshared
%changelog %changelog
* Tue Aug 27 2019 DJ Delorie <dj@redhat.com> - 2.30.9000-5
- Move makedb from glibc-common to nss_db (#1704334)
* Mon Aug 26 2019 DJ Delorie <dj@redhat.com> - 2.30.9000-4 * Mon Aug 26 2019 DJ Delorie <dj@redhat.com> - 2.30.9000-4
- Auto-sync with upstream branch master, - Auto-sync with upstream branch master,
commit 1bced8cadc82077f0201801239e89eb24b68e9aa. commit 1bced8cadc82077f0201801239e89eb24b68e9aa.