From ae7d5d26ffe38b3be6b9a9bc1883075491c1c709 Mon Sep 17 00:00:00 2001 From: "Kaleb S. KEITHLEY" Date: Wed, 24 Jan 2018 12:56:14 -0500 Subject: packaging: python-ctypes only in RHEL <= 7 And we don't need multiple BuildRequires: python-ctypes for sub-packages when it's (already) set for the base package. Change-Id: I71a2d750f338d360d5f716b1f0c4814e4e617b04 BUG: 1538258 Signed-off-by: Kaleb S. KEITHLEY --- glusterfs.spec.in | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'glusterfs.spec.in') diff --git a/glusterfs.spec.in b/glusterfs.spec.in index 12594d93750..75e16c59f32 100644 --- a/glusterfs.spec.in +++ b/glusterfs.spec.in @@ -241,7 +241,7 @@ BuildRequires: ncurses-devel readline-devel BuildRequires: libxml2-devel openssl-devel BuildRequires: libaio-devel libacl-devel BuildRequires: python2-devel -%if ( 0%{?fedora} && 0%{?fedora} < 26 ) || ( 0%{?rhel} ) +%if ( 0%{?fedora} && 0%{?fedora} < 26 ) || ( 0%{?rhel} && 0%{?rhel} <= 7 ) BuildRequires: python-ctypes %endif %if ( 0%{?_with_ipv6default:1} ) || ( 0%{!?_without_libtirpc:1} ) @@ -373,9 +373,6 @@ Group: Applications/File # site-packages area Requires: python2-gluster = %{version}-%{release} Requires: python2 -%if ( 0%{?fedora} && 0%{?fedora} < 26 ) || ( 0%{?rhel} ) -BuildRequires: python-ctypes -%endif %description extra-xlators GlusterFS is a distributed file-system capable of scaling to several @@ -422,9 +419,6 @@ Requires: %{name}%{?_isa} = %{version}-%{release} Requires: %{name}-server%{?_isa} = %{version}-%{release} Requires: python2 Requires: python-prettytable -%if ( 0%{?fedora} && 0%{?fedora} < 26 ) || ( 0%{?rhel} ) -BuildRequires: python-ctypes -%endif Requires: python2-gluster = %{version}-%{release} Requires: rsync @@ -1420,6 +1414,9 @@ exit 0 %endif %changelog +* Wed Jan 24 2018 Kaleb S. KEITHLEY +- python-ctypes no long exists, now in python stdlib (#1538258) + * Thu Jan 18 2018 Kaleb S. KEITHLEY - Fedora 28 glibc has removed rpc headers and rpcgen, use libtirpc -- cgit