v0.5.3 (backported from Fedora)

1 files changed, 22 insertions, 16 deletions

diff --git a/php-libvirt.spec b/php-libvirt.spec
index cf162d7..886ccdb 100644
--- a/php-libvirt.spec
+++ b/php-libvirt.spec
@@ -3,9 +3,6 @@
 #
 # Fedora spec file for php-libvirt
 #
-# Copyright (c) 2012-2017 Remi Collet
-# Copyright (c) 2011 Michal Novotny
-#
 # License: MIT
 # http://opensource.org/licenses/MIT
 #
@@ -28,12 +25,13 @@
 %endif
 
 Name:          %{?sub_prefix}php-libvirt
-Version:       0.5.2
-Release:       4%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
+Version:       0.5.3
+Release:       2%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
 Summary:       PHP language binding for Libvirt
 
 Group:         Development/Libraries
-License:       PHP
+# libvirt-php is under the same terms as libvirt
+License:       LGPLv2+
 URL:           http://libvirt.org/php
 Source0:       http://libvirt.org/sources/php/libvirt-php-%{version}.tar.gz
 
@@ -41,6 +39,8 @@ BuildRequires: %{?scl_prefix}php-devel
 BuildRequires: libvirt-devel >= %{req_libvirt_version}
 BuildRequires: libxml2-devel
 BuildRequires: libxslt
+# obviously NOT needed, checked by configure as used by examples :(
+BuildRequires: %{?scl_prefix}php-pecl-imagick
 BuildRequires: xhtml1-dtds
 
 Requires:      %{?scl_prefix}php(zend-abi) = %{php_zend_api}
@@ -75,6 +75,10 @@ Obsoletes:     php70w-libvirt <= %{version}
 Obsoletes:     php71u-libvirt <= %{version}
 Obsoletes:     php71w-libvirt <= %{version}
 %endif
+%if "%{php_version}" > "7.2"
+Obsoletes:     php72u-libvirt <= %{version}
+Obsoletes:     php72w-libvirt <= %{version}
+%endif
 %endif
 
 # Filter shared private - always as libvirt-php.so is a very bad name
@@ -92,12 +96,8 @@ Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSIO
 %package doc
 Summary:       Document of php-libvirt
 Group:         Development/Libraries
-%if 0%{?fedora} >= 11 || 0%{?rhel} >= 6
 BuildArch:     noarch
 Requires:      %{name} = %{version}-%{release}
-%else
-Requires:      %{name}%{_isa} = %{version}-%{release}
-%endif
 %if "%{?scl_prefix}" != "%{?sub_prefix}"
 Provides:      %{?scl_prefix}php-libvirt-doc         = %{version}-%{release}
 Provides:      %{?scl_prefix}php-libvirt-doc%{?_isa} = %{version}-%{release}
@@ -115,7 +115,9 @@ This package contain the document for php-libvirt.
 
 
 %build
+%{?dtsenable}
 %{?scl:. %{_scl_scripts}/enable}
+
 %configure \
   --with-html-dir=%{_docdir} \
   --with-html-subdir=$(echo %{_pkgdocdir} | sed -e 's|^%{_docdir}/||')/html \
@@ -124,7 +126,9 @@ make %{?_smp_mflags}
 
 
 %install
+%{?dtsenable}
 %{?scl:. %{_scl_scripts}/enable}
+
 make install DESTDIR=%{buildroot}
 install -pm 644 COPYING %{buildroot}%{_pkgdocdir}
 
@@ -137,17 +141,13 @@ else
   install -Dpm 644 src/libvirt-php.ini %{buildroot}%{php_inidir}/%{ini_name}
 fi
 
-: Fix installation
+# Erase unnecessary libtool archive file
 rm %{buildroot}%{php_extdir}/%{extname}.la
-rm %{buildroot}%{php_extdir}/%{extname}.so
-rm %{buildroot}%{php_extdir}/%{extname}.so.0
-mv %{buildroot}%{php_extdir}/%{extname}.so.0.0.0 %{buildroot}%{php_extdir}/%{extname}.so
 
 
 %check
 : simple module load test
-%{?scl:. %{_scl_scripts}/enable}
-php --no-php-ini \
+%{__php} --no-php-ini \
     --define extension=%{buildroot}%{php_extdir}/%{extname}.so \
     --modules | grep libvirt
 
@@ -164,6 +164,12 @@ php --no-php-ini \
 
 
 %changelog
+* Thu May 11 2017 Neal Gompa <ngompa13@gmail.com> - 0.5.3-2
+- Fix license tag to match actual source license
+
+* Thu May 11 2017 Neal Gompa <ngompa13@gmail.com> - 0.5.3-1
+- Upgrade to 0.5.3
+
 * Thu Dec  1 2016 Remi Collet <remi@fedoraproject.org> - 0.5.2-4
 - rebuild with PHP 7.1.0 GA