[php-markdown/epel7] - Mardown PSR-0 library version 1.5.0 - fix license handling - add provides php-composer(michelf/php

[Remi Collet]

commit 7aaf296ad84a6314ccd01d6745344f3c9593dbb1
Author: Remi Collet <remi at fedoraproject.org>
Date:   Mon Mar 2 11:04:53 2015 +0100

    - Mardown PSR-0 library version 1.5.0
    - fix license handling
    - add provides php-composer(michelf/php-markdown)
    - fix project URL
    
    (cherry picked from commit 24c8ef1e73ecee0a76d6b22c6a64806df0fc83a0)

 .gitignore        |  1 +
 php-markdown.spec | 30 +++++++++++++++++++-----------
 sources           |  2 +-
 3 files changed, 21 insertions(+), 12 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 05afe2c..ca86f47 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ php-markdown-1.0.1n.zip
 /php-markdown-1.0.2.zip
 /php-markdown-lib-1.4.0.zip
 /php-markdown-lib-1.4.1.zip
+/php-markdown-lib-1.5.0.zip
diff --git a/php-markdown.spec b/php-markdown.spec
index 00acbef..2379e2e 100644
--- a/php-markdown.spec
+++ b/php-markdown.spec
@@ -1,17 +1,14 @@
-# Yes ugly: library version is not sources version
-# https://github.com/michelf/php-markdown/issues/137
-%global source_version    1.4.1
 # We still provide the classic library, for now
 %global classic_version   1.0.2
 
 Name:        php-markdown
-Version:     1.4.1
+Version:     1.5.0
 Release:     1%{?dist}
 Summary:     Markdown implementation in PHP
 
 Group:       Development/Languages
 License:     BSD
-URL:         http://michelf.com/projects/php-markdown/
+URL:         https://michelf.ca/projects/php-markdown/
 Source0:     http://littoral.michelf.ca/code/php-markdown/%{name}-lib-%{version}.zip
 Source1:     http://littoral.michelf.ca/code/php-markdown/%{name}-%{classic_version}.zip
 
@@ -21,6 +18,8 @@ BuildArch:   noarch
 Requires:    php(language) >= 5.3
 Requires:    php-pcre
 
+Provides:    php-composer(michelf/php-markdown) = %{version}
+
 
 %description
 This is a PHP implementation of John Gruber's Markdown.
@@ -31,15 +30,16 @@ library version %{version}.
 
 
 %prep
-%setup -q -n 'PHP Markdown Lib %{source_version}' -a 1
+%setup -q -n 'PHP Markdown Lib %{version}' -a 1
 
-# documentation
-mkdir library
-mv License.* Readme.* composer.json library
+# documentation and licenses
+mkdir -p library lic/library
+mv Readme.* composer.json library
+mv License.* lic/library
 
-mkdir classic
+mkdir -p classic lic/classic
 cd "PHP Markdown %{classic_version}"
-mv License.text ../classic
+mv License.text ../lic/classic
 mv "PHP Markdown Readme.text" ../classic/Readme.text
 
 
@@ -63,6 +63,8 @@ rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
+%{!?_licensedir:%global license %%doc}
+%license lic/*
 %doc library classic
 # Classic version
 %{_datadir}/php/markdown.php
@@ -71,6 +73,12 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Mar  2 2015 Remi Collet <remi at fedoraproject.org> - 1.5.0-1
+- Mardown PSR-0 library version 1.5.0
+- fix license handling
+- add provides php-composer(michelf/php-markdown)
+- fix project URL
+
 * Tue May  6 2014 Remi Collet <remi at fedoraproject.org> - 1.4.1-1
 - Mardown PSR-0 library version 1.4.1
 
diff --git a/sources b/sources
index a792491..fe85a85 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 29b35c72e60d8ab92a5f7eedbe368cc3  php-markdown-1.0.2.zip
-b208374a0682dc03781a5452d07dec58  php-markdown-lib-1.4.1.zip
+9d64211a9af4cf3c20c3aad8fe54ddb9  php-markdown-lib-1.5.0.zip