From 0e8b256dc049bbfaeb6be2c73631f45fccf09315 Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Date: Thu, 24 Nov 2022 14:26:37 +0100
Subject: [PATCH] Remove EL7 SCL macros and declare evr as noarch

Additionally this uses more macros to replace the name and version.

The postgresql-devel build requirement is dropped since it's redundant
and actually broke the build on Fedora.
---
 .../postgresql-evr-0.0.2.tar.gz               |  2 +-
 packages/postgresql-evr/postgresql-evr.spec   | 40 ++++++-------------
 2 files changed, 13 insertions(+), 29 deletions(-)

diff --git a/packages/postgresql-evr/postgresql-evr-0.0.2.tar.gz b/packages/postgresql-evr/postgresql-evr-0.0.2.tar.gz
index a4fa63262..76c1f0c3d 120000
--- a/packages/postgresql-evr/postgresql-evr-0.0.2.tar.gz
+++ b/packages/postgresql-evr/postgresql-evr-0.0.2.tar.gz
@@ -1 +1 @@
-../../../.git/annex/objects/Jf/ZW/SHA256E-s13809--385c403f63d0ad30c3156f9084277c5eb5b582bbf945172fefc0f34c53d06c7c.tar.gz/SHA256E-s13809--385c403f63d0ad30c3156f9084277c5eb5b582bbf945172fefc0f34c53d06c7c.tar.gz
\ No newline at end of file
+../../.git/annex/objects/Jf/ZW/SHA256E-s13809--385c403f63d0ad30c3156f9084277c5eb5b582bbf945172fefc0f34c53d06c7c.tar.gz/SHA256E-s13809--385c403f63d0ad30c3156f9084277c5eb5b582bbf945172fefc0f34c53d06c7c.tar.gz
\ No newline at end of file
diff --git a/packages/postgresql-evr/postgresql-evr.spec b/packages/postgresql-evr/postgresql-evr.spec
index d64a77d04..7dcd83f28 100644
--- a/packages/postgresql-evr/postgresql-evr.spec
+++ b/packages/postgresql-evr/postgresql-evr.spec
@@ -1,57 +1,41 @@
-%if 0%{?rhel} <= 7
-%global scl rh-postgresql12
-%endif
-
-%{?scl:%scl_package postgresql-evr}
-%{!?scl:%global pkg_name %{name}}
-
-%global debug_package %{nil}
-
-Name:		%{?scl_prefix}postgresql-evr
+Name:		postgresql-evr
 Version:	0.0.2
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	RPM evr extension for PostgreSQL
 
-Group:    	Applications/System
 License:	GPLv3
 
-BuildRequires: %{?scl_prefix}postgresql-devel
-%{?scl:BuildRequires: %{?scl_prefix}runtime}
-
-%if 0%{?rhel} > 7
-BuildRequires: postgresql-server-devel
-%endif
+BuildArch: noarch
+BuildRequires: libpq-devel
+Requires: postgresql-server
 
-Requires: %{?scl_prefix}postgresql-server
-%{?scl:Requires: %{?scl_prefix}runtime}
-
-ExclusiveArch: x86_64
 URL: https://github.com/Katello/postgresql-evr
-Source0: https://codeload.github.com/Katello/postgresql-evr/tar.gz/%{version}#/postgresql-evr-%{version}.tar.gz
+Source0: https://codeload.github.com/Katello/%{name}/tar.gz/%{version}#/%{name}-%{version}.tar.gz
 
 %description
 Installs files required to create evr extension in PostgreSQL.
 
 %prep
-%autosetup -p1 -n postgresql-evr-0.0.2
+%autosetup -p1 -n %{name}-%{version}
 
 %build
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%{?scl:scl enable %{scl} - <<EOF}
 %make_install
-%{?scl:EOF}
 
 
 %files
-
 %{_datadir}/pgsql/extension/evr.control
-%{_datadir}/pgsql/extension/evr--0.0.2.sql
+%{_datadir}/pgsql/extension/evr--%{version}.sql
 
 
 %changelog
+* Tue Sep 26 2023 Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl> - 0.0.2-2
+- Remove SCL macros
+- Declare as noarch
+
 * Mon Apr 13 2020 ianballou <ianballou67@gmail.com> 0.0.2-1
 - remove superuser requirement