From d4c62747b8b13ed8040e4e01a07e427c5164a763 Mon Sep 17 00:00:00 2001
From: Jonathan Lebon <jonathan@jlebon.com>
Date: Mar 27 2019 21:34:21 +0000
Subject: Simplify spec now that we no longer support el7


Less conditionals = more win

---

diff --git a/rpm-ostree.spec b/rpm-ostree.spec
index cb2bca5..8a1327b 100644
--- a/rpm-ostree.spec
+++ b/rpm-ostree.spec
@@ -19,13 +19,9 @@ ExclusiveArch: %{rust_arches}
 %if 0%{?fedora}
 BuildRequires: rust-packaging
 %else
-%if 0%{?rhel} < 8
-# really, this is for CentOS 7 (CAHC)
-BuildRequires: cargo
-%else
+# assume el8
 BuildRequires: rust-toolset
 %endif
-%endif
 
 # For the autofiles bits below
 BuildRequires: /usr/bin/python3
@@ -64,11 +60,7 @@ BuildRequires: pkgconfig(libcurl)
 BuildRequires: cmake
 BuildRequires: pkgconfig(expat)
 BuildRequires: pkgconfig(check)
-%if (0%{?rhel} != 0 && 0%{?rhel} <= 7)
-BuildRequires: libsolv-devel
-%else
 BuildRequires: pkgconfig(libsolv)
-%endif
 
 # We need g++ for libdnf
 BuildRequires: gcc-c++
@@ -87,11 +79,6 @@ BuildRequires:  gpgme-devel
 
 Requires:       libmodulemd%{?_isa} >= %{libmodulemd_version}
 
-# In CentOS7/RHEL the package is client-only right now, but we can do both
-%if 0%{?rhel} != 0 && 0%{?rhel} <= 7
-Provides: rpm-ostree-client
-%endif
-
 # For now...see https://github.com/projectatomic/rpm-ostree/pull/637
 # and https://github.com/fedora-infra/fedmsg-atomic-composer/pull/17
 # etc.  We'll drop this dependency at some point in the future when
@@ -128,13 +115,7 @@ The %{name}-devel package includes the header files for %{name}-libs.
 
 %build
 env NOCONFIGURE=1 ./autogen.sh
-%if 0%{?rhel} != 0 && 0%{?rhel} <= 7
-# https://github.com/projectatomic/rpm-ostree/pull/1732/
-# https://bugzilla.redhat.com/show_bug.cgi?id=1672404
-%configure --disable-silent-rules --enable-gtk-doc --disable-dfd-over-dbus
-%else
 %configure --disable-silent-rules --enable-gtk-doc
-%endif
 make %{?_smp_mflags}
 
 %install