remi pushed to php-pecl-jsonc (master). "fix license"

[notifications at fedoraproject.org]

>From bedb191deb42be1054800aa809ccfcf01b9590dc Mon Sep 17 00:00:00 2001
From: Remi Collet <remi at fedoraproject.org>
Date: Fri, 27 Mar 2015 14:23:21 +0100
Subject: fix license


diff --git a/php-pecl-jsonc.spec b/php-pecl-jsonc.spec
index e4d939d..2e03d59 100644
--- a/php-pecl-jsonc.spec
+++ b/php-pecl-jsonc.spec
@@ -27,8 +27,11 @@
 Summary:       Support for JSON serialization
 Name:          php-pecl-%{proj_name}
 Version:       1.3.7
-Release:       1%{?dist}
-License:       PHP
+Release:       2%{?dist}
+# PHP extension is PHP
+# jsonc-c is MIT
+# json-c/linkhask.c is Public Domain
+License:       PHP and MIT and Public Domain
 Group:         Development/Languages
 URL:           http://pecl.php.net/package/%{proj_name}
 Source0:       http://pecl.php.net/get/%{proj_name}-%{version}.tgz
@@ -41,6 +44,7 @@ BuildRequires: json-c-devel >= 0.11
 BuildRequires: json-c-devel <  0.12
 %else
 Provides:      bundled(libjson-c) = 0.11
+Provides:      bundled(bobjenkins-hash)
 %endif
 
 Requires:      php(zend-abi) = %{php_zend_api}
@@ -53,12 +57,6 @@ Provides:      php-pecl(%{pecl_name})%{?_isa} = %{version}
 Provides:      php-pecl(%{proj_name}) = %{version}
 Provides:      php-pecl(%{proj_name})%{?_isa} = %{version}
 
-%if 0%{?fedora} < 20
-# Filter private shared
-%{?filter_provides_in: %filter_provides_in %{_libdir}/.*\.so$}
-%{?filter_setup}
-%endif
-
 
 %description
 The %{name} module will add support for JSON (JavaScript Object Notation)
@@ -80,8 +78,13 @@ These are the files needed to compile programs using JSON serializer.
 
 %prep
 %setup -q -c 
-cd %{proj_name}-%{version}
 
+# https://github.com/remicollet/pecl-json-c/commit/09501b8c0fdb27ee5d1c225a368f7a8c3654fe0f
+sed -e '/AUTHORS/s/role="src"/role="doc"/' \
+    -e '/COPYING/s/role="src"/role="doc"/' \
+    -i package.xml
+
+cd %{proj_name}-%{version}
 # Sanity check, really often broken
 extver=$(sed -n '/#define PHP_JSON_VERSION/{s/.* "//;s/".*$//;p}' php_json.h )
 if test "x${extver}" != "x%{version}%{?prever:-%{prever}}"; then
@@ -179,6 +182,7 @@ fi
 
 
 %files
+%{?_licensedir:%license %{proj_name}-%{version}/LICENSE %{proj_name}-%{version}/json-c/COPYING}
 %doc %{pecl_docdir}/%{pecl_name}
 %config(noreplace) %{php_inidir}/%{ini_name}
 %config(noreplace) %{php_ztsinidir}/%{ini_name}
@@ -194,6 +198,11 @@ fi
 
 
 %changelog
+* Fri Mar 27 2015 Remi Collet <remi at fedoraproject.org> - 1.3.7-2
+- fix license: PHP and MIT and Public Domain
+- fix missing license files
+- fix license handling
+
 * Wed Feb 18 2015 Remi Collet <remi at fedoraproject.org> - 1.3.7-1
 - release 1.3.7 (stable)
 - drop runtime dependency on pear
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/php-pecl-jsonc.git/commit/?h=master&id=bedb191deb42be1054800aa809ccfcf01b9590dc