libvpx-devel added. patching zlib on %prep instead of %build.

Author: syslogic

tools/rpmbuild/README.md

@@ -1,8 +1,11 @@
-## RPM Buildroot
+## Android Cuttlefish RPM for Red Hat Enterprise Linux
 
-The RPM SPECS can be built on RHEL with:
+The RPM packages can be built on RHEL 9 with:
 
     ./tools/buildutils/build_packages.sh
 
-Or on any OS, within a Docker container, which lives at [`docker/rpm-builder`](https://github.com/google/android-cuttlefish/tree/rpmbuild/docker/rpm-builder).
+Which calls `build_rpm_spec.sh`, when `dnf` is being detected:
 
+    ./docker/rpm-builder/build_rpm_spec.sh
+
+Or on any OS, within a Docker container, which lives at [`docker/rpm-builder`](https://github.com/google/android-cuttlefish/tree/main/docker/rpm-builder).

tools/rpmbuild/SPECS/cuttlefish_base.spec

@@ -29,12 +29,11 @@ Cuttlefish Android Virtual Device that are used in all deployments.
 %prep
 %define workdir `pwd`
 
-
-%build
 # The root module requires module version [email protected],
 # but got [email protected] in the resolved dependency graph.
 /home/runner/patch_zlib.sh
 
+%build
 cd ../../../base/cvd && bazel build --ui_event_filters=-INFO --verbose_failures ...
 
 %install

tools/rpmbuild/SPECS/cuttlefish_orchestration.spec

@@ -57,7 +57,7 @@ install -m 544 %{srcpath}/etc/sudoers.d/cuttlefish-orchestration %{buildroot}/et
 %post
 ln -sf /usr/lib/cuttlefish-common/bin/cvd /usr/bin/fetch_cvd
 
-# The cvdnetwork group is created by cuttlefish-base
+# The `cvdnetwork` group is being created by cuttlefish-base.
 if ! getent passwd _cvd-executor > /dev/null 2>&1 ; then
     adduser --system --shell /sbin/nologin --home /var/empty --no-create-home _cvd-executor
     usermod -a -G cvdnetwork,kvm _cvd-executor

tools/rpmbuild/SPECS/cuttlefish_user.spec

@@ -41,7 +41,7 @@ mkdir -p %{buildroot}/usr/share/cuttlefish-common/operator/static
 %define srcpath ../../../frontend/src
 install -m 755 %{srcpath}/host_orchestrator/host_orchestrator %{buildroot}/usr/lib/cuttlefish-common/bin/host_orchestrator
 install -m 755 %{srcpath}/operator/operator %{buildroot}/usr/lib/cuttlefish-common/bin/operator
-install -m 655 %{srcpath}/operator/intercept/js/server_connector.d.ts %{buildroot}/usr/share/cuttlefish-common/operator/intercept/js/server_connector.d.ts
+# install -m 655 %{srcpath}/operator/intercept/js/server_connector.d.ts %{buildroot}/usr/share/cuttlefish-common/operator/intercept/js/server_connector.d.ts
 install -m 655 %{srcpath}//operator/intercept/js/server_connector.js %{buildroot}/usr/share/cuttlefish-common/operator/intercept/js/server_connector.js
 
 %define srcpath ../../../frontend/src/operator/webui/dist/static
@@ -53,8 +53,7 @@ done
 %files
 /usr/lib/cuttlefish-common/bin/host_orchestrator
 /usr/lib/cuttlefish-common/bin/operator
-
-/usr/share/cuttlefish-common/operator/intercept/js/server_connector.d.ts
+# /usr/share/cuttlefish-common/operator/intercept/js/server_connector.d.ts
 /usr/share/cuttlefish-common/operator/intercept/js/server_connector.js
 
 /usr/share/cuttlefish-common/operator/static/index.html