sinjuginas/rpm-build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

/usr/lib/rpm/find-package: re-import from rpm.git

Browse Source 
In an environment created by `hsh --initroot-only`:
  $ for i in /usr/lib/rpm/*; do rpm -qf --qf='%{name}: '"$i"'\n' "$i"; done | grep '^rpm:'
  rpm: /usr/lib/rpm/0ldconfig.filetrigger
  rpm: /usr/lib/rpm/GROUPS
  rpm: /usr/lib/rpm/find-package
  rpm: /usr/lib/rpm/functions
  rpm: /usr/lib/rpm/macros.d
  rpm: /usr/lib/rpm/pdeath_execute
  rpm: /usr/lib/rpm/platform
  rpm: /usr/lib/rpm/posttrans-filetriggers
  rpm: /usr/lib/rpm/postupdate
  rpm: /usr/lib/rpm/rpmd
  rpm: /usr/lib/rpm/rpmdb_loadcvt
  rpm: /usr/lib/rpm/rpme
  rpm: /usr/lib/rpm/rpmi
  rpm: /usr/lib/rpm/rpmk
  rpm: /usr/lib/rpm/rpmpopt-4.13.0.1
  rpm: /usr/lib/rpm/rpmq
  rpm: /usr/lib/rpm/rpmu
  rpm: /usr/lib/rpm/rpmv

The `scripts/find-package` file is installed from the rpm project. We
replace our copy with that one, so the installed file does not change
but is installed as part of rpm-build.
This commit is contained in:
Arseny Maslennikov 2022-12-23 16:08:41 +03:00
parent 6bfa4a28aa
commit 44ef3a03cd
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
rpm-4_0.spec
View File

@ -333,6 +333,7 @@ mv -T %buildroot%_rpmlibdir/{,build}macros
%rpmattr %_rpmlibdir/ldd
%rpmattr %_rpmlibdir/rpm2cpio.sh
%rpmattr %_rpmlibdir/find-lang
%rpmattr %_rpmlibdir/find-package
%rpmattr %_rpmlibdir/find-provides
%rpmattr %_rpmlibdir/find-requires
%rpmattr %_rpmlibdir/find-debuginfo-files

3
scripts/Makefile.am
View File

@ -51,6 +51,7 @@ config_SCRIPTS = \
compress_files \
cpp.req cpp.req.files \
find-lang \
find-package \
fixup-binconfig fixup-pkgconfig fixup-libtool fixup-libraries \
fixup-gnuconfig fixup-desktop fixup-desktop.awk \
files.req files.req.files \
@ -70,7 +71,7 @@ config_SCRIPTS = \
tmpdir.sh \
verify-elf \
rpmb-functions \
# 0ldconfig.filetrigger find-package posttrans-filetriggers
# 0ldconfig.filetrigger posttrans-filetriggers
install-data-local:
$(mkinstalldirs) $(DESTDIR)$(configdir)/brp.d

13
scripts/find-package.in
View File

@ -210,13 +210,12 @@ FindByFile()
if [ "$n" = 1 ]; then
# Prune generic devel deps generated by pkgconfiglib.req and cpp.req.
case $package in
gcc | gcc-c++ | \
gcc[34].[0-9] | gcc[34].[0-9]-c++ | \
gcc[5-9] | gcc[5-9]-c++ | \
libstdc++-devel | \
libstdc++[34].[0-9]-devel | \
libstdc++[5-9]-devel | \
glibc-devel )
gcc | gcc-c++ | gcc[34].[0-9] | gcc[34].[0-9]-c++ | \
gcc[5-9] | gcc[5-9]-c++ | gcc[1-9][0-9] | gcc[1-9][0-9]-c++ | \
libstdc++-devel | libstdc++[34].[0-9]-devel | \
libstdc++[5-9]-devel | libstdc++[1-9][0-9]-devel | \
glibc-devel | \
lcc[0-9].[0-9][0-9] | lcc[0-9].[0-9][0-9]-c++ )
$Verbose "$f: $rep -> $package (skip, generic devel)"
;;
*)