commit php7 for openSUSE:Factory
Hello community, here is the log from the commit of package php7 for openSUSE:Factory checked in at 2016-11-01 09:59:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/php7 (Old) and /work/SRC/openSUSE:Factory/.php7.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "php7" Changes: -------- --- /work/SRC/openSUSE:Factory/php7/php7.changes 2016-10-18 10:43:42.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.php7.new/php7.changes 2016-11-01 09:59:24.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Oct 24 15:03:41 UTC 2016 - pgajdos@suse.com + +- adjust firebird dependency + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ php7.spec ++++++ --- /var/tmp/diff_new_pack.hOHYmS/_old 2016-11-01 09:59:27.000000000 +0100 +++ /var/tmp/diff_new_pack.hOHYmS/_new 2016-11-01 09:59:27.000000000 +0100 @@ -24,11 +24,6 @@ # related conditions can be removed entirely %bcond_with suhosin -# firebird first added in 11.2 -%if 0%{suse_version} < 1120 -%define _without_firebird 1 -%endif - # systemd first added in 12.1 %if 0%{suse_version} < 1210 %define _without_systemd 1 @@ -162,11 +157,17 @@ BuildRequires: aspell-devel %endif +%define build_firebird 0 %if %{with firebird} +%if 0%{?suse_version} > 1210 +# firebird-devel was merged into libfbclient2-devel for firebird 3 +%if 0%{?suse_version} <= 1320 BuildRequires: firebird-devel -# libfbclient2-devel pkg split in 12.2 -%if 0%{suse_version} > 1210 BuildRequires: libfbclient2-devel +%else +BuildRequires: libfbclient-devel +%endif +%define build_firebird 1 %endif %endif @@ -216,8 +217,8 @@ %package devel Summary: Include files of PHP7 -Group: Development/Languages/C and C++ # this is required by the installed development headers +Group: Development/Languages/C and C++ Requires: %{name} = %{version} Requires: glibc-devel Requires: libxml2-devel @@ -630,7 +631,7 @@ PHP functions for access to MySQL database servers. -%if %{with firebird} +%if %{build_firebird} %package firebird Summary: PHP7 Extension Module Group: Development/Libraries/PHP @@ -1085,7 +1086,7 @@ # export flags CFLAGS="$RPM_OPT_FLAGS -O3 -fPIE -fPIC -DPIC -D_GNU_SOURCE -fno-strict-aliasing" CXXFLAGS="$RPM_OPT_FLAGS -O3 -fPIE -fPIC -DPIC -D_GNU_SOURCE -fno-strict-aliasing" -%if %{with firebird} +%if %{build_firebird} CFLAGS="$CFLAGS -I/usr/include/firebird" CXXFLAGS="$CXXFLAGS -I/usr/include/firebird" %endif @@ -1234,7 +1235,7 @@ --with-libedit=shared,%{_usr} \ --with-mcrypt=shared \ --with-mysql=shared,mysqlnd \ -%if %{with firebird} +%if %{build_firebird} --with-interbase=shared \ %endif %if 0%{?suse_version} > 1110 @@ -1268,7 +1269,7 @@ --with-sqlite3=shared,%{_usr} \ --enable-sqlite-utf8 \ --with-pdo-mysql=shared,mysqlnd \ -%if %{with firebird} +%if %{build_firebird} --with-pdo-firebird=shared \ %endif --with-pdo-pgsql=shared,%{_usr} \ @@ -1686,7 +1687,7 @@ %{extension_dir}/pdo_mysql.so %config(noreplace) %{php_sysconf}/conf.d/pdo_mysql.ini -%if %{with firebird} +%if %{build_firebird} %files firebird %defattr(644,root,root,755) %{extension_dir}/interbase.so
participants (1)
-
root@hilbert.suse.de