From 25bf2c225259ece2fc03ced6f4c414188361c63b Mon Sep 17 00:00:00 2001 From: Louis Abel Date: Thu, 1 Aug 2024 18:12:26 -0700 Subject: [PATCH] resync --- autocatalog.cfg | 34 +++++++++++++++++++--------------- comps/AppStream-aarch64.xml | 3 +++ comps/AppStream-ppc64le.xml | 3 +++ comps/AppStream-s390x.xml | 5 +++-- comps/AppStream-x86_64.xml | 3 +++ comps/CRB-aarch64.xml | 13 +++++++++++-- comps/CRB-ppc64le.xml | 13 +++++++++++-- comps/CRB-s390x.xml | 13 +++++++++++-- comps/CRB-x86_64.xml | 13 +++++++++++-- 9 files changed, 75 insertions(+), 25 deletions(-) diff --git a/autocatalog.cfg b/autocatalog.cfg index 3df5d47..04af9b9 100644 --- a/autocatalog.cfg +++ b/autocatalog.cfg @@ -3672,25 +3672,28 @@ package { type: PACKAGE_TYPE_NORMAL_FORK repository { name: "AppStream" - include_filter: "evolution-data-server-devel.aarch64" - include_filter: "evolution-data-server-doc.noarch" include_filter: "evolution-data-server-langpacks.noarch" include_filter: "evolution-data-server-perl.aarch64" - include_filter: "evolution-data-server-tests.aarch64" include_filter: "evolution-data-server.aarch64" - include_filter: "evolution-data-server-devel.ppc64le" include_filter: "evolution-data-server-perl.ppc64le" - include_filter: "evolution-data-server-tests.ppc64le" include_filter: "evolution-data-server.ppc64le" - include_filter: "evolution-data-server-devel.s390x" include_filter: "evolution-data-server-perl.s390x" - include_filter: "evolution-data-server-tests.s390x" include_filter: "evolution-data-server.s390x" - include_filter: "evolution-data-server-devel.x86_64" include_filter: "evolution-data-server-perl.x86_64" - include_filter: "evolution-data-server-tests.x86_64" include_filter: "evolution-data-server.x86_64" } + repository { + name: "CRB" + include_filter: "evolution-data-server-devel.aarch64" + include_filter: "evolution-data-server-doc.noarch" + include_filter: "evolution-data-server-tests.aarch64" + include_filter: "evolution-data-server-devel.ppc64le" + include_filter: "evolution-data-server-tests.ppc64le" + include_filter: "evolution-data-server-devel.s390x" + include_filter: "evolution-data-server-tests.s390x" + include_filter: "evolution-data-server-devel.x86_64" + include_filter: "evolution-data-server-tests.x86_64" + } } package { name: "exempi" @@ -6139,15 +6142,18 @@ package { type: PACKAGE_TYPE_NORMAL_FORK repository { name: "AppStream" - include_filter: "gnome-online-accounts-devel.aarch64" include_filter: "gnome-online-accounts.aarch64" - include_filter: "gnome-online-accounts-devel.ppc64le" include_filter: "gnome-online-accounts.ppc64le" - include_filter: "gnome-online-accounts-devel.s390x" include_filter: "gnome-online-accounts.s390x" - include_filter: "gnome-online-accounts-devel.x86_64" include_filter: "gnome-online-accounts.x86_64" } + repository { + name: "CRB" + include_filter: "gnome-online-accounts-devel.aarch64" + include_filter: "gnome-online-accounts-devel.ppc64le" + include_filter: "gnome-online-accounts-devel.s390x" + include_filter: "gnome-online-accounts-devel.x86_64" + } } package { name: "gnome-ponytail-daemon" @@ -7364,8 +7370,6 @@ package { include_filter: "gvfs-client.s390x" include_filter: "gvfs-fuse.s390x" include_filter: "gvfs-goa.s390x" - include_filter: "gvfs-gphoto2.s390x" - include_filter: "gvfs-mtp.s390x" include_filter: "gvfs-smb.s390x" include_filter: "gvfs.s390x" include_filter: "gvfs-client.x86_64" diff --git a/comps/AppStream-aarch64.xml b/comps/AppStream-aarch64.xml index d5c0435..f22525d 100644 --- a/comps/AppStream-aarch64.xml +++ b/comps/AppStream-aarch64.xml @@ -538,6 +538,7 @@ ibus-table-array30 gtk3-immodule-xim ibus-gtk3 + ibus-gtk4 @@ -815,6 +816,7 @@ glib2-devel glibc-devel gtk3-devel + gtk4-devel krb5-devel libICE-devel libSM-devel @@ -1432,6 +1434,7 @@ hunspell ibus-anthy ibus-gtk3 + ibus-gtk4 ibus-hangul ibus-libpinyin ibus-libzhuyin diff --git a/comps/AppStream-ppc64le.xml b/comps/AppStream-ppc64le.xml index 5b3f92b..f1a0403 100644 --- a/comps/AppStream-ppc64le.xml +++ b/comps/AppStream-ppc64le.xml @@ -560,6 +560,7 @@ ibus-table-array30 gtk3-immodule-xim ibus-gtk3 + ibus-gtk4 @@ -838,6 +839,7 @@ glib2-devel glibc-devel gtk3-devel + gtk4-devel krb5-devel libICE-devel libSM-devel @@ -1419,6 +1421,7 @@ hunspell ibus-anthy ibus-gtk3 + ibus-gtk4 ibus-hangul ibus-libpinyin ibus-libzhuyin diff --git a/comps/AppStream-s390x.xml b/comps/AppStream-s390x.xml index fb858cb..e813351 100644 --- a/comps/AppStream-s390x.xml +++ b/comps/AppStream-s390x.xml @@ -414,8 +414,6 @@ gnome-user-docs gvfs-fuse gvfs-goa - gvfs-gphoto2 - gvfs-mtp gvfs-smb libcanberra-gtk3 librsvg2 @@ -512,6 +510,7 @@ ibus-table-array30 gtk3-immodule-xim ibus-gtk3 + ibus-gtk4 @@ -762,6 +761,7 @@ glib2-devel glibc-devel gtk3-devel + gtk4-devel krb5-devel libICE-devel libSM-devel @@ -1375,6 +1375,7 @@ hunspell ibus-anthy ibus-gtk3 + ibus-gtk4 ibus-hangul ibus-libpinyin ibus-libzhuyin diff --git a/comps/AppStream-x86_64.xml b/comps/AppStream-x86_64.xml index 4b71d1b..ca10f24 100644 --- a/comps/AppStream-x86_64.xml +++ b/comps/AppStream-x86_64.xml @@ -563,6 +563,7 @@ ibus-table-array30 gtk3-immodule-xim ibus-gtk3 + ibus-gtk4 @@ -842,6 +843,7 @@ glib2-devel glibc-devel gtk3-devel + gtk4-devel krb5-devel libICE-devel libSM-devel @@ -1479,6 +1481,7 @@ hunspell ibus-anthy ibus-gtk3 + ibus-gtk4 ibus-hangul ibus-libpinyin ibus-libzhuyin diff --git a/comps/CRB-aarch64.xml b/comps/CRB-aarch64.xml index 68fd048..c3c323f 100644 --- a/comps/CRB-aarch64.xml +++ b/comps/CRB-aarch64.xml @@ -51,8 +51,6 @@ avahi-glib-devel babel babel-doc - babl-devel - babl-devel-docs bash-devel bcc-devel bcc-doc @@ -86,6 +84,8 @@ bsf cairomm-devel cairomm-doc + cairomm1.16-devel + cairomm1.16-doc capstone-devel capstone-java catatonit @@ -197,6 +197,8 @@ glibc-static glibmm2.4-devel glibmm2.4-doc + glibmm2.68-devel + glibmm2.68-doc glslang-devel gnome-autoar-devel gnome-bluetooth-libs-devel @@ -223,8 +225,11 @@ gstreamer1-plugins-bad-free-devel gtk-doc gtk3-devel-docs + gtk4-devel-docs gtkmm3.0-devel gtkmm3.0-doc + gtkmm4.0-devel + gtkmm4.0-doc hamcrest hamcrest-core help2man @@ -423,6 +428,8 @@ libshout-devel libsigc++20-devel libsigc++20-doc + libsigc++30-devel + libsigc++30-doc libslirp-devel libsmartcols-devel libsmbclient-devel @@ -613,6 +620,8 @@ pam_wrapper pangomm-devel pangomm-doc + pangomm2.48-devel + pangomm2.48-doc papi-testsuite parted-devel pcre2-static diff --git a/comps/CRB-ppc64le.xml b/comps/CRB-ppc64le.xml index 505e55b..1797a2a 100644 --- a/comps/CRB-ppc64le.xml +++ b/comps/CRB-ppc64le.xml @@ -51,8 +51,6 @@ avahi-glib-devel babel babel-doc - babl-devel - babl-devel-docs bash-devel bcc-devel bcc-doc @@ -86,6 +84,8 @@ bsf cairomm-devel cairomm-doc + cairomm1.16-devel + cairomm1.16-doc capstone-devel capstone-java catatonit @@ -196,6 +196,8 @@ glibc-static glibmm2.4-devel glibmm2.4-doc + glibmm2.68-devel + glibmm2.68-doc glslang-devel gnome-autoar-devel gnome-bluetooth-libs-devel @@ -220,8 +222,11 @@ gstreamer1-plugins-bad-free-devel gtk-doc gtk3-devel-docs + gtk4-devel-docs gtkmm3.0-devel gtkmm3.0-doc + gtkmm4.0-devel + gtkmm4.0-doc hamcrest hamcrest-core help2man @@ -419,6 +424,8 @@ libshout-devel libsigc++20-devel libsigc++20-doc + libsigc++30-devel + libsigc++30-doc libslirp-devel libsmartcols-devel libsmbclient-devel @@ -604,6 +611,8 @@ pam_wrapper pangomm-devel pangomm-doc + pangomm2.48-devel + pangomm2.48-doc papi-testsuite parted-devel pcre2-static diff --git a/comps/CRB-s390x.xml b/comps/CRB-s390x.xml index 8f6ef09..65dbb34 100644 --- a/comps/CRB-s390x.xml +++ b/comps/CRB-s390x.xml @@ -51,8 +51,6 @@ avahi-glib-devel babel babel-doc - babl-devel - babl-devel-docs bash-devel bcc-devel bcc-doc @@ -86,6 +84,8 @@ bsf cairomm-devel cairomm-doc + cairomm1.16-devel + cairomm1.16-doc capstone-devel capstone-java catatonit @@ -193,6 +193,8 @@ glibc-static glibmm2.4-devel glibmm2.4-doc + glibmm2.68-devel + glibmm2.68-doc glslang-devel gnome-autoar-devel gnome-calculator-devel @@ -216,8 +218,11 @@ gstreamer1-plugins-bad-free-devel gtk-doc gtk3-devel-docs + gtk4-devel-docs gtkmm3.0-devel gtkmm3.0-doc + gtkmm4.0-devel + gtkmm4.0-doc hamcrest hamcrest-core help2man @@ -408,6 +413,8 @@ libshout-devel libsigc++20-devel libsigc++20-doc + libsigc++30-devel + libsigc++30-doc libslirp-devel libsmartcols-devel libsmbclient-devel @@ -600,6 +607,8 @@ pam_wrapper pangomm-devel pangomm-doc + pangomm2.48-devel + pangomm2.48-doc parted-devel pcre2-static pcre2-tools diff --git a/comps/CRB-x86_64.xml b/comps/CRB-x86_64.xml index 9a4a922..146709f 100644 --- a/comps/CRB-x86_64.xml +++ b/comps/CRB-x86_64.xml @@ -52,8 +52,6 @@ avahi-glib-devel babel babel-doc - babl-devel - babl-devel-docs bash-devel bcc-devel bcc-doc @@ -87,6 +85,8 @@ bsf cairomm-devel cairomm-doc + cairomm1.16-devel + cairomm1.16-doc capstone-devel capstone-java catatonit @@ -199,6 +199,8 @@ glibc-static glibmm2.4-devel glibmm2.4-doc + glibmm2.68-devel + glibmm2.68-doc glslang-devel gnome-autoar-devel gnome-bluetooth-libs-devel @@ -225,8 +227,11 @@ gstreamer1-plugins-bad-free-devel gtk-doc gtk3-devel-docs + gtk4-devel-docs gtkmm3.0-devel gtkmm3.0-doc + gtkmm4.0-devel + gtkmm4.0-doc hamcrest hamcrest-core help2man @@ -427,6 +432,8 @@ libshout-devel libsigc++20-devel libsigc++20-doc + libsigc++30-devel + libsigc++30-doc libslirp-devel libsmartcols-devel libsmbclient-devel @@ -647,6 +654,8 @@ pam_wrapper pangomm-devel pangomm-doc + pangomm2.48-devel + pangomm2.48-doc papi-testsuite parted-devel pcre2-static