ius-coredev team mailing list archive

[Mark McKinstry <mmckinst@xxxxxxxxxxx>]

Mark McKinstry has proposed merging lp:~mmckinst/ius/php54 into lp:~ius-coredev/ius/php54.

Requested reviews:
  IUS Core Development (ius-coredev)

For more details, see:
https://code.launchpad.net/~mmckinst/ius/php54/+merge/120571

compile with bundled PCRE instead of system PCRE for lp bug 1039187
-- 
https://code.launchpad.net/~mmckinst/ius/php54/+merge/120571
Your team IUS Core Development is requested to review the proposed merge of lp:~mmckinst/ius/php54 into lp:~ius-coredev/ius/php54.

=== modified file 'SPECS/php54.spec'
--- SPECS/php54.spec	2012-08-20 13:41:18 +0000
+++ SPECS/php54.spec	2012-08-21 13:50:40 +0000
@@ -37,7 +37,7 @@
 Summary: PHP scripting language for creating dynamic web sites
 Name: %{name}
 Version: 5.4.6
-Release: 1.ius%{?dist}
+Release: 2.ius%{?dist}
 License: PHP
 Group: Development/Languages
 URL: http://www.php.net/
@@ -86,9 +86,6 @@
 BuildRequires: sqlite-devel >= 3.0.0
 %endif
 BuildRequires: zlib-devel, smtpdaemon, libedit-devel
-%if 0%{?fedora} >= 11 || 0%{?rhel} >= 6
-BuildRequires: pcre-devel >= 6.6
-%endif
 BuildRequires: bzip2, perl, libtool >= 1.4.3, gcc-c++
 BuildRequires: libtool-ltdl-devel
 BuildRequires: bison
@@ -866,9 +863,7 @@
 	--with-iconv \
 	--with-jpeg-dir=%{_prefix} \
 	--with-openssl \
-%if 0%{?fedora} >= 11 || 0%{?rhel} >= 6
-        --with-pcre-regex=%{_prefix} \
-%endif
+        --with-pcre-regex \
 	--with-zlib \
 	--with-layout=GNU \
 	--enable-exif \
@@ -1431,6 +1426,9 @@
 
 
 %changelog
+* Tue Aug 21 2012 Mark McKinstry <mmckinst@xxxxxxxxxxx> - 5.4.6-2.ius
+- compile with bundled PCRE instead of system PCRE
+
 * Mon Aug 20 2012 Jeffrey Ness <jeffrey.ness@xxxxxxxxxxxxx> 5.4.6-1
 - Latest source from upstream