From 3ea1f0548d1e966c3c7967b82f842f827d5ad7bc Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 2 Dec 2013 10:30:08 +0100 Subject: [PATCH 1/6] - Mardown PSR-0 library version 1.4.0 (sources 1.2.8) - Mardown classic library version 1.0.2 --- .gitignore | 4 +++- php-markdown.spec | 22 ++++++++++++++-------- sources | 4 ++-- 3 files changed, 19 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index 0fab192..d423ac1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,8 @@ 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 diff --git a/php-markdown.spec b/php-markdown.spec index 3f36261..cf6392b 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.2.8 # 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.0 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 @@ -67,6 +69,10 @@ rm -rf %{buildroot} %changelog +* Mon Dec 02 2013 Remi Collet - 1.4.0 +- 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 - 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..f4169c7 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 +1cd22aa1316f88dec6265af9d57ea18f php-markdown-lib-1.4.0.zip From c23b47edf4aa996607fc49f053c31b39c69246ac Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 6 May 2014 14:53:56 +0200 Subject: [PATCH 2/6] udpate to 1.4.1 --- .gitignore | 1 + php-markdown.spec | 13 +++++++++---- sources | 2 +- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index d423ac1..05afe2c 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ php-markdown-1.0.1n.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 cf6392b..00acbef 100644 --- a/php-markdown.spec +++ b/php-markdown.spec @@ -1,11 +1,11 @@ # Yes ugly: library version is not sources version # https://github.com/michelf/php-markdown/issues/137 -%global source_version 1.2.8 +%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.0 +Version: 1.4.1 Release: 1%{?dist} Summary: Markdown implementation in PHP @@ -64,16 +64,21 @@ rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc library classic +# Classic version %{_datadir}/php/markdown.php +# Library version %{_datadir}/php/Michelf %changelog -* Mon Dec 02 2013 Remi Collet - 1.4.0 +* 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 +* 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 f4169c7..a792491 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ 29b35c72e60d8ab92a5f7eedbe368cc3 php-markdown-1.0.2.zip -1cd22aa1316f88dec6265af9d57ea18f php-markdown-lib-1.4.0.zip +b208374a0682dc03781a5452d07dec58 php-markdown-lib-1.4.1.zip From 7aaf296ad84a6314ccd01d6745344f3c9593dbb1 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 2 Mar 2015 11:04:53 +0100 Subject: [PATCH 3/6] - 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 - 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 - 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 From 8116392fac778b66c8306b39ca892e8922728255 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 28 Dec 2015 07:23:08 +0100 Subject: [PATCH 4/6] v1.6.0 (cherry picked from commit add7455ebe76b9d3ee2e7ed412ad87cd99d095be) --- .gitignore | 1 + php-markdown.spec | 13 +++++++++++-- sources | 2 +- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index ca86f47..f5cd3c4 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ php-markdown-1.0.1n.zip /php-markdown-lib-1.4.0.zip /php-markdown-lib-1.4.1.zip /php-markdown-lib-1.5.0.zip +/php-markdown-lib-1.6.0.zip diff --git a/php-markdown.spec b/php-markdown.spec index 2379e2e..ab7a35b 100644 --- a/php-markdown.spec +++ b/php-markdown.spec @@ -2,7 +2,7 @@ %global classic_version 1.0.2 Name: php-markdown -Version: 1.5.0 +Version: 1.6.0 Release: 1%{?dist} Summary: Markdown implementation in PHP @@ -14,6 +14,7 @@ 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 Requires: php(language) >= 5.3 Requires: php-pcre @@ -28,6 +29,8 @@ It is almost completely compliant with the reference implementation. This packages provides the classic version %{classic_version} and the new library version %{version}. +Autoloader: %{_datadir}/php/Michelf/markdown-autoload.php + %prep %setup -q -n 'PHP Markdown Lib %{version}' -a 1 @@ -44,7 +47,9 @@ mv "PHP Markdown Readme.text" ../classic/Readme.text %build -# Empty build +# Generate simple autoloader +%{_bindir}/phpab -o Michelf/markdown-autoload.php Michelf +cat Michelf/markdown-autoload.php %install @@ -73,6 +78,10 @@ rm -rf %{buildroot} %changelog +* Sat Dec 26 2015 Remi Collet - 1.6.0-1 +- Mardown PSR-0 library version 1.6.0 +- add simple autoloader + * Mon Mar 2 2015 Remi Collet - 1.5.0-1 - Mardown PSR-0 library version 1.5.0 - fix license handling diff --git a/sources b/sources index fe85a85..3a31b7a 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ 29b35c72e60d8ab92a5f7eedbe368cc3 php-markdown-1.0.2.zip -9d64211a9af4cf3c20c3aad8fe54ddb9 php-markdown-lib-1.5.0.zip +267bbe00a5362efa7f7be925e341ad81 php-markdown-lib-1.6.0.zip From e6f592f9ce248b6cb48b86117924cd4cd5d6182b Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Sun, 30 Oct 2016 11:52:49 +0100 Subject: [PATCH 5/6] - Mardown PSR-0 library version 1.7.0 - switch to fedora/autoloader - add minimal %check for version and autoloader (cherry picked from commit a3b050dd528fa1d0d27912ebe60ed4e81d3cca07) (cherry picked from commit 02134a0115c83581b00d724c302d4ce47bb882bb) --- .gitignore | 1 + php-markdown.spec | 27 ++++++++++++++++++++++++--- sources | 2 +- 3 files changed, 26 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index f5cd3c4..277d0de 100644 --- a/.gitignore +++ b/.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 diff --git a/php-markdown.spec b/php-markdown.spec index ab7a35b..9fecd9d 100644 --- a/php-markdown.spec +++ b/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 - 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 - 1.6.0-1 - Mardown PSR-0 library version 1.6.0 - add simple autoloader diff --git a/sources b/sources index 3a31b7a..a7d1b73 100644 --- a/sources +++ b/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 From 3e8e76125e30b32854ee45399706b776ccd5c594 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 15 Jan 2018 15:08:52 +0100 Subject: [PATCH 6/6] Mardown PSR-0/PSR-4 library version 1.8.0 (cherry picked from commit 6dab9dbeb5938d6a45b2f4bc2c0ebfde997d89c1) --- .gitignore | 1 + php-markdown.spec | 20 ++++++++++++-------- sources | 4 ++-- 3 files changed, 15 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index 277d0de..cb1a652 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ php-markdown-1.0.1n.zip /php-markdown-lib-1.5.0.zip /php-markdown-lib-1.6.0.zip /php-markdown-lib-1.7.0.zip +/php-markdown-lib-1.8.0.zip diff --git a/php-markdown.spec b/php-markdown.spec index 9fecd9d..25d657c 100644 --- a/php-markdown.spec +++ b/php-markdown.spec @@ -1,8 +1,16 @@ +# Fedora spec file for php-markdown +# +# License: MIT +# http://opensource.org/licenses/MIT +# +# Please preserve changelog entries +# + # We still provide the classic library, for now %global classic_version 1.0.2 Name: php-markdown -Version: 1.7.0 +Version: 1.8.0 Release: 1%{?dist} Summary: Markdown implementation in PHP @@ -12,7 +20,6 @@ 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 -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: php-fedora-autoloader-devel # For tests @@ -59,7 +66,6 @@ cat Michelf/markdown-autoload.php %install -rm -rf %{buildroot} install -d %{buildroot}%{_datadir}/php/ # PSR-0 library @@ -78,12 +84,7 @@ require_once "%{buildroot}%{_datadir}/php/Michelf/markdown-autoload.php"; ' -%clean -rm -rf %{buildroot} - - %files -%defattr(-,root,root,-) %{!?_licensedir:%global license %%doc} %license lic/* %doc library classic @@ -94,6 +95,9 @@ rm -rf %{buildroot} %changelog +* Mon Jan 15 2018 Remi Collet - 1.8.0-1 +- Mardown PSR-0/PSR-4 library version 1.8.0 + * Sun Oct 30 2016 Remi Collet - 1.7.0-1 - Mardown PSR-0 library version 1.7.0 - switch to fedora/autoloader diff --git a/sources b/sources index a7d1b73..ebec71d 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -29b35c72e60d8ab92a5f7eedbe368cc3 php-markdown-1.0.2.zip -157820b2be3a023370a0958cc7ccbcff php-markdown-lib-1.7.0.zip +SHA512 (php-markdown-1.0.2.zip) = b876cd3196a532f28f9a942ec04bcc0766bc804f9f2918291109943847117c5532dce0f06ad9ae535efa55de57d88a8a4a9537c3bb47ef104c3901c014604dfa +SHA512 (php-markdown-lib-1.8.0.zip) = 2b38d52f10cc74abfb787c1d01237fca6c4da9e4681e9c2999d70af7100a4759d45c73a5dff4b48f5d237d3e0c9aec4f918593e7dfb4517ca73c7ec12429b523