From 00700ccdf251465a8059b0ea43cdeace4019ba00 Mon Sep 17 00:00:00 2001 From: MSVSphere Packaging Team Date: Sun, 23 Jun 2024 01:03:17 +0300 Subject: [PATCH] import dpkg-1.22.6-1.el9 --- .dpkg.metadata | 2 +- .gitignore | 2 +- SPECS/dpkg.spec | 41 +++++++++++++++++++++++++++++++++++------ 3 files changed, 37 insertions(+), 8 deletions(-) diff --git a/.dpkg.metadata b/.dpkg.metadata index 47e12cb..ac1404e 100644 --- a/.dpkg.metadata +++ b/.dpkg.metadata @@ -1 +1 @@ -221e353bd85386079edbcfbc78bfa9c15c067d39 SOURCES/dpkg_1.21.21.tar.xz +9d36edfd0205e707bbbe3061a6d7085686cea83d SOURCES/dpkg_1.22.6.tar.xz diff --git a/.gitignore b/.gitignore index 1ea2da3..ecf9a6f 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/dpkg_1.21.21.tar.xz +SOURCES/dpkg_1.22.6.tar.xz diff --git a/SPECS/dpkg.spec b/SPECS/dpkg.spec index a28f79d..78a6a1f 100644 --- a/SPECS/dpkg.spec +++ b/SPECS/dpkg.spec @@ -2,7 +2,7 @@ %global pkgdatadir %{_datadir}/dpkg Name: dpkg -Version: 1.21.21 +Version: 1.22.6 Release: 1%{?dist} Summary: Package maintenance system for Debian Linux # The entire source code is GPLv2+ with exception of the following @@ -41,7 +41,10 @@ BuildRequires: xz-devel BuildRequires: zlib-devel # for /usr/bin/perl BuildRequires: perl-interpreter -BuildRequires: perl-devel +# Since dpkg 1.21.x +# checking for perl >= 5.28.1... configure: error: cannot find perl >= 5.28.1 +# epel8 only have perl-5.26.3 +BuildRequires: perl-devel >= 5.28.1 BuildRequires: perl-generators BuildRequires: perl-Time-Piece BuildRequires: perl(Digest) @@ -270,6 +273,12 @@ rm -rf %{buildroot}%{_mandir}/it/man5/ rm -rf %{buildroot}%{_mandir}/pl/man1/ %endif +# Not required on fully usr-merged systems. +# See https://salsa.debian.org/dpkg-team/dpkg/-/commit/49b3219281350fe8db799541456a5917094367c3 +rm %{buildroot}%{_sbindir}/dpkg-fsys-usrunmess +rm %{buildroot}%{_mandir}/man8/dpkg-fsys-usrunmess.8 +rm %{buildroot}%{_mandir}/*/man8/dpkg-fsys-usrunmess.8 + %check make VERBOSE=1 TESTSUITEFLAGS=--verbose \ TEST_PARALLEL=4 check || : @@ -296,8 +305,8 @@ make VERBOSE=1 TESTSUITEFLAGS=--verbose \ %{_bindir}/dpkg-statoverride %{_bindir}/dpkg-realpath %{_sbindir}/start-stop-daemon -%{_sbindir}/dpkg-fsys-usrunmess %{_libexecdir}/dpkg/dpkg-db-backup +%{_libexecdir}/dpkg/dpkg-db-keeper %dir %{pkgdatadir} %{pkgdatadir}/abitable %{pkgdatadir}/cputable @@ -314,7 +323,6 @@ make VERBOSE=1 TESTSUITEFLAGS=--verbose \ %{_mandir}/man1/dpkg-statoverride.1.gz %{_mandir}/man8/start-stop-daemon.8.gz %{_mandir}/man1/dpkg-realpath.1.gz -%{_mandir}/man8/dpkg-fsys-usrunmess.8.gz %{_mandir}/*/man1/dpkg.1.gz %{_mandir}/*/man1/dpkg-deb.1.gz %{_mandir}/*/man1/dpkg-maintscript-helper.1.gz @@ -326,7 +334,6 @@ make VERBOSE=1 TESTSUITEFLAGS=--verbose \ %{_mandir}/*/man1/dpkg-statoverride.1.gz %{_mandir}/*/man8/start-stop-daemon.8.gz %{_mandir}/*/man1/dpkg-realpath.1.gz -%{_mandir}/*/man8/dpkg-fsys-usrunmess.8.gz %{_datadir}/polkit-1/actions/org.dpkg.pkexec.update-alternatives.policy %{_datadir}/doc/dpkg/* %{_datadir}/dpkg/sh/dpkg-error.sh @@ -348,7 +355,9 @@ make VERBOSE=1 TESTSUITEFLAGS=--verbose \ %config(noreplace) %{pkgconfdir}/shlibs.override %{_bindir}/dpkg-architecture +%{_bindir}/dpkg-buildapi %{_bindir}/dpkg-buildpackage +%{_bindir}/dpkg-buildtree %{_bindir}/dpkg-buildflags %{_bindir}/dpkg-checkbuilddeps %{_bindir}/dpkg-distaddfile @@ -395,7 +404,10 @@ make VERBOSE=1 TESTSUITEFLAGS=--verbose \ %{_mandir}/man5/deb822.5.gz %{_mandir}/man1/dpkg-architecture.1.gz %{_mandir}/man1/dpkg-buildflags.1.gz +%{_mandir}/man1/dpkg-buildapi.1.gz +%{_mandir}/man7/dpkg-build-api.7.gz %{_mandir}/man1/dpkg-buildpackage.1.gz +%{_mandir}/man1/dpkg-buildtree.1.gz %{_mandir}/man1/dpkg-checkbuilddeps.1.gz %{_mandir}/man1/dpkg-distaddfile.1.gz %{_mandir}/man1/dpkg-genbuildinfo.1.gz @@ -439,7 +451,10 @@ make VERBOSE=1 TESTSUITEFLAGS=--verbose \ %{_mandir}/*/man5/deb822.5.gz %{_mandir}/*/man1/dpkg-architecture.1.gz %{_mandir}/*/man1/dpkg-buildflags.1.gz +%{_mandir}/*/man1/dpkg-buildapi.1.gz +%{_mandir}/*/man7/dpkg-build-api.7.gz %{_mandir}/*/man1/dpkg-buildpackage.1.gz +%{_mandir}/*/man1/dpkg-buildtree.1.gz %{_mandir}/*/man1/dpkg-checkbuilddeps.1.gz %{_mandir}/*/man1/dpkg-distaddfile.1.gz %{_mandir}/*/man1/dpkg-genbuildinfo.1.gz @@ -477,9 +492,23 @@ make VERBOSE=1 TESTSUITEFLAGS=--verbose \ %changelog -* Fri Aug 25 2023 Arkady L. Shane - 1.21.21-1 +* Thu Apr 11 2024 Daan De Meyer - 1.22.6-1 +- Update dpkg to 1.22.6 +- Drop dpkg-fsys-usrunmess as it is not required on properly usr-merged systems + and pulls in perl as a dependency. + +* Wed Jan 24 2024 Fedora Release Engineering - 1.21.21-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Jan 19 2024 Fedora Release Engineering - 1.21.21-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Aug 25 2023 Arkady L. Shane - 1.21.21-2 - Rebuilt for MSVSphere 9.2 +* Wed Jul 19 2023 Fedora Release Engineering - 1.21.21-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Tue Mar 28 2023 Sérgio Basto - 1.21.21-1 - Update dpkg to 1.21.21 (#2173339)