Match upstream branch

Signed-off-by: David Abdurachmanov <davidlt@rivosinc.com>

annobin.spec

@@ -2,7 +2,7 @@
 Name:    annobin
 Summary: Annotate and examine compiled binary files
 Version: 12.28
-Release: 1.0.riscv64%{?dist}
+Release: 1%{?dist}
 License: GPL-3.0-or-later AND LGPL-2.0-or-later AND (GPL-2.0-or-later WITH GCC-exception-2.0) AND (LGPL-2.0-or-later WITH GCC-exception-2.0) AND GFDL-1.3-or-later 
 URL: https://sourceware.org/annobin/
 # Maintainer: nickc@redhat.com
@@ -25,21 +25,13 @@ URL: https://sourceware.org/annobin/
 %bcond_with debuginfod
 
 # Use "--without clangplugin" to disable the building of the annobin plugin for Clang.
-%ifnarch riscv64
 %bcond_without clangplugin
-%else
-%bcond_with clangplugin
-%endif
 
 # Use "--without gccplugin" to disable the building of the annobin plugin for GCC.
 %bcond_without gccplugin
 
 # Use "--without llvmplugin" to disable the building of the annobin plugin for LLVM.
-%ifnarch riscv64
 %bcond_without llvmplugin
-%else
-%bcond_with llvmplugin
-%endif
 
 # Set this to zero to disable the requirement for a specific version of gcc.
 # This should only be needed if there is some kind of problem with the version
@@ -532,9 +524,6 @@ make check
 #---------------------------------------------------------------------------------
 
 %changelog
-* Thu Oct 12 2023 David Abdurachmanov  <davidlt@rivosinc.com> - 12.28-1.0.riscv64
-- Disable Clang and LLVM plugins on riscv64
-
 * Fri Oct 06 2023 Nick Clifron  <nickc@redhat.com> - 12.28-1
 - GCC Plugin: Record settings of -Wstrict-flex-arrays and -fstrict-flex-arrays
 - Annobin: Add future test of these options.