Apply RHEL patches last

The implicit declarations fix broken the ELN build due to overlapping
patches.  Applying the RHEL patches last, and adjusting them as needed
for Fedora changes, is the simplest way to make both builds successful.

fapolicyd-uthash-bundle.patch

@@ -16,7 +16,7 @@ diff -up ./src/library/rpm-backend.c.uthash ./src/library/rpm-backend.c
 --- ./src/library/rpm-backend.c.uthash	2022-09-29 11:57:26.297879027 +0200
 +++ ./src/library/rpm-backend.c	2022-09-29 11:58:45.470119807 +0200
 @@ -32,7 +32,7 @@
- #include <rpm/rpmdb.h>
+ #include <rpm/rpmpgp.h>
  #include <fnmatch.h>
  
 -#include <uthash.h>

fapolicyd.spec

@@ -30,8 +30,9 @@ Requires(post): systemd-units
 Requires(preun): systemd-units
 Requires(postun): systemd-units
 
-Patch1: fapolicyd-uthash-bundle.patch
 Patch2: fapolicyd-rpm-backend-c99.patch
+# RHEL-specific patches
+Patch100: fapolicyd-uthash-bundle.patch
 
 %description
 Fapolicyd (File Access Policy Daemon) implements application whitelisting
@@ -58,15 +59,14 @@ The %{name}-selinux package contains selinux policy for the %{name} daemon.
 
 # selinux
 %setup -q -D -T -a 1
+%patch2 -p1 -b .c99
 
 %if 0%{?rhel} != 0
 # uthash
 %setup -q -D -T -a 2
-%patch1 -p1 -b .uthash
+%patch100 -p1 -b .uthash
 %endif
 
-%patch2 -p1 -b .c99
-
 # generate rules for python
 sed -i "s/%python2_path%/`readlink -f %{__python2} | sed 's/\//\\\\\//g'`/g" rules.d/*.rules
 sed -i "s/%python3_path%/`readlink -f %{__python3} | sed 's/\//\\\\\//g'`/g" rules.d/*.rules