[packages/rpm: 103/103] Merge branch 'rpm.org'
baggins
baggins at pld-linux.org
Tue Feb 23 11:36:08 CET 2021
commit 15e0e6d5d498ebfe17cd10f7b906147d49defa39
Merge: 0e78e3b 68a7350
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Tue Feb 23 11:35:24 2021 +0100
Merge branch 'rpm.org'
README.cpu-os-macros | 14 -
aarch64.patch | 13 +
allow-at-in-ver-rel.patch | 11 +
cpu-os-macros.a | 708 ----------
cpuinfo-deps.patch | 289 ++++
dbupgrade.sh | 36 -
default-patch-flags.patch | 12 +
disable-header-verification.patch | 20 -
do_not_write_before_macro_buffer.patch | 23 -
extension-based-compression-detection.patch | 29 -
fast_python_deps.patch | 86 --
gcc6-stdlib.patch | 31 -
glibc.patch | 56 -
ix86-platforms.patch | 34 +
macros.pld.in | 211 ---
missing-doc-terminate-build.patch | 21 +
missing-ghost-terminate-build.patch | 19 +
missing-macros.patch | 60 +
no-exeonly-for-elf-reqprov.patch | 53 +
noexpand.patch | 45 +
openmp.patch | 22 -
perl.prov | 3 +-
pkgconfig.patch | 11 +
pl-po.patch | 11 +
py-disable-fetch.patch | 34 -
python-internal-build.patch | 35 +
python-libx32.patch | 10 -
python-rpmsense-missingok.patch | 12 -
python2_explicit.patch | 11 -
...enerate-rpmfc-dependencies-from-doc-files.patch | 55 -
rpm-5.4.10-duplicate_files_terminate_build.patch | 67 -
....4.10-files-listed-twice-terminates-build.patch | 74 -
...ix-neon-saving-error-pages-as-target-file.patch | 39 -
rpm-5.4.10-support-ignore-arch-and-os-again.patch | 45 -
...5.4.10-unpackaged_subdirs_terminate_build.patch | 67 -
rpm-5.4.12-copy-Value-string.patch | 11 -
rpm-5.4.12-fix-rpmlua-print.patch | 22 -
rpm-5.4.12-fix-rpmpython-module-import-init.patch | 15 -
rpm-5.4.12-truncate-output-buffer-after-use.patch | 11 -
rpm-5.4.13-perl-bindings-do-not-use-xmalloc.patch | 20 -
....4.14-no-assert-abort-with-broken-headers.patch | 11 -
rpm-5.4.14-rpmdbchk.patch | 334 -----
rpm-5.4.15-use-DSA-sig.patch | 11 -
rpm-5.4.4-add-_specfile-macro.patch | 10 -
...4.4-allow-installation-of-repackaged-rpms.patch | 11 -
...eless-auto-generated-pkgconfig-dependency.patch | 23 -
...always-use-LC_CTYPE-C-for-case-conversion.patch | 20 -
...me-package-with-epoch-possible-to-upgrade.patch | 22 -
....4-glob-wildcards-for-loading-macro-files.patch | 24 -
...pass-_builddir-properly-to-find-debuginfo.patch | 25 -
rpm-5.4.4-pkgconfigdeps-check-path.patch | 76 -
rpm-5.4.4-rpmbuild-withoutclean.patch | 10 -
rpm-5.4.5-python-export-spec-macros.patch | 70 -
....5-rpmfc-apply-python-coloring-from-magic.patch | 10 -
...5-skip-dependencies-for-character-devices.patch | 13 -
...sider-trigger-dependencies-as-overlapping.patch | 12 -
...5.4.7-fix-generation-of-ruby-abi-provides.patch | 35 -
rpm-5.4.7-fix-minor-memleaks.patch | 25 -
...5.4.7-hdrfmt-fix-unitialized-argv-element.patch | 14 -
rpm-5.4.7-kmod-dependencies.patch | 53 -
rpm-5.4.7-no-seqid_init-on-rdonly-database.patch | 11 -
rpm-5.4.8-dont-show-suggests-with-requires.patch | 62 -
rpm-5.4.9-avoid-dependencies-on-self.patch | 85 --
...-in-path-for-dirname-filetrigger-matching.patch | 23 -
rpm-5.4.9-disable-l10ndir.patch | 11 -
rpm-5.4.9-fix-rpm_qa-pattern.patch | 11 -
rpm-5.4.9-fix-verify-segfault.patch | 26 -
rpm-5.4.9-font-provides.patch | 60 -
rpm-5.4.9-keep-loading-script-macros.patch | 69 -
...-mire-fix-strings-lacking-null-terminator.patch | 32 -
...-rpmfc-extract-dependencies-for-all-files.patch | 11 -
rpm-5.4.9-rpmpython-fix-input.patch | 11 -
...-buildroot-away-from-duplicate-files-list.patch | 97 --
...9-support-signatures-and-digest-disablers.patch | 63 -
...-rpmfc-when-removing-dependencies-on-self.patch | 140 --
rpm-CVE-2013-6435.patch | 72 -
rpm-CVE-2014-8118.patch | 11 -
rpm-DB_CONFIG.patch | 13 -
rpm-URPM-build-fix.patch | 13 -
rpm-branch.patch | 112 --
rpm-bug-420.patch | 22 -
rpm-builddir-readlink.patch | 28 +-
rpm-changelog-encoding.patch | 22 -
rpm-changelog_order_check_nonfatal.patch | 8 +-
rpm-clean-docdir.patch | 20 +-
rpm-cleanbody.patch | 11 -
rpm-cppcompat.patch | 56 -
rpm-db5.2.patch | 29 -
rpm-db_buffer_small.patch | 84 --
rpm-debuginfo.patch | 15 +-
rpm-dirdeps-macro.patch | 38 -
rpm-disable-hmac-verify.patch | 23 -
rpm-dont-copy-descriptive-tags.patch | 31 -
rpm-dont-treat-gstreamer-modules-as-font.patch | 11 -
rpm-double_check_file_deps.patch | 94 --
rpm-double_check_unpackaged_subdirs.patch | 46 -
rpm-file-output-for-ELF.patch | 34 -
rpm-fix--p-interpreter-and-empty-script.patch | 12 -
rpm-fix-___build_pre-macro.patch | 22 -
rpm-fix-compress-doc.patch | 38 -
rpm-fix-filedigests-verify.patch | 10 -
rpm-fix-internal-lua-build.patch | 40 -
rpm-fix-missing-types-in-headers.patch | 330 -----
rpm-gendiff.patch | 8 -
rpm-gettext-in-header.patch | 12 -
rpm-gpg-pinentry.patch | 24 -
rpm-gst-inspect-typo.patch | 11 -
rpm-hack-norpmlibdep.patch | 11 -
rpm-helperEVR-noassert.patch | 14 -
rpm-hrmib-cache | 22 -
rpm-ignore-missing-macro-files.patch | 55 +-
rpm-installbeforeerase.patch | 35 -
rpm-javadeps.patch | 13 -
rpm-libmagic-locale.patch | 40 -
rpm-libtool-deps.patch | 2 +-
rpm-lua-enable-extra-libs.patch | 21 -
rpm-lua-expat.patch | 14 -
rpm-lua.patch | 11 -
rpm-macros.patch | 34 -
rpm-man_pl.patch | 8 +-
rpm-mimetype.patch | 53 -
rpm-missing-patch-file-fails-build.patch | 13 -
rpm-namespace-compare.patch | 198 ---
rpm-noarch_py_prov.patch | 8 +
rpm-nosetproctitle.patch | 67 -
rpm-notsc.patch | 11 -
rpm-null-term-ascii-digest.patch | 19 -
rpm-old-fileconflicts-behaviour.patch | 11 -
rpm-parseSpec-skip-empty-tags.patch | 11 -
rpm-pattern_Release.patch | 11 -
rpm-payload-use-hashed-inode.patch | 105 --
rpm-perl-macros.patch | 49 +-
rpm-perl-magic.patch | 17 +-
rpm-perl-req-perlfile.patch | 41 +-
rpm-perl_req-INC_dirs.patch | 19 +-
rpm-php-deps.patch | 12 -
rpm-popt-aliases.patch | 21 +-
rpm-popt-coreutils.patch | 13 -
rpm-postun-nofail.patch | 18 +-
rpm-preserve-iterator.patch | 23 -
rpm-preserve-tag-type.patch | 55 -
rpm-python-enable-compat-RPMSENSE.patch | 11 -
rpm-python-sitescriptdir.patch | 25 -
rpm-python-spec-header.patch | 56 -
rpm-pythoneggs.patch | 103 --
rpm-query-always-noisy.patch | 99 --
rpm-remove-misleading-missing-patch-message.patch | 20 -
rpm-repackage-dont-force-max-compression.patch | 11 -
rpm-revert-gpg-argv-parsing.patch | 39 -
rpm-rpm2cpio.patch | 23 -
rpm-rpmspec.patch | 239 ----
rpm-rpmtdnext.patch | 12 -
rpm-scripts-closefds.patch | 23 +-
rpm-semanage.patch | 29 -
rpm-silence-RPM_CHAR_TYPE.patch | 10 -
rpm-sparc64.patch | 59 -
rpm-truncate-cvslog.patch | 64 -
rpm-unglobal.patch | 74 -
rpm-verify-ghosts-broken-logic.patch | 11 -
rpm.noautocompressdoc | 1 -
rpm.spec | 1451 +++++++-------------
rpm.sysinfo | 4 -
rpm5-db-compat.patch | 15 +
rpmdb_checkversion.c | 121 --
rpmdb_reset.c | 248 ----
rpmio-read-proc-files.patch | 25 +
shortcircuited-deps.patch | 11 +
skip-ldconfig-optimization.patch | 74 -
skip-symlinks.patch | 11 +
sqlite-db-backend.patch | 11 +
uname-deps.patch | 140 ++
vendor-pld.patch | 32 -
x32.patch | 445 +++---
173 files changed, 1665 insertions(+), 8054 deletions(-)
---
diff --cc rpm.spec
index 40cbcac,c3257aa..9d182e6
--- a/rpm.spec
+++ b/rpm.spec
@@@ -1349,63 -822,58 +822,61 @@@ find %{_rpmlibdir} -name '*-linux' -typ
%lang(sk) %{_mandir}/sk/man8/rpm.8*
%dir /var/lib/rpm
- %dir /var/lib/rpm/log
- %dir /var/lib/rpm/tmp
- %config(noreplace) %verify(not md5 mtime size) /var/lib/rpm/DB_CONFIG
- %dir %attr(700,root,root) /var/spool/repackage
- %dir /var/lock/rpm
- /var/lock/rpm/transaction
-
- # exported package NVRA (stamped with install tid)
- # net-snmp hrSWInstalledName queries, bash-completions
- %dir /var/cache/hrmib
-
- %{_rpmlibdir}/qf
+ %ghost %config(missingok,noreplace) /var/lib/rpm/*
+ %ghost /var/lib/rpm/.*.lock
+
%{_rpmlibdir}/rpmpopt*
+ %{_rpmlibdir}/rpmrc
%{_rpmlibdir}/macros
%dir %{_rpmlibdir}/macros.d
- %{_rpmlibdir}/macros.d/pld
- %dir %{_rpmlibdir}/pld
- %{_rpmlibdir}/cpuinfo.yaml
- %{_rpmlibdir}/noarch-*
+ %dir %{_rpmlibdir}/platform
+ %{_rpmlibdir}/platform/noarch-*
%ifarch %{ix86} %{x8664} x32
- %{_rpmlibdir}/i?86*
- %{_rpmlibdir}/pentium*
- %{_rpmlibdir}/athlon*
+ %{_rpmlibdir}/platform/athlon*
+ %{_rpmlibdir}/platform/geode*
+ %{_rpmlibdir}/platform/i?86*
+ %{_rpmlibdir}/platform/pentium*
+ %endif
+ %ifarch %{x8664} x32
+ %{_rpmlibdir}/platform/amd64*
+ %{_rpmlibdir}/platform/ia32e*
+ %{_rpmlibdir}/platform/x86_64*
+ %{_rpmlibdir}/platform/x32*
%endif
%ifarch alpha
- %{_rpmlibdir}/alpha*
+ %{_rpmlibdir}/platform/alpha*
+ %endif
+ %ifarch aarch64
+ %{_rpmlibdir}/platform/aarch64*
+ %endif
+ %ifarch %{arm}
+ %{_rpmlibdir}/platform/arm*
%endif
+%ifarch aarch64
+%{_rpmlibdir}/aarch64*
+%endif
%ifarch ia64
- %{_rpmlibdir}/ia64*
+ %{_rpmlibdir}/platform/ia64*
%endif
%ifarch mips mipsel mips64 mips64el
- %{_rpmlibdir}/mips*
+ %{_rpmlibdir}/platform/mips*
%endif
%ifarch %{ppc}
- %{_rpmlibdir}/ppc*
+ %{_rpmlibdir}/platform/ppc*
%endif
%ifarch sparc sparc64
- %{_rpmlibdir}/sparc*
- %endif
- %ifarch %{x8664} x32
- %{_rpmlibdir}/amd64*
- %{_rpmlibdir}/ia32e*
- %{_rpmlibdir}/x86_64*
- %{_rpmlibdir}/x32*
+ %{_rpmlibdir}/platform/sparc*
%endif
- %attr(755,root,root) %{_rpmlibdir}/hrmib-cache
+ %dir %{_rpmlibdir}/pld
+
+ %attr(755,root,root) %{_rpmlibdir}/rpmdb_dump
+ %attr(755,root,root) %{_rpmlibdir}/rpmdb_load
+
+ # valgrind suppression file for rpm
+ %{_rpmlibdir}/rpm.supp
- %dir %{_rpmlibdir}/bin
- %attr(755,root,root) %{_rpmlibdir}/bin/dbconvert
- %attr(755,root,root) %{_rpmlibdir}/bin/dbupgrade.sh
- %attr(755,root,root) %{_rpmlibdir}/bin/rpmdb_checkversion
- %attr(755,root,root) %{_rpmlibdir}/bin/rpmdb_reset
- %attr(755,root,root) %{_rpmlibdir}/bin/rpmdbchk
+ %dir /usr/lib/.build-id
%files base
%defattr(644,root,root,755)
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/rpm.git/commitdiff/15e0e6d5d498ebfe17cd10f7b906147d49defa39
More information about the pld-cvs-commit
mailing list