OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Christoph Schug
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 24-Jul-2007 12:20:06
Branch: HEAD Handle: 2007072411200501
Modified files:
openpkg-src/apache-php apache-php.spec
openpkg-src/php php.spec
Log:
implicitly set 'with_imap=yes' when 'with_imap_annotate=yes' is being
set
Summary:
Revision Changes Path
1.3 +6 -2 openpkg-src/apache-php/apache-php.spec
1.158 +6 -2 openpkg-src/php/php.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/apache-php/apache-php.spec
============================================================================
$ cvs diff -u -r1.2 -r1.3 apache-php.spec
--- openpkg-src/apache-php/apache-php.spec 2 Jul 2007 17:20:41 -0000
1.2
+++ openpkg-src/apache-php/apache-php.spec 24 Jul 2007 10:20:05 -0000
1.3
@@ -39,7 +39,7 @@
Group: Web
License: PHP
Version: %{V_php}
-Release: 20070702
+Release: 20070724
# package options
%option with_suhosin no
@@ -96,6 +96,10 @@
%undefine with_gd
%define with_gd yes
%endif
+%if "%{with_imap_annotate}" == "yes"
+%undefine with_imap
+%define with_imap yes
+%endif
%if "%{with_mysql}" == "yes" || "%{with_gd}" == "yes" || "%{with_dom}" ==
"yes"
%undefine with_zlib
%define with_zlib yes
@@ -194,11 +198,11 @@
%if "%{with_imap}" == "yes"
BuildPreReq: imap, openssl
PreReq: imap, openssl
-%endif
%if "%{with_imap_annotate}" == "yes"
BuildPreReq: imap::with_annotate = yes
PreReq: imap::with_annotate = yes
%endif
+%endif
%if "%{with_xml}" == "yes"
BuildPreReq: libxml
PreReq: libxml
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/php/php.spec
============================================================================
$ cvs diff -u -r1.157 -r1.158 php.spec
--- openpkg-src/php/php.spec 1 Jun 2007 20:45:12 -0000 1.157
+++ openpkg-src/php/php.spec 24 Jul 2007 10:20:06 -0000 1.158
@@ -39,7 +39,7 @@
Group: Language
License: PHP
Version: %{V_php}
-Release: 20070601
+Release: 20070724
# package options
%option with_suhosin no
@@ -96,6 +96,10 @@
%undefine with_gd
%define with_gd yes
%endif
+%if "%{with_imap_annotate}" == "yes"
+%undefine with_imap
+%define with_imap yes
+%endif
%if "%{with_mysql}" == "yes" || "%{with_gd}" == "yes" || "%{with_dom}" ==
"yes"
%undefine with_zlib
%define with_zlib yes
@@ -191,11 +195,11 @@
%if "%{with_imap}" == "yes"
BuildPreReq: imap, openssl
PreReq: imap, openssl
-%endif
%if "%{with_imap_annotate}" == "yes"
BuildPreReq: imap::with_annotate = yes
PreReq: imap::with_annotate = yes
%endif
+%endif
%if "%{with_xml}" == "yes"
BuildPreReq: libxml
PreReq: libxml
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
