From e0b761691c4ac452e4e7fc83a5af4a28dbaf5583 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Sep 06 2024 16:31:06 +0000 Subject: Consolidate poppler packages --- diff --git a/prepopulate.json b/prepopulate.json index e28438c..b8cfb6b 100644 --- a/prepopulate.json +++ b/prepopulate.json @@ -4781,6 +4781,7 @@ "poppler": [ "poppler-cpp.aarch64", "poppler-glib.aarch64", + "poppler-qt6.aarch64", "poppler-utils.aarch64", "poppler.aarch64" ], @@ -11269,6 +11270,7 @@ "poppler": [ "poppler-cpp.ppc64le", "poppler-glib.ppc64le", + "poppler-qt6.ppc64le", "poppler-utils.ppc64le", "poppler.ppc64le" ], @@ -17680,6 +17682,7 @@ "poppler": [ "poppler-cpp.s390x", "poppler-glib.s390x", + "poppler-qt6.s390x", "poppler-utils.s390x", "poppler.s390x" ], @@ -24282,6 +24285,7 @@ "poppler": [ "poppler-cpp.x86_64", "poppler-glib.x86_64", + "poppler-qt6.x86_64", "poppler-utils.x86_64", "poppler.x86_64" ], diff --git a/shared/additional_and_filter_packages.conf b/shared/additional_and_filter_packages.conf index 5d25e18..bebf7ef 100644 --- a/shared/additional_and_filter_packages.conf +++ b/shared/additional_and_filter_packages.conf @@ -203,7 +203,6 @@ additional_packages = [ "pf-bb-config", #ENGCMP-2857 "pipewire-jack-audio-connection-kit-libs", #ENGCMP-3662 "pipewire-module-x11", #ENGCMP-3336 - "poppler-qt6", #ENGCMP-2393 "postfix-lmdb", #ENGCMP-3295 "pyproject-srpm-macros", #ENGCMP-2964 "python3-awscrt", #ENGCMP-3828 @@ -320,7 +319,6 @@ additional_packages = [ "qt6-qtwayland", #ENGCMP-4144 "glib2-devel", #ENGCMP-4191 "plymouth-devel", #ENGCMP-4191 - "poppler-qt6", #ENGCMP-4191 "dnsconfd", #ENGCMP-4213 "dnsconfd-selinux", #ENGCMP-4213 "dnsconfd-unbound", #ENGCMP-4213