From 35f115127f1a47ed90a5875710a9cfb742c94526 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Sep 13 2014 12:40:45 +0000
Subject: PHP 5.6.1RC1


---

diff --git a/.gitignore b/.gitignore
index 9556a05..f5c065b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,3 +30,4 @@ php-5.5.*.xz
 /php-5.6.0RC3-strip.tar.xz
 /php-5.6.0RC4-strip.tar.xz
 /php-5.6.0-strip.tar.xz
+/php-5.6.1RC1-strip.tar.xz
diff --git a/php-bug67878.patch b/php-bug67878.patch
deleted file mode 100644
index c2669cf..0000000
--- a/php-bug67878.patch
+++ /dev/null
@@ -1,201 +0,0 @@
-From e02616866fe2461836dc8f7f6e369b3b25644cc4 Mon Sep 17 00:00:00 2001
-From: Remi Collet <remi@php.net>
-Date: Thu, 21 Aug 2014 09:09:21 +0200
-Subject: [PATCH] Fix bug #67878 program_prefix not honoured in man pages
-
-- add @program_prefix@ in php, phpize and php-config man pages
-- set date to 2014
-- fix "SEE ALSO" alignment
----
- sapi/cli/php.1.in            | 34 +++++++++++++++++-----------------
- scripts/man1/php-config.1.in | 14 +++++++-------
- scripts/man1/phpize.1.in     | 14 +++++++-------
- 3 files changed, 31 insertions(+), 31 deletions(-)
-
-diff --git a/sapi/cli/php.1.in b/sapi/cli/php.1.in
-index 4d536df..c062f3d 100644
---- a/sapi/cli/php.1.in
-+++ b/sapi/cli/php.1.in
-@@ -1,24 +1,24 @@
--.TH PHP 1 "2014" "The PHP Group" "Scripting Language"
-+.TH @program_prefix@php 1 "2014" "The PHP Group" "Scripting Language"
- .SH NAME
--php \- PHP Command Line Interface 'CLI'
-+@program_prefix@php \- PHP Command Line Interface 'CLI'
- .P
--php-cgi \- PHP Common Gateway Interface 'CGI' command
-+@program_prefix@php-cgi \- PHP Common Gateway Interface 'CGI' command
- .SH SYNOPSIS
--.B php
-+.B @program_prefix@php
- [options] [
- .B \-f\fP ]
- .IR file
- [[\-\-] 
- .IR args.\|.\|. ]
- .LP
--.B php
-+.B @program_prefix@php
- [options] 
- .B \-r 
- .IR code
- [[\-\-]
- .IR args.\|.\|. ]
- .LP
--.B php
-+.B @program_prefix@php
- [options] [\-B 
- .IR begin_code ]
- .B \-R 
-@@ -28,7 +28,7 @@ php-cgi \- PHP Common Gateway Interface 'CGI' command
- [[\-\-]
- .IR args.\|.\|. ]
- .LP
--.B php
-+.B @program_prefix@php
- [options] [\-B 
- .IR begin_code ]
- .B \-F 
-@@ -38,13 +38,13 @@ php-cgi \- PHP Common Gateway Interface 'CGI' command
- [[\-\-]
- .IR args.\|.\|. ]
- .LP
--.B php
-+.B @program_prefix@php
- [options] \-\- [
- .IR args.\|.\|. ]
- .LP
--\fBphp \fP[options] \fB\-a\fP
-+\fB@program_prefix@php \fP[options] \fB\-a\fP
- .LP
--.B php
-+.B @program_prefix@php
- [options] \-S
- .IR addr:port
- [\-t
-@@ -374,35 +374,35 @@ The standard configuration file will only be used when
- cannot be found.
- .SH EXAMPLES
- .TP 5
--\fIphp \-r 'echo "Hello World\\n";'\fP
-+\fI@program_prefix@php \-r 'echo "Hello World\\n";'\fP
- This command simply writes the text "Hello World" to standard out.
- .TP
--\fIphp \-r 'print_r(gd_info());'\fP
-+\fI@program_prefix@php \-r 'print_r(gd_info());'\fP
- This shows the configuration of your gd extension. You can use this
- to easily check which image formats you can use. If you have any
- dynamic modules you may want to use the same ini file that php uses
- when executed from your webserver. There are more extensions which
- have such a function. For dba use:
- .RS
--\fIphp \-r 'print_r(dba_handlers(1));'\fP
-+\fI@program_prefix@php \-r 'print_r(dba_handlers(1));'\fP
- .RE
- .TP
--\fIphp \-R 'echo strip_tags($argn)."\\n";'\fP
-+\fI@program_prefix@php \-R 'echo strip_tags($argn)."\\n";'\fP
- This PHP command strips off the HTML tags line by line and outputs the 
- result. To see how it works you can first look at the following PHP command
- \'\fIphp \-d html_errors=1 \-i\fP\' which uses PHP to output HTML formatted
- configuration information. If you then combine those two 
- \'\fIphp \.\.\.|php \.\.\.\fP\' you'll see what happens.
- .TP
--\fIphp \-E 'echo "Lines: $argi\\n";'\fP
-+\fI@program_prefix@php \-E 'echo "Lines: $argi\\n";'\fP
- Using this PHP command you can count the lines being input.
- .TP
--\fIphp \-R '@$l+=count(file($argn));' \-E 'echo "Lines:$l\\n";'\fP
-+\fI@program_prefix@php \-R '@$l+=count(file($argn));' \-E 'echo "Lines:$l\\n";'\fP
- In this example PHP expects each input line being a file. It counts all lines 
- of the files specified by each input line and shows the summarized result. 
- You may combine this with tools like find and change the php scriptlet.
- .TP
--\fIphp \-R 'echo "$argn\\n"; fgets(STDIN);'\fP
-+\fI@program_prefix@php \-R 'echo "$argn\\n"; fgets(STDIN);'\fP
- Since you have access to STDIN from within \-B \-R \-F and \-E you can skip 
- certain input lines with your code. But note that in such cases $argi only 
- counts the lines being processed by php itself. Having read this you will 
-diff --git a/scripts/man1/php-config.1.in b/scripts/man1/php-config.1.in
-index 5c60408..ae2ee56 100644
---- a/scripts/man1/php-config.1.in
-+++ b/scripts/man1/php-config.1.in
-@@ -1,12 +1,12 @@
--.TH php\-config 1 "2010" "The PHP Group" "Scripting Language"
-+.TH @program_prefix@php\-config 1 "2014" "The PHP Group" "Scripting Language"
- .SH NAME
--php\-config \- get information about PHP configuration and compile options
-+@program_prefix@php\-config \- get information about PHP configuration and compile options
- .SH SYNOPSIS
--.B php\-config
-+.B @program_prefix@php\-config
- [options]
- .LP
- .SH DESCRIPTION
--.B php\-config
-+.B @program_prefix@php\-config
- is a simple shell script for obtaining information about installed PHP configuration.
- .SH OPTIONS
- .TP 15
-@@ -57,15 +57,15 @@ PHP version
- .PD 0
- .B \-\-vernum
- PHP version as integer
--.TP
-+.RS
- .PD 1
- .P
- .SH SEE ALSO
--.BR php (1)
-+.BR @program_prefix@php (1)
- .SH VERSION INFORMATION
- This manpage describes \fBphp\fP, version @PHP_VERSION@.
- .SH COPYRIGHT
--Copyright \(co 1997\-2010 The PHP Group
-+Copyright \(co 1997\-2014 The PHP Group
- .LP
- This source file is subject to version 3.01 of the PHP license,
- that is bundled with this package in the file LICENSE, and is
-diff --git a/scripts/man1/phpize.1.in b/scripts/man1/phpize.1.in
-index 8f62f86..e49adb1 100644
---- a/scripts/man1/phpize.1.in
-+++ b/scripts/man1/phpize.1.in
-@@ -1,12 +1,12 @@
--.TH phpize 1 "2010" "The PHP Group" "Scripting Language"
-+.TH @program_prefix@phpize 1 "2014" "The PHP Group" "Scripting Language"
- .SH NAME
--phpize \- prepare a PHP extension for compiling
-+@program_prefix@phpize \- prepare a PHP extension for compiling
- .SH SYNOPSIS
--.B phpize
-+.B @program_prefix@phpize
- [options]
- .LP
- .SH DESCRIPTION
--.B phpize
-+.B @program_prefix@phpize
- is a shell script to prepare PHP extension for compiling.
- .SH OPTIONS
- .TP 15
-@@ -24,15 +24,15 @@ Prints usage information
- .PD 1
- .B \-v
- Prints API version information
--.TP
-+.RS
- .PD 1
- .P
- .SH SEE ALSO
--.BR php (1)
-+.BR @program_prefix@php (1)
- .SH VERSION INFORMATION
- This manpage describes \fBphp\fP, version @PHP_VERSION@.
- .SH COPYRIGHT
--Copyright \(co 1997\-2010 The PHP Group
-+Copyright \(co 1997\-2014 The PHP Group
- .LP
- This source file is subject to version 3.01 of the PHP license,
- that is bundled with this package in the file LICENSE, and is
--- 
-1.9.2
-
diff --git a/php.spec b/php.spec
index d4477f2..a68cb89 100644
--- a/php.spec
+++ b/php.spec
@@ -57,12 +57,12 @@
 %global db_devel  libdb-devel
 %endif
 
-#global rcver         RC4
+%global rcver         RC1
 
 Summary: PHP scripting language for creating dynamic web sites
 Name: php
-Version: 5.6.0
-Release: 1%{?dist}
+Version: 5.6.1
+Release: 0.1.RC1%{?dist}
 # All files licensed under PHP version 3.01, except
 # Zend is licensed under Zend
 # TSRM is licensed under BSD
@@ -112,7 +112,6 @@ Patch46: php-5.4.9-fixheader.patch
 Patch47: php-5.4.9-phpinfo.patch
 
 # Upstream fixes (100+)
-Patch100: php-bug67878.patch
 
 # Security fixes (200+)
 
@@ -713,7 +712,6 @@ httpd -V  | grep -q 'threaded:.*yes' && exit 1
 %patch47 -p1 -b .phpinfo
 
 # upstream patches
-%patch100 -p1 -b .b67878
 
 # security patches
 
@@ -1472,6 +1470,9 @@ rm -f README.{Zeus,QNX,CVS-RULES}
 
 
 %changelog
+* Sat Sep 13 2014 Remi Collet <rcollet@redhat.com> 5.6.1-0.1.RC1
+- php 5.6.1RC1
+
 * Thu Aug 28 2014 Remi Collet <remi@fedoraproject.org> 5.6.0-1
 - PHP 5.6.0 is GA
   http://php.net/releases/5_6_0.php
diff --git a/sources b/sources
index 914ae1c..9895ad4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ac14aba0fb07f390809f03d388b68d72  php-5.6.0-strip.tar.xz
+3b485b7b9844588ca54548b27ed874fc  php-5.6.1RC1-strip.tar.xz