- Mardown PSR-0 library version 1.7.0

- switch to fedora/autoloader
- add minimal %check for version and autoloader

(cherry picked from commit a3b050dd52)

.gitignore

@@ -9,3 +9,4 @@ php-markdown-1.0.1n.zip
 /php-markdown-lib-1.4.1.zip
 /php-markdown-lib-1.5.0.zip
 /php-markdown-lib-1.6.0.zip
+/php-markdown-lib-1.7.0.zip

php-markdown.spec

@@ -2,7 +2,7 @@
 %global classic_version   1.0.2
 
 Name:        php-markdown
-Version:     1.6.0
+Version:     1.7.0
 Release:     1%{?dist}
 Summary:     Markdown implementation in PHP
 
@@ -14,10 +14,13 @@ Source1:     http://littoral.michelf.ca/code/php-markdown/%{name}-%{classic_vers
 
 BuildRoot:   %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:   noarch
-BuildRequires: %{_bindir}/phpab
+BuildRequires: php-fedora-autoloader-devel
+# For tests
+BuildRequires: php-cli
 
 Requires:    php(language) >= 5.3
 Requires:    php-pcre
+Requires:    php-composer(fedora/autoloader)
 
 Provides:    php-composer(michelf/php-markdown) = %{version}
 
@@ -48,7 +51,10 @@ mv "PHP Markdown Readme.text" ../classic/Readme.text
 
 %build
 # Generate simple autoloader
-%{_bindir}/phpab -o Michelf/markdown-autoload.php Michelf
+%{_bindir}/phpab \
+    --template fedora \
+    --output Michelf/markdown-autoload.php \
+    Michelf
 cat Michelf/markdown-autoload.php
 
 
@@ -62,6 +68,16 @@ cp -pr Michelf %{buildroot}%{_datadir}/php/Michelf
 # Old classic
 install -p -m 644 "PHP Markdown %{classic_version}/markdown.php" %{buildroot}%{_datadir}/php/
 
+
+%check
+php -r '
+require_once "%{buildroot}%{_datadir}/php/Michelf/markdown-autoload.php";
+  $ver = Michelf\Markdown::MARKDOWNLIB_VERSION;
+  echo "Version=$ver, expected=%{version}\n";
+  return (version_compare($ver, "%{version}", "=") ? 0 : 1);
+'
+
+
 %clean
 rm -rf %{buildroot}
 
@@ -78,6 +94,11 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sun Oct 30 2016 Remi Collet <remi@fedoraproject.org> - 1.7.0-1
+- Mardown PSR-0 library version 1.7.0
+- switch to fedora/autoloader
+- add minimal %%check for version and autoloader
+
 * Sat Dec 26 2015 Remi Collet <remi@fedoraproject.org> - 1.6.0-1
 - Mardown PSR-0 library version 1.6.0
 - add simple autoloader

sources

@@ -1,2 +1,2 @@
 29b35c72e60d8ab92a5f7eedbe368cc3  php-markdown-1.0.2.zip
-267bbe00a5362efa7f7be925e341ad81  php-markdown-lib-1.6.0.zip
+157820b2be3a023370a0958cc7ccbcff  php-markdown-lib-1.7.0.zip