v8.0.2

1 files changed, 22 insertions, 28 deletions

diff --git a/php-pecl-mysql-xdevapi.spec b/php-pecl-mysql-xdevapi.spec
index 1b9a35b..6d49474 100644
--- a/php-pecl-mysql-xdevapi.spec
+++ b/php-pecl-mysql-xdevapi.spec
@@ -13,13 +13,14 @@
 
 %global with_zts    0%{!?_without_zts:%{?__ztsphp:1}}
 %global pecl_name   mysql_xdevapi
+# https://bugzilla.redhat.com/show_bug.cgi?id=1470164
 %global with_tests  0%{?_with_tests:1}
 # After 20-json, 20-mysqlnd
 %global ini_name    40-%{pecl_name}.ini
 
 Summary:        MySQL database access functions
 Name:           %{?sub_prefix}php-pecl-mysql-xdevapi
-Version:        1.0.1
+Version:        8.0.2
 Release:        1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
 
 License:        PHP
@@ -56,10 +57,17 @@ Provides:       %{?scl_prefix}php-pecl(%{pecl_name})%{?_isa} = %{version}
 Provides:       %{?scl_prefix}php-pecl-%{pecl_name}          = %{version}-%{release}
 Provides:       %{?scl_prefix}php-pecl-%{pecl_name}%{?_isa}  = %{version}-%{release}
 
+# Removed
+Obsoletes:      %{name}-devel < 8.0.2
+
 %if "%{?vendor}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel}
 # Other third party repo stuff
 Obsoletes:     php71u-pecl-%{pecl_name} <= %{version}
 Obsoletes:     php71w-pecl-%{pecl_name} <= %{version}
+%if "%{php_version}" > "7.2"
+Obsoletes:     php72u-pecl-%{pecl_name} <= %{version}
+Obsoletes:     php72w-pecl-%{pecl_name} <= %{version}
+%endif
 %endif
 
 %if 0%{?fedora} < 20 && 0%{?rhel} < 7
@@ -95,21 +103,14 @@ data.
 Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')%{?scl: as Software Collection (%{scl} by %{?scl_vendor}%{!?scl_vendor:rh})}.
 
 
-%package devel
-Summary:       %{name} developer files (header)
-Group:         Development/Libraries
-Requires:      %{name}%{?_isa} = %{version}-%{release}
-Requires:      %{?scl_prefix}php-devel%{?_isa}
-
-%description devel
-These are the files needed to compile programs using %{name}.
-
-
 %prep
 %setup -qc
 mv %{pecl_name}-%{version} NTS
 
-%{?_licensedir:sed -e '/LICENSE/s/role="doc"/role="src"/' -i package.xml}
+# Don't install/register tests
+sed -e 's/role="test"/role="src"/' \
+    %{?_licensedir:-e '/LICENSE/s/role="doc"/role="src"/' } \
+    -i package.xml
 
 cd NTS
 %patch0 -p1 -b .old
@@ -181,10 +182,7 @@ make -C ZTS install INSTALL_ROOT=%{buildroot}
 install -D -m 644 %{ini_name} %{buildroot}%{php_ztsinidir}/%{ini_name}
 %endif
 
-# Test & Documentation
-for i in $(grep 'role="test"' package.xml | sed -e 's/^.*name="//;s/".*$//')
-do install -Dpm 644 NTS/$i %{buildroot}%{pecl_testdir}/%{pecl_name}/$i
-done
+# Documentation
 for i in $(grep 'role="doc"' package.xml | sed -e 's/^.*name="//;s/".*$//')
 do [ -f NTS/$i ] &&  install -Dpm 644 NTS/$i %{buildroot}%{pecl_docdir}/%{pecl_name}/$i
 done
@@ -224,8 +222,9 @@ MYSQLX_PID_FILE=$PWD/mysql.pid
 
 rm -rf data
 mkdir  data
-%{_bindir}/mysql_install_db \
-   --datadir=$PWD/data
+%{_libexecdir}/mysqld \
+   --datadir=$PWD/data \
+   --initialize
 
 %{_libexecdir}/mysqld \
    --socket=$MYSQLX_TEST_SOCKET \
@@ -298,18 +297,13 @@ fi
 %endif
 
 
-%files devel
-%doc %{pecl_testdir}/%{pecl_name}
-%{php_incldir}/ext/%{pecl_name}
-
-%if %{with_zts}
-%{php_ztsincldir}/ext/%{pecl_name}
-%endif
-
-
 %changelog
+* Wed Jul 12 2017 Remi Collet <remi@remirepo.net> - 8.0.2-1
+- Update to 8.0.2 (alpha)
+- drop devel sub-package
+
 * Tue Mar 14 2017 Remi Collet <remi@remirepo.net> - 1.0.1-1
-- Update to 1.0.1
+- Update to 1.0.1 (alpha)
 
 * Thu Dec  8 2016 Remi Collet <remi@fedoraproject.org> - 1.0.0-1
 - initial package, version 1.0.0 (alpha)