diff --git a/prepopulate-aarch64.json b/prepopulate-aarch64.json
index 6a4154b..4311a8b 100644
--- a/prepopulate-aarch64.json
+++ b/prepopulate-aarch64.json
@@ -6658,6 +6658,17 @@
         "pesign-debuginfo.aarch64",
         "pesign-debugsource.aarch64"
       ],
+      "phodav": [
+        "chezdav.aarch64",
+        "libphodav.aarch64",
+        "libphodav-devel.aarch64",
+        "spice-webdavd.aarch64",
+        "chezdav-debuginfo.aarch64",
+        "libphodav-debuginfo.aarch64",
+        "phodav-debuginfo.aarch64",
+        "phodav-debugsource.aarch64",
+        "spice-webdavd-debuginfo.aarch64"
+      ],
       "php": [
         "php.aarch64",
         "php-bcmath.aarch64",
@@ -7369,6 +7380,8 @@
       "qemu-kvm": [
         "qemu-guest-agent.aarch64",
         "qemu-kvm-block-blkio.aarch64",
+        "qemu-kvm-ui-spice.aarch64",
+        "qemu-kvm-ui-spice-debuginfo.aarch64",
         "qemu-img.aarch64",
         "qemu-kvm.aarch64",
         "qemu-kvm-audio-pa.aarch64",
@@ -8143,6 +8156,29 @@
         "speexdsp-debuginfo.aarch64",
         "speexdsp-debugsource.aarch64"
       ],
+      "spice": [
+        "spice-server.aarch64",
+        "spice-server-devel.aarch64",
+        "spice-debugsource.aarch64",
+        "spice-server-debuginfo.aarch64"
+      ],
+      "spice-gtk": [
+        "spice-glib.aarch64",
+        "spice-glib-devel.aarch64",
+        "spice-gtk.aarch64",
+        "spice-gtk3.aarch64",
+        "spice-gtk3-devel.aarch64",
+        "spice-gtk3-vala.aarch64",
+        "spice-gtk-tools.aarch64",
+        "spice-glib-debuginfo.aarch64",
+        "spice-gtk3-debuginfo.aarch64",
+        "spice-gtk-debuginfo.aarch64",
+        "spice-gtk-debugsource.aarch64",
+        "spice-gtk-tools-debuginfo.aarch64"
+      ],
+      "spice-html5": [
+        "spice-html5.noarch"
+      ],
       "spice-vdagent": [
         "spice-vdagent.aarch64",
         "spice-vdagent-debuginfo.aarch64",
@@ -18090,17 +18126,6 @@
         "pf-bb-config-debuginfo.aarch64",
         "pf-bb-config-debugsource.aarch64"
       ],
-      "phodav": [
-        "chezdav.aarch64",
-        "libphodav.aarch64",
-        "libphodav-devel.aarch64",
-        "spice-webdavd.aarch64",
-        "chezdav-debuginfo.aarch64",
-        "libphodav-debuginfo.aarch64",
-        "phodav-debuginfo.aarch64",
-        "phodav-debugsource.aarch64",
-        "spice-webdavd-debuginfo.aarch64"
-      ],
       "picosat": [
         "picosat-libs.aarch64",
         "picosat-devel.aarch64",
@@ -18994,11 +19019,9 @@
         "qemu-kvm-audio-dbus.aarch64",
         "qemu-kvm-tests.aarch64",
         "qemu-kvm-ui-dbus.aarch64",
-        "qemu-kvm-ui-spice.aarch64",
         "qemu-kvm-audio-dbus-debuginfo.aarch64",
         "qemu-kvm-tests-debuginfo.aarch64",
-        "qemu-kvm-ui-dbus-debuginfo.aarch64",
-        "qemu-kvm-ui-spice-debuginfo.aarch64"
+        "qemu-kvm-ui-dbus-debuginfo.aarch64"
       ],
       "qpdf": [
         "qpdf-doc.noarch"
@@ -26839,29 +26862,6 @@
         "speex-tools.aarch64",
         "speex-tools-debuginfo.aarch64"
       ],
-      "spice": [
-        "spice-server.aarch64",
-        "spice-server-devel.aarch64",
-        "spice-debugsource.aarch64",
-        "spice-server-debuginfo.aarch64"
-      ],
-      "spice-gtk": [
-        "spice-glib.aarch64",
-        "spice-glib-devel.aarch64",
-        "spice-gtk.aarch64",
-        "spice-gtk3.aarch64",
-        "spice-gtk3-devel.aarch64",
-        "spice-gtk3-vala.aarch64",
-        "spice-gtk-tools.aarch64",
-        "spice-glib-debuginfo.aarch64",
-        "spice-gtk3-debuginfo.aarch64",
-        "spice-gtk-debuginfo.aarch64",
-        "spice-gtk-debugsource.aarch64",
-        "spice-gtk-tools-debuginfo.aarch64"
-      ],
-      "spice-html5": [
-        "spice-html5.noarch"
-      ],
       "spirv-headers": [
         "spirv-headers-devel.noarch"
       ],
diff --git a/prepopulate.json b/prepopulate.json
index 80bd79d..b500e01 100644
--- a/prepopulate.json
+++ b/prepopulate.json
@@ -4067,6 +4067,12 @@
         "libbytesize-debuginfo.x86_64",
         "libbytesize-debugsource.x86_64"
       ],
