From 75f2a983211668bd127336ff07d447a0f5525734 Mon Sep 17 00:00:00 2001 From: Nathan Cutler Date: Thu, 9 Jul 2015 13:42:50 +0200 Subject: [PATCH] ceph.spec.in: clean up suse_version conditionals Use 0%{?suse_version} throughout for consistency. Signed-off-by: Nathan Cutler --- ceph.spec.in | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ceph.spec.in b/ceph.spec.in index 2e4fd54ffdea5..322e21bee01db 100644 --- a/ceph.spec.in +++ b/ceph.spec.in @@ -114,7 +114,7 @@ BuildRequires: python-requests %if ( 0%{?rhel} > 0 && 0%{?rhel} < 7 ) || ( 0%{?centos} > 0 && 0%{?centos} < 7 ) BuildRequires: python-sphinx10 %endif -%if 0%{?fedora} || 0%{defined suse_version} || 0%{?rhel} >= 7 || 0%{?centos} >= 7 +%if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} >= 7 || 0%{?centos} >= 7 BuildRequires: python-sphinx %endif @@ -129,7 +129,7 @@ BuildRequires: yasm ################################################################################# # distro-conditional dependencies ################################################################################# -%if 0%{defined suse_version} +%if 0%{?suse_version} Requires: python-Flask BuildRequires: net-tools BuildRequires: libbz2-devel @@ -211,7 +211,7 @@ Summary: Rados REST gateway Group: Development/Libraries Requires: ceph-common = %{epoch}:%{version}-%{release} Requires: librados2 = %{epoch}:%{version}-%{release} -%if 0%{defined suse_version} +%if 0%{?suse_version} BuildRequires: libexpat-devel BuildRequires: FastCGI-devel %endif @@ -552,7 +552,7 @@ export RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed -e 's/i386/i486/'` CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" # fix bug in specific version of libedit-devel -%if 0%{defined suse_version} +%if 0%{?suse_version} sed -i -e "s/-lcurses/-lncurses/g" Makefile sed -i -e "s/-lcurses/-lncurses/g" src/Makefile sed -i -e "s/-lcurses/-lncurses/g" man/Makefile @@ -640,7 +640,7 @@ mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/ceph/bootstrap-mds mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/ceph/bootstrap-rgw mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log/radosgw -%if %{defined suse_version} +%if 0%{?suse_version} # Fedora seems to have some problems with this macro, use it only on SUSE %fdupes -s $RPM_BUILD_ROOT/%{python_sitelib} %fdupes %buildroot -- 2.39.5