postgresql.spec

@@ -32,12 +32,7 @@
 %{!?beta:%global beta 0}
 
 %{!?test:%global test 1}
-%ifnarch riscv64
 %{!?llvmjit:%global llvmjit 1}
-%else
-# Fail to pass tests on riscv64
-%{!?llvmjit:%global llvmjit 0}
-%endif
 %{!?upgrade:%global upgrade 1}
 %{!?plpython:%global plpython 1}
 %{!?plpython3:%global plpython3 1}
@@ -66,7 +61,7 @@ Summary: PostgreSQL client programs
 Name: postgresql
 %global majorversion 12
 Version: %{majorversion}.2
-Release: 2.0.riscv64%{?dist}
+Release: 2%{?dist}
 
 # The PostgreSQL license is very similar to other MIT licenses, but the OSI
 # recognizes it as an independent license, so we do as well.
@@ -460,9 +455,6 @@ export CFLAGS
 # since that's still considered the default plpython version.
 common_configure_options='
 	--disable-rpath
-%ifarch riscv64
-	--disable-spinlocks
-%endif
 %if %beta
 	--enable-debug
 	--enable-cassert
@@ -652,9 +644,6 @@ upgrade_configure ()
 		--host=%{_host} \
 		--prefix=%prev_prefix \
 		--disable-rpath \
-%ifarch riscv64
-		--disable-spinlocks \
-%endif
 %if %beta
 		--enable-debug \
 		--enable-cassert \
@@ -1269,10 +1258,6 @@ make -C postgresql-setup-%{setup_version} check
 
 
 %changelog
-* Sun Apr 05 2020 David Abdurachmanov <david.abdurachmanov@sifive.com> - 12.2-2.0.riscv64
-- Disable spinlocks on RISC-V 64-bit (riscv64)
-- Disable LLVM/Clang for riscv64 (fails tests)
-
 * Thu Mar 12 2020 Patrik Novotný <panovotn@redhat.com> - 12.2-2
 - Fix requirements for JIT in postgresql-server-devel
 - Fix build issues regarding new perl update