From 6267304b78e53178cc185527334841fe49ace686 Mon Sep 17 00:00:00 2001
From: nazunalika <label@rockylinux.org>
Date: Wed, 22 Jun 2022 07:55:38 -0700
Subject: [PATCH] sync from upstream

---
 comps-rocky-9-lh.xml    | 5 +++++
 comps-rocky-9-lh.xml.in | 5 +++++
 sync-from-upstream      | 6 +++++-
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/comps-rocky-9-lh.xml b/comps-rocky-9-lh.xml
index 3f5989a..a0eb405 100644
--- a/comps-rocky-9-lh.xml
+++ b/comps-rocky-9-lh.xml
@@ -2713,6 +2713,7 @@
       <packagereq type="default">exempi-devel</packagereq>
       <packagereq type="default">exiv2-devel</packagereq>
       <packagereq type="default">exiv2-doc</packagereq>
+      <packagereq type="default">fdk-aac-free-devel</packagereq>
       <packagereq type="default">felix-utils</packagereq>
       <packagereq type="default">fftw-doc</packagereq>
       <packagereq type="default">file-devel</packagereq>
@@ -2761,6 +2762,7 @@
       <packagereq type="default">glibmm24-doc</packagereq>
       <packagereq type="default">glm-devel</packagereq>
       <packagereq type="default">glm-doc</packagereq>
+      <packagereq type="default">glslang-devel</packagereq>
       <packagereq type="default" arch="aarch64,x86_64,ppc64le">gnome-bluetooth-libs-devel</packagereq>
       <packagereq type="default">gnome-common</packagereq>
       <packagereq type="default">gnome-menus-devel</packagereq>
@@ -2979,6 +2981,7 @@
       <packagereq type="default">libsemanage-devel</packagereq>
       <packagereq type="default">libsepol-static</packagereq>
       <packagereq type="default" arch="ppc64le">libservicelog-devel</packagereq>
+      <packagereq type="default">libshaderc-devel</packagereq>
       <packagereq type="default">libshout-devel</packagereq>
       <packagereq type="default">libsigc++20-devel</packagereq>
       <packagereq type="default">libsigc++20-doc</packagereq>
@@ -3384,6 +3387,7 @@
       <packagereq type="default">perl-XML-Twig</packagereq>
       <packagereq type="default">perl-YAML-LibYAML</packagereq>
       <packagereq type="default">perl-YAML-Tiny</packagereq>
+      <packagereq type="default" arch="aarch64,s390x,x86_64">php-libguestfs</packagereq>
       <packagereq type="default">plexus-archiver</packagereq>
       <packagereq type="default">plexus-build-api</packagereq>
       <packagereq type="default">plexus-compiler</packagereq>
@@ -3470,6 +3474,7 @@
       <packagereq type="default">qgpgme</packagereq>
       <packagereq type="default">qgpgme-devel</packagereq>
       <packagereq type="default">qhull-devel</packagereq>
+      <packagereq type="default">qpdf</packagereq>
       <packagereq type="default">qt5-devel</packagereq>
       <packagereq type="default">qt5-qtbase-static</packagereq>
       <packagereq type="default">qt5-qtdeclarative-static</packagereq>
diff --git a/comps-rocky-9-lh.xml.in b/comps-rocky-9-lh.xml.in
index cd645fb..7c7b5d8 100644
--- a/comps-rocky-9-lh.xml.in
+++ b/comps-rocky-9-lh.xml.in
@@ -2955,6 +2955,7 @@
       <packagereq type="default">exempi-devel</packagereq>
       <packagereq type="default">exiv2-devel</packagereq>
       <packagereq type="default">exiv2-doc</packagereq>
+      <packagereq type="default">fdk-aac-free-devel</packagereq>
       <packagereq type="default">felix-utils</packagereq>
       <packagereq type="default">fftw-doc</packagereq>
       <packagereq type="default">file-devel</packagereq>
@@ -3003,6 +3004,7 @@
       <packagereq type="default">glibmm24-doc</packagereq>
       <packagereq type="default">glm-devel</packagereq>
       <packagereq type="default">glm-doc</packagereq>
+      <packagereq type="default">glslang-devel</packagereq>
       <packagereq type="default" arch="aarch64,x86_64,ppc64le">gnome-bluetooth-libs-devel</packagereq>
       <packagereq type="default">gnome-common</packagereq>
       <packagereq type="default">gnome-menus-devel</packagereq>
@@ -3221,6 +3223,7 @@
       <packagereq type="default">libsemanage-devel</packagereq>
       <packagereq type="default">libsepol-static</packagereq>
       <packagereq type="default" arch="ppc64le">libservicelog-devel</packagereq>
+      <packagereq type="default">libshaderc-devel</packagereq>
       <packagereq type="default">libshout-devel</packagereq>
       <packagereq type="default">libsigc++20-devel</packagereq>
       <packagereq type="default">libsigc++20-doc</packagereq>
@@ -3626,6 +3629,7 @@
       <packagereq type="default">perl-XML-Twig</packagereq>
       <packagereq type="default">perl-YAML-LibYAML</packagereq>
       <packagereq type="default">perl-YAML-Tiny</packagereq>
+      <packagereq type="default" arch="aarch64,s390x,x86_64">php-libguestfs</packagereq>
       <packagereq type="default">plexus-archiver</packagereq>
       <packagereq type="default">plexus-build-api</packagereq>
       <packagereq type="default">plexus-compiler</packagereq>
@@ -3712,6 +3716,7 @@
       <packagereq type="default">qgpgme</packagereq>
       <packagereq type="default">qgpgme-devel</packagereq>
       <packagereq type="default">qhull-devel</packagereq>
+      <packagereq type="default">qpdf</packagereq>
       <packagereq type="default">qt5-devel</packagereq>
       <packagereq type="default">qt5-qtbase-static</packagereq>
       <packagereq type="default">qt5-qtdeclarative-static</packagereq>
diff --git a/sync-from-upstream b/sync-from-upstream
index b957471..07289be 100755
--- a/sync-from-upstream
+++ b/sync-from-upstream
@@ -1,9 +1,13 @@
 #!/bin/bash
+HOWMANY="-$1"
+if [ -z $1  ]; then
+    HOWMANY="-1"
+fi
 
 echo "Fetching from upstream"
 git fetch https://gitlab.com/redhat/centos-stream/release-engineering/comps.git main
 echo "Formatting patch and applying..."
-git format-patch --stdout -1 FETCH_HEAD | sed -e 's/centos-stream-9/rocky-9-lh/' | git apply
+git format-patch --stdout ${HOWMANY} FETCH_HEAD | sed -e 's/centos-stream-9/rocky-9-lh/' | git apply
 echo "!! DIFF OF CHANGES !!"
 git --no-pager diff HEAD