Hello community,
here is the log from the commit of package php5 for openSUSE:Factory checked in
at 2016-11-05 21:21:06
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/php5 (Old)
and /work/SRC/openSUSE:Factory/.php5.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "php5"
Changes:
--------
--- /work/SRC/openSUSE:Factory/php5/php5.changes 2016-10-22
13:03:38.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.php5.new/php5.changes 2016-11-05
21:21:07.000000000 +0100
@@ -1,0 +2,5 @@
+Mon Oct 24 14:59:36 UTC 2016 - pgaj...@suse.com
+
+- adjust firebird dependency
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ php5.spec ++++++
--- /var/tmp/diff_new_pack.e2cOnr/_old 2016-11-05 21:21:08.000000000 +0100
+++ /var/tmp/diff_new_pack.e2cOnr/_new 2016-11-05 21:21:08.000000000 +0100
@@ -20,11 +20,6 @@
# use build-test.sh for testing!
%bcond_with make_test
-# 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
@@ -164,11 +159,17 @@
BuildRequires: aspell-devel
%endif
+%define build_firebird 0
%if %{with firebird}
-BuildRequires: firebird-devel
-# libfbclient2-devel pkg split in 12.2
%if 0%{suse_version} > 1210
+# firebird-devel was merged into libfbclient2-devel for firebird 3
+%if 0%{suse_version} <= 1320
+BuildRequires: firebird-devel
BuildRequires: libfbclient2-devel
+%else
+BuildRequires: libfbclient-devel
+%endif
+%define build_firebird 1
%endif
%endif
@@ -233,8 +234,8 @@
%package devel
Summary: Include files of PHP5
-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
@@ -642,7 +643,7 @@
PHP functions for access to MySQL database servers.
-%if %{with firebird}
+%if %{build_firebird}
%package firebird
Summary: PHP5 Extension Module
Group: Development/Libraries/PHP
@@ -1080,7 +1081,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
@@ -1233,7 +1234,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
@@ -1267,7 +1268,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} \
@@ -1705,7 +1706,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
