Petr Gajdos
c4b05f1e09
why: this aligns with maintenance patch names, which are in changelogs copied over php72, php7, php5, php53; moreover, php$N prefix causes issues when package is renamed, e. g. php7 to php72 - deleted patches - php7-crypt-tests.patch (upstreamed) - php7-date-regenerate-lexers.patch (upstreamed) - php7-embed.patch (upstreamed) - php7-fix_net-snmp_disable_MD5.patch (upstreamed) - php7-ini.patch (upstreamed) - php7-no-build-date.patch (upstreamed) - php7-odbc-cmp-int-cast.patch (upstreamed) - php7-openssl.patch (upstreamed) - php7-php-config.patch (upstreamed) - php7-phpize.patch (upstreamed) - php7-pts.patch (upstreamed) - php7-systemd-unit.patch (upstreamed) - php7-systzdata-v17.patch (upstreamed) - added patches + php-crypt-tests.patch + php-date-regenerate-lexers.patch + php-embed.patch + php-fix_net-snmp_disable_MD5.patch + php-ini.patch + php-no-build-date.patch + php-odbc-cmp-int-cast.patch + php-openssl.patch + php-php-config.patch + php-phpize.patch + php-pts.patch OBS-URL: https://build.opensuse.org/package/show/devel:languages:php/php7?expand=0&rev=177
36 lines
946 B
Diff
36 lines
946 B
Diff
---
|
|
scripts/Makefile.frag | 4 ++--
|
|
scripts/phpize.in | 4 ++--
|
|
2 files changed, 4 insertions(+), 4 deletions(-)
|
|
|
|
Index: scripts/Makefile.frag
|
|
===================================================================
|
|
--- scripts/Makefile.frag.orig
|
|
+++ scripts/Makefile.frag
|
|
@@ -3,8 +3,8 @@
|
|
# Build environment install
|
|
#
|
|
|
|
-phpincludedir = $(includedir)/php
|
|
-phpbuilddir = $(libdir)/build
|
|
+phpincludedir = $(includedir)/php7
|
|
+phpbuilddir = $(datadir)/build
|
|
|
|
BUILD_FILES = \
|
|
scripts/phpize.m4 \
|
|
Index: scripts/phpize.in
|
|
===================================================================
|
|
--- scripts/phpize.in.orig
|
|
+++ scripts/phpize.in
|
|
@@ -4,8 +4,8 @@
|
|
prefix='@prefix@'
|
|
datarootdir='@datarootdir@'
|
|
exec_prefix="`eval echo @exec_prefix@`"
|
|
-phpdir="`eval echo @libdir@`/build"
|
|
-includedir="`eval echo @includedir@`/php"
|
|
+phpdir="`eval echo @datadir@`/build"
|
|
+includedir="`eval echo @includedir@`/php7"
|
|
builddir="`pwd`"
|
|
SED="@SED@"
|
|
|