[arch-commits] Commit in php/trunk (PKGBUILD generate_patches)

[Jan Steffens]

    Date: Thursday, May 10, 2018 @ 20:32:58
  Author: heftig
Revision: 323897

7.2.5-2

Modified:
  php/trunk/PKGBUILD
  php/trunk/generate_patches

------------------+
 PKGBUILD         |    2 +-
 generate_patches |    3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-05-10 20:08:44 UTC (rev 323896)
+++ PKGBUILD	2018-05-10 20:32:58 UTC (rev 323897)
@@ -22,7 +22,7 @@
          'php-tidy'
          'php-xsl')
 pkgver=7.2.5
-pkgrel=1
+pkgrel=2
 arch=('x86_64')
 license=('PHP')
 url='http://www.php.net'

Modified: generate_patches
===================================================================
--- generate_patches	2018-05-10 20:08:44 UTC (rev 323896)
+++ generate_patches	2018-05-10 20:32:58 UTC (rev 323897)
@@ -6,7 +6,7 @@
 
 pushd src/${pkgbase}-${pkgver}
 
-sed '/APACHE_THREADED_MPM=/d' -i.orig sapi/apache2handler/config.m4 -i.orig configure
+sed '/APACHE_THREADED_MPM=/d' -i.orig sapi/apache2handler/config.m4
 
 sed 's/.conf.default/.conf/g' -i.orig sapi/fpm/Makefile.frag
 
@@ -36,7 +36,6 @@
 	-i php.ini-production
 
 diff -u sapi/apache2handler/config.m4.orig sapi/apache2handler/config.m4 | filterdiff --clean --remove-timestamps > ../../apache.patch
-diff -u configure.orig configure | filterdiff --clean --remove-timestamps >> ../../apache.patch
 
 diff -u sapi/fpm/Makefile.frag.orig sapi/fpm/Makefile.frag | filterdiff --clean --remove-timestamps > ../../php-fpm.patch
 diff -u sapi/fpm/php-fpm.conf.in.orig sapi/fpm/php-fpm.conf.in | filterdiff --clean --remove-timestamps >> ../../php-fpm.patch