From 41f35e70df945b41bfe8114e5aeb9888362ecd1b Mon Sep 17 00:00:00 2001 From: Troy Dawson Date: Thu, 7 Sep 2017 07:43:47 -0700 Subject: [PATCH] Cleanup spec file conditionals --- zookeeper.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/zookeeper.spec b/zookeeper.spec index 64481f5..d59b484 100644 --- a/zookeeper.spec +++ b/zookeeper.spec @@ -3,7 +3,7 @@ Name: zookeeper Version: 3.4.9 -Release: 6%{?dist} +Release: 7%{?dist} Summary: A high-performance coordination service for distributed applications License: ASL 2.0 and BSD URL: https://zookeeper.apache.org/ @@ -45,7 +45,7 @@ BuildRequires: javapackages-tools BuildRequires: jtoaster BuildRequires: junit BuildRequires: jdiff -%if 0%{?fedora} >= 21 +%if 0%{?fedora} >= 21 || 0%{?rhel} > 7 BuildRequires: mvn(org.slf4j:slf4j-log4j12) BuildRequires: objectweb-pom BuildRequires: jline1 @@ -187,7 +187,7 @@ install -pm 755 bin/zkServer.sh %{buildroot}%{_bindir} mkdir -p %{buildroot}%{_libexecdir} install -pm 755 %{SOURCE3} %{buildroot}%{_libexecdir} -%if 0%{?fedora} >= 21 +%if 0%{?fedora} >= 21 || 0%{?rhel} > 7 mkdir -p %{buildroot}%{_datadir}/maven-metadata mkdir -p %{buildroot}%{_datadir}/maven-poms install -pm 644 build/%{name}-%{version}/dist-maven/%{name}-%{version}.pom %{buildroot}%{_datadir}/maven-poms/%{name}-%{name}.pom @@ -277,7 +277,7 @@ getent passwd zookeeper >/dev/null || \ %{_javadir}/%{name}/%{name}.jar %{_javadir}/%{name}/%{name}-tests.jar %{_javadir}/%{name}/%{name}-ZooInspector.jar -%if 0%{?fedora} >= 21 +%if 0%{?fedora} >= 21 || 0%{?rhel} > 7 %{_datadir}/maven-poms/%{name}-%{name}.pom %{_datadir}/maven-poms/%{name}-%{name}-ZooInspector.pom %{_datadir}/maven-metadata/%{name}.xml @@ -303,6 +303,9 @@ getent passwd zookeeper >/dev/null || \ %doc LICENSE.txt NOTICE.txt src/contrib/zkpython/README %changelog +* Thu Sep 07 2017 Troy Dawson - 3.4.9-7 +- Cleanup spec file conditionals + * Sat Aug 19 2017 Zbigniew Jędrzejewski-Szmek - 3.4.9-6 - Python 2 binary package renamed to python2-zookeeper See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3