sync from upstream

prepopulate.json

@@ -3257,9 +3257,6 @@
       "libldac": [
         "libldac.aarch64"
       ], 
-      "liblockfile": [
-        "liblockfile.aarch64"
-      ], 
       "liblognorm": [
         "liblognorm-doc.aarch64", 
         "liblognorm.aarch64"
@@ -10674,9 +10671,6 @@
       "libldac": [
         "libldac.ppc64le"
       ], 
-      "liblockfile": [
-        "liblockfile.ppc64le"
-      ], 
       "liblognorm": [
         "liblognorm-doc.ppc64le", 
         "liblognorm.ppc64le"
@@ -18044,9 +18038,6 @@
         "liblangtag-data.noarch", 
         "liblangtag.s390x"
       ], 
-      "liblockfile": [
-        "liblockfile.s390x"
-      ], 
       "liblognorm": [
         "liblognorm-doc.s390x", 
         "liblognorm.s390x"
@@ -25985,10 +25976,6 @@
       "libloader": [
         "libloader.noarch"
       ], 
-      "liblockfile": [
-        "liblockfile.i686", 
-        "liblockfile.x86_64"
-      ], 
       "liblognorm": [
         "liblognorm-doc.x86_64", 
         "liblognorm.i686", 

shared/additional_and_filter_packages.conf

@@ -48,6 +48,7 @@ additional_packages = [
     }),
     ("^BaseOS$", {
         "*": [
+            "liblockfile", #ENGCMP-2535
             "python3-gobject-base-noarch", #ENGCMP-2400
             "python3.*-debuginfo", #ENGCMP-1433
             "subscription-manager-cockpit", #ENGCMP-2427