[prev in list] [next in list] [prev in thread] [next in thread] 

List:       openpkg-cvs
Subject:    [CVS] OpenPKG: openpkg-src/apache/ apache.spec
From:       "Michael Schloh" <ms () openpkg ! org>
Date:       2004-08-30 17:21:43
Message-ID: 20040830172143.14CCA30192D () mail ! openpkg ! org
[Download RAW message or body]

  OpenPKG CVS Repository
  http://cvs.openpkg.org/
  ____________________________________________________________________________

  Server: cvs.openpkg.org                  Name:   Michael Schloh
  Root:   /e/openpkg/cvs                   Email:  ms@openpkg.org
  Module: openpkg-src                      Date:   30-Aug-2004 19:21:43
  Branch: HEAD                             Handle: 2004083018214200

  Modified files:
    openpkg-src/apache      apache.spec

  Log:
    repair combination with_gd and with_pdflib

  Summary:
    Revision    Changes     Path
    1.254       +8  -6      openpkg-src/apache/apache.spec
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/apache/apache.spec
  ============================================================================
  $ cvs diff -u -r1.253 -r1.254 apache.spec
  --- openpkg-src/apache/apache.spec	25 Aug 2004 16:11:06 -0000	1.253
  +++ openpkg-src/apache/apache.spec	30 Aug 2004 17:21:42 -0000	1.254
  @@ -66,7 +66,7 @@
   Group:        Web
   License:      ASF
   Version:      %{V_apache}
  -Release:      20040825
  +Release:      20040830
   
   #   package options (suexec related)
   %option       with_suexec               yes
  @@ -166,7 +166,7 @@
   %undefine     with_mod_php_gd
   %define       with_mod_php_gd           yes
   %endif
  -%if "%{with_mod_php_mysql}" == "yes" || "%{with_mod_php_pdflib}" == "yes" || \
"%{with_mod_php_gd}" == "yes" || "%{with_mod_php_dom}" == "yes"  +%if \
"%{with_mod_php_mysql}" == "yes" || "%{with_mod_php_gd}" == "yes" || \
"%{with_mod_php_dom}" == "yes"  %undefine     with_mod_php_zlib
   %define       with_mod_php_zlib         yes
   %endif
  @@ -254,8 +254,8 @@
   PreReq:       db
   %endif
   %if "%{with_mod_php_pdflib}" == "yes"
  -BuildPreReq:  pdflib, jpeg, png
  -PreReq:       pdflib, jpeg, png
  +BuildPreReq:  pdflib
  +PreReq:       pdflib
   %endif
   %if "%{with_mod_php_zlib}" == "yes"
   BuildPreReq:  zlib
  @@ -670,8 +670,10 @@
         CFLAGS="$CFLAGS -DEAPI"
   %endif
   %if "%{with_mod_php_gd}" == "yes"
  +%if "%{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
  @@ -732,9 +734,11 @@
   %endif
   %if "%{with_mod_php_gd}" == "yes"
             --with-gd=%{l_prefix} \
  +%if "%{with_mod_php_pdflib}" != "yes"
             --with-jpeg-dir=%{l_prefix} \
             --with-png-dir=%{l_prefix} \
   %endif
  +%endif
   %if "%{with_mod_php_freetype}" == "yes"
             --enable-gd-imgstrttf \
             --enable-gd-native-ttf \
  @@ -760,8 +764,6 @@
   %endif
   %if "%{with_mod_php_pdflib}" == "yes"
             --with-pdflib=%{l_prefix} \
  -          --with-jpeg-dir=%{l_prefix} \
  -          --with-png-dir=%{l_prefix} \
   %endif
   %if "%{with_mod_php_ssl}" == "yes" || "%{with_mod_php_openldap}" == "yes"
             --with-openssl=%{l_prefix} \
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     openpkg-cvs@openpkg.org


[prev in list] [next in list] [prev in thread] [next in thread]