+      "libcacard": [
+        "libcacard.x86_64",
+        "libcacard-devel.x86_64",
+        "libcacard-debuginfo.x86_64",
+        "libcacard-debugsource.x86_64"
+      ],
       "libcanberra": [
         "libcanberra.x86_64",
         "libcanberra-devel.x86_64",
@@ -6759,6 +6765,17 @@
         "pesign-debuginfo.x86_64",
         "pesign-debugsource.x86_64"
       ],
+      "phodav": [
+        "chezdav.x86_64",
+        "libphodav.x86_64",
+        "libphodav-devel.x86_64",
+        "spice-webdavd.x86_64",
+        "chezdav-debuginfo.x86_64",
+        "libphodav-debuginfo.x86_64",
+        "phodav-debuginfo.x86_64",
+        "phodav-debugsource.x86_64",
+        "spice-webdavd-debuginfo.x86_64"
+      ],
       "php": [
         "php-enchant.x86_64",
         "php-process.x86_64",
@@ -7489,6 +7506,8 @@
       "qemu-kvm": [
         "qemu-guest-agent.x86_64",
         "qemu-img.x86_64",
+        "qemu-kvm-ui-spice-debuginfo.x86_64",
+        "qemu-kvm-ui-spice.x86_64",
         "qemu-kvm.x86_64",
         "qemu-kvm-audio-pa.x86_64",
         "qemu-kvm-block-blkio.x86_64",
@@ -8294,6 +8313,29 @@
         "speexdsp-debuginfo.x86_64",
         "speexdsp-debugsource.x86_64"
       ],
+      "spice": [
+        "spice-server.x86_64",
+        "spice-server-devel.x86_64",
+        "spice-debugsource.x86_64",
+        "spice-server-debuginfo.x86_64"
+      ],
+      "spice-gtk": [
+        "spice-glib.x86_64",
+        "spice-glib-devel.x86_64",
+        "spice-gtk.x86_64",
+        "spice-gtk3.x86_64",
+        "spice-gtk3-devel.x86_64",
+        "spice-gtk3-vala.x86_64",
+        "spice-gtk-tools.x86_64",
+        "spice-glib-debuginfo.x86_64",
+        "spice-gtk3-debuginfo.x86_64",
+        "spice-gtk-debuginfo.x86_64",
+        "spice-gtk-debugsource.x86_64",
+        "spice-gtk-tools-debuginfo.x86_64"
+      ],
+      "spice-html5": [
+        "spice-html5.noarch"
+      ],
       "spice-vdagent": [
         "spice-vdagent.x86_64",
         "spice-vdagent-debuginfo.x86_64",
@@ -16462,12 +16504,6 @@
       "libbytesize": [
         "libbytesize-tools.x86_64"
       ],
-      "libcacard": [
-        "libcacard.x86_64",
-        "libcacard-devel.x86_64",
-        "libcacard-debuginfo.x86_64",
-        "libcacard-debugsource.x86_64"
-      ],
       "libcap": [
         "captree.x86_64",
         "libcap-static.x86_64",
@@ -18286,17 +18322,6 @@
         "pf-bb-config-debuginfo.x86_64",
         "pf-bb-config-debugsource.x86_64"
       ],
-      "phodav": [
-        "chezdav.x86_64",
-        "libphodav.x86_64",
-        "libphodav-devel.x86_64",
-        "spice-webdavd.x86_64",
-        "chezdav-debuginfo.x86_64",
-        "libphodav-debuginfo.x86_64",
-        "phodav-debuginfo.x86_64",
-        "phodav-debugsource.x86_64",
-        "spice-webdavd-debuginfo.x86_64"
-      ],
       "picosat": [
         "picosat-devel.x86_64",
         "picosat-libs.x86_64",
@@ -19187,11 +19212,9 @@
         "qemu-kvm-audio-dbus.x86_64",
         "qemu-kvm-tests.x86_64",
         "qemu-kvm-ui-dbus.x86_64",
-        "qemu-kvm-ui-spice.x86_64",
         "qemu-kvm-audio-dbus-debuginfo.x86_64",
         "qemu-kvm-tests-debuginfo.x86_64",
-        "qemu-kvm-ui-dbus-debuginfo.x86_64",
-        "qemu-kvm-ui-spice-debuginfo.x86_64"
+        "qemu-kvm-ui-dbus-debuginfo.x86_64"
       ],
       "qpdf": [
         "qpdf-doc.noarch"
@@ -27013,29 +27036,6 @@
         "speex-tools.x86_64",
         "speex-tools-debuginfo.x86_64"
       ],
-      "spice": [
-        "spice-server.x86_64",
-        "spice-server-devel.x86_64",
-        "spice-debugsource.x86_64",
-        "spice-server-debuginfo.x86_64"
-      ],
-      "spice-gtk": [
-        "spice-glib.x86_64",
-        "spice-glib-devel.x86_64",
-        "spice-gtk.x86_64",
-        "spice-gtk3.x86_64",
-        "spice-gtk3-devel.x86_64",
-        "spice-gtk3-vala.x86_64",
-        "spice-gtk-tools.x86_64",
-        "spice-glib-debuginfo.x86_64",
-        "spice-gtk3-debuginfo.x86_64",
-        "spice-gtk-debuginfo.x86_64",
-        "spice-gtk-debugsource.x86_64",
-        "spice-gtk-tools-debuginfo.x86_64"
-      ],
-      "spice-html5": [
-        "spice-html5.noarch"
-      ],
       "spirv-headers": [
         "spirv-headers-devel.noarch"
       ],