From 5beafd1fab624c36f81972588da3463a416a8a00 Mon Sep 17 00:00:00 2001 From: Marc Fiuczynski Date: Mon, 5 Nov 2007 18:25:49 +0000 Subject: [PATCH] combine conditionals; I thought parseSpec was wrong, but it turns out that it was due to a syntax error on my part --- myplc-devel-native.spec | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/myplc-devel-native.spec b/myplc-devel-native.spec index d786378..d0ecea3 100644 --- a/myplc-devel-native.spec +++ b/myplc-devel-native.spec @@ -47,10 +47,7 @@ Requires: inotify-tools-devel Requires: iptables Requires: less Requires: libpcap -%if "%{distroname}" == "Fedora" && "%{distrorelease}" >= "6" -Requires: libpcap-devel -%endif -%if "%{distroname}" == "CentOS" && "%{distrorelease}" >= "5" +%if ("%{distroname}" == "Fedora" && "%{distrorelease}" >= "6") || ("%{distroname}" == "CentOS" && "%{distrorelease}" >= "5") Requires: libpcap-devel %endif Requires: libtool @@ -79,11 +76,7 @@ Requires: postgresql-python Requires: postgresql-server Requires: python Requires: python-devel -%if "%{distroname}" == "Fedora" && "%{distrorelease}" >= "5" -Requires: python-pycurl -Requires: python-psycopg2 -%endif -%if "%{distroname}" == "CentOS" && "%{distrorelease}" >= "5" +%if ("%{distroname}" == "Fedora" && "%{distrorelease}" >= "5") || ("%{distroname}" == "CentOS" && "%{distrorelease}" >= "5") Requires: python-pycurl Requires: python-psycopg2 %endif -- 2.43.0