diff --git a/.gitignore b/.gitignore index 0fab192..05afe2c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,9 @@ clog -*spec~ +php-markdown.spec~ php-markdown-1.0.1n.zip /php-markdown-1.0.1p.zip /php-markdown-1.0.1q.zip /php-markdown-lib-1.3.zip +/php-markdown-1.0.2.zip +/php-markdown-lib-1.4.0.zip +/php-markdown-lib-1.4.1.zip diff --git a/php-markdown.spec b/php-markdown.spec index 3f36261..00acbef 100644 --- a/php-markdown.spec +++ b/php-markdown.spec @@ -1,17 +1,18 @@ -# Yes ugly: tarball version is not library version -%global tarball_version 1.3 +# 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.1q +%global classic_version 1.0.2 Name: php-markdown -Version: 1.2.7 +Version: 1.4.1 Release: 1%{?dist} Summary: Markdown implementation in PHP Group: Development/Languages License: BSD URL: http://michelf.com/projects/php-markdown/ -Source0: http://littoral.michelf.ca/code/php-markdown/%{name}-lib-%{tarball_version}.zip +Source0: http://littoral.michelf.ca/code/php-markdown/%{name}-lib-%{version}.zip Source1: http://littoral.michelf.ca/code/php-markdown/%{name}-%{classic_version}.zip BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -26,15 +27,16 @@ This is a PHP implementation of John Gruber's Markdown. It is almost completely compliant with the reference implementation. This packages provides the classic version %{classic_version} and the new -library version %{version} (distributed in the %{tarball_version} archive). +library version %{version}. %prep -%setup -q -n 'PHP Markdown Lib %{version}' -a 1 +%setup -q -n 'PHP Markdown Lib %{source_version}' -a 1 # documentation mkdir library -mv License.* Readme.* library +mv License.* Readme.* composer.json library + mkdir classic cd "PHP Markdown %{classic_version}" mv License.text ../classic @@ -62,12 +64,21 @@ rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc library classic +# Classic version %{_datadir}/php/markdown.php +# Library version %{_datadir}/php/Michelf %changelog -* Sat Jun 15 2013 Remi Collet - 1.2.7 +* Tue May 6 2014 Remi Collet - 1.4.1-1 +- Mardown PSR-0 library version 1.4.1 + +* Mon Dec 02 2013 Remi Collet - 1.4.0-1 +- Mardown PSR-0 library version 1.4.0 (sources 1.2.8) +- Mardown classic library version 1.0.2 + +* Sat Jun 15 2013 Remi Collet - 1.2.7-1 - Mardown PSR-0 library version 1.2.7 (added) - Mardown classic library version 1.0.1q (updated) diff --git a/sources b/sources index 9df7ada..a792491 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -4a74c6d7e8dbc1d3674a813439c088e6 php-markdown-1.0.1q.zip -09d2c2ceabd39f40680dc134dbc7fd0a php-markdown-lib-1.3.zip +29b35c72e60d8ab92a5f7eedbe368cc3 php-markdown-1.0.2.zip +b208374a0682dc03781a5452d07dec58 php-markdown-lib-1.4.1.zip