From 8af345b4f1c34c43f67e4c5ebc26af82cdc9b33b Mon Sep 17 00:00:00 2001
From: Marc Fiuczynski <mef@cs.princeton.edu>
Date: Mon, 5 Nov 2007 18:20:57 +0000
Subject: [PATCH] fix distroname conditional
---
myplc-devel-native.spec | 20 +++++---------------
1 file changed, 5 insertions(+), 15 deletions(-)
diff --git a/myplc-devel-native.spec b/myplc-devel-native.spec
index 717caf1..2425ad8 100644
--- a/myplc-devel-native.spec
+++ b/myplc-devel-native.spec
@@ -41,24 +41,18 @@ Requires: gperf
Requires: graphviz
Requires: gzip
Requires: httpd
-%if "%{distroname}" == "Fedora"
-%if "%{distrorelease}" >= "7"
+%if "%{distroname}" == "Fedora" && "%{distrorelease}" >= "7"
Requires: inotify-tools-devel
%endif
-%endif
Requires: iptables
Requires: less
Requires: libpcap
-%if "%{distroname}" == "Fedora"
-%if "%{distrorelease}" >= "6"
+%if "%{distroname}" == "Fedora" && "%{distrorelease}" >= "6"
Requires: libpcap-devel
%endif
-%endif
-%if "%{distroname}" == "CentOS"
-%if "%{distrorelease}" >= "5")
+%if "%{distroname}" == "CentOS" && "%{distrorelease}" >= "5")
Requires: libpcap-devel
%endif
-%endif
Requires: libtool
Requires: linuxdoc-tools
Requires: mailx
@@ -85,18 +79,14 @@ Requires: postgresql-python
Requires: postgresql-server
Requires: python
Requires: python-devel
-%if "%{distroname}" == "Fedora"
-%if "%{distrorelease}" >= "5"
+%if "%{distroname}" == "Fedora" && "%{distrorelease}" >= "5"
Requires: python-pycurl
Requires: python-psycopg2
%endif
-%endif
-%if "%{distroname}" == "CentOS"
-%if "%{distrorelease}" >= "5")
+%if "%{distroname}" == "CentOS" && "%{distrorelease}" >= "5"
Requires: python-pycurl
Requires: python-psycopg2
%endif
-%endif
Requires: PyXML
Requires: readline-devel
Requires: redhat-rpm-config
--
2.47.0