simplify condition syntax

apache/apache.spec

@@ -66,7 +66,7 @@ Class:        BASE
 Group:        Web
 License:      ASF
 Version:      %{V_apache}
-Release:      20040830
+Release:      20040831
 
 #   package options (suexec related)
 %option       with_suexec               yes
@@ -669,11 +669,9 @@ AutoReqProv:  no
 %if "%{with_mod_ssl}" == "yes"
       CFLAGS="$CFLAGS -DEAPI"
 %endif
-%if "%{with_mod_php_gd}" == "yes"
-%if "%{with_mod_php_pdflib}" != "yes"
+%if "%{with_mod_php_gd}" == "yes" && "%{with_mod_php_pdflib}" != "yes"
       LIBS="$LIBS -lpng -lz"
 %endif
-%endif
 %if "%{with_mod_php_gettext}" == "yes" || "%{with_mod_php_mssql}" == "yes"
       LIBS="$LIBS -liconv"
 %endif

php/php.spec

@@ -38,7 +38,7 @@ Class:        BASE
 Group:        Language
 License:      PHP
 Version:      %{V_php}
-Release:      20040830
+Release:      20040831
 
 #   package options
 %option       with_bc                   no
@@ -271,11 +271,9 @@ AutoReqProv:  no
 %if "%{with_gdbm}" == "yes"
     libs="$libs -lndbm -lgdbm"
 %endif
-%if "%{with_gd}" == "yes"
-%if "%{with_pdflib}" != "yes"
+%if "%{with_gd}" == "yes" && "%{with_pdflib}" != "yes"
     libs="$libs -lpng -lz"
 %endif
-%endif
 %if "%{with_gettext}" == "yes"
     libs="$libs -liconv"
 %endif