From a21b48822b7cda2675ecdd0a76340b3aecb26dc0 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Thu, 28 Apr 2016 13:18:53 +0200
Subject: [PATCH] - rebuild for new rrdtool - fix license management - don't
 provide the test suite

---
 php-pecl-rrd.spec | 26 +++++++++++++++++---------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/php-pecl-rrd.spec b/php-pecl-rrd.spec
index 1eca73e..b227a3f 100644
--- a/php-pecl-rrd.spec
+++ b/php-pecl-rrd.spec
@@ -13,7 +13,7 @@
 Summary:      PHP Bindings for rrdtool
 Name:         php-pecl-rrd
 Version:      1.1.3
-Release:      9%{?dist}
+Release:      10%{?dist}
 License:      BSD
 Group:        Development/Languages
 URL:          http://pecl.php.net/package/rrd
@@ -29,10 +29,10 @@ Requires:     php(zend-abi) = %{php_zend_api}
 Requires:     php(api) = %{php_core_api}
 
 Conflicts:    rrdtool-php
-Provides:     php-pecl(%{pecl_name}) = %{version}
+Provides:     php-pecl(%{pecl_name})         = %{version}
 Provides:     php-pecl(%{pecl_name})%{?_isa} = %{version}
-Provides:     php-%{pecl_name} = %{version}%{?pre}
-Provides:     php-%{pecl_name}%{?_isa} = %{version}%{?pre}
+Provides:     php-%{pecl_name}               = %{version}%{?pre}
+Provides:     php-%{pecl_name}%{?_isa}       = %{version}%{?pre}
 
 
 %description
@@ -45,6 +45,11 @@ system for time series data.
 
 mv %{pecl_name}-%{version} NTS
 
+# Don't install/register tests
+sed -e 's/role="test"/role="src"/' \
+    -e '/LICENSE/s/role="doc"/role="src"/' \
+    -i package.xml
+
 cat > %{ini_name} << 'EOF'
 ; Enable %{pecl_name} extension module
 extension=%{pecl_name}.so
@@ -84,9 +89,6 @@ 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
 for i in $(grep 'role="doc"' package.xml | sed -e 's/^.*name="//;s/".*$//')
 do install -Dpm 644 NTS/$i %{buildroot}%{pecl_docdir}/%{pecl_name}/$i
 done
@@ -129,11 +131,12 @@ REPORT_EXIT_STATUS=1 \
 
 
 %files
+%license NTS/LICENSE
 %doc %{pecl_docdir}/%{pecl_name}
-%doc %{pecl_testdir}/%{pecl_name}
+%{pecl_xmldir}/%{name}.xml
+
 %config(noreplace) %{php_inidir}/%{ini_name}
 %{php_extdir}/%{pecl_name}.so
-%{pecl_xmldir}/%{name}.xml
 
 %if %{with_zts}
 %config(noreplace) %{php_ztsinidir}/%{ini_name}
@@ -142,6 +145,11 @@ REPORT_EXIT_STATUS=1 \
 
 
 %changelog
+* Thu Apr 28 2016 Remi Collet <remi@fedoraproject.org> - 1.1.3-10
+- rebuild for new rrdtool
+- fix license management
+- don't provide the test suite
+
 * Sat Feb 13 2016 Remi Collet <remi@fedoraproject.org> - 1.1.3-9
 - drop scriptlets (replaced by file triggers in php-pear)
 - cleanup