From a0e4880e45c694e1fcb2f3f48376b8b7b25b999f Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 3 Aug 2013 21:53:40 -0500 Subject: [PATCH 01/38] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- php-markdown.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-markdown.spec b/php-markdown.spec index 3f36261..4075fec 100644 --- a/php-markdown.spec +++ b/php-markdown.spec @@ -5,7 +5,7 @@ Name: php-markdown Version: 1.2.7 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Markdown implementation in PHP Group: Development/Languages @@ -67,6 +67,9 @@ rm -rf %{buildroot} %changelog +* Sun Aug 04 2013 Fedora Release Engineering - 1.2.7-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * 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) From 0db3a38f09d63ecfc9b7f09283b328dd31539802 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 2 Dec 2013 09:47:17 +0100 Subject: [PATCH 02/38] - Mardown PSR-0 library version 1.4.0 (sources 1.2.8) - Mardown classic library version 1.0.2 --- .gitignore | 4 +++- php-markdown.spec | 24 +++++++++++++++--------- sources | 4 ++-- 3 files changed, 20 insertions(+), 12 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 4075fec..0183a82 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 -Release: 2%{?dist} +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 + * Sun Aug 04 2013 Fedora Release Engineering - 1.2.7-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild 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 640e2f93df6a2cc21868fb1d38e6814597c0a979 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 6 May 2014 15:01:05 +0200 Subject: [PATCH 03/38] 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 0183a82..599880e 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,19 +64,24 @@ 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 * Sun Aug 04 2013 Fedora Release Engineering - 1.2.7-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild -* 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 ff558c47a3233d385fb56d064948a5aea569ded2 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 7 Jun 2014 09:24:20 -0500 Subject: [PATCH 04/38] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- php-markdown.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-markdown.spec b/php-markdown.spec index 599880e..856e41e 100644 --- a/php-markdown.spec +++ b/php-markdown.spec @@ -6,7 +6,7 @@ Name: php-markdown Version: 1.4.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Markdown implementation in PHP Group: Development/Languages @@ -71,6 +71,9 @@ rm -rf %{buildroot} %changelog +* Sat Jun 07 2014 Fedora Release Engineering - 1.4.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Tue May 6 2014 Remi Collet - 1.4.1-1 - Mardown PSR-0 library version 1.4.1 From 0bfc09ad189aa7c9e5112c764d958965e2818f5e Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 2 Mar 2015 10:52:00 +0100 Subject: [PATCH 05/38] - Mardown PSR-0 library version 1.5.0 - fix license handling - add provides php-composer(michelf/php-markdown) - fix project URL --- .gitignore | 1 + php-markdown.spec | 32 ++++++++++++++++++++------------ sources | 2 +- 3 files changed, 22 insertions(+), 13 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 856e41e..a2bdaad 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 -Release: 2%{?dist} +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 + * Sat Jun 07 2014 Fedora Release Engineering - 1.4.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild 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 c815ae9e0113f754287f4375a5aa3b6337edd154 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 18 Jun 2015 14:30:03 +0000 Subject: [PATCH 06/38] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- php-markdown.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-markdown.spec b/php-markdown.spec index a2bdaad..38a0575 100644 --- a/php-markdown.spec +++ b/php-markdown.spec @@ -3,7 +3,7 @@ Name: php-markdown Version: 1.5.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Markdown implementation in PHP Group: Development/Languages @@ -73,6 +73,9 @@ rm -rf %{buildroot} %changelog +* Thu Jun 18 2015 Fedora Release Engineering - 1.5.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Mon Mar 2 2015 Remi Collet - 1.5.0-1 - Mardown PSR-0 library version 1.5.0 - fix license handling From c0d6f8c13907979919e4338c6d572ca377c0dbdf Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 28 Dec 2015 07:15:44 +0100 Subject: [PATCH 07/38] v1.6.0 --- .gitignore | 1 + php-markdown.spec | 15 ++++++++++++--- sources | 2 +- 3 files changed, 14 insertions(+), 4 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 38a0575..6925e23 100644 --- a/php-markdown.spec +++ b/php-markdown.spec @@ -2,8 +2,8 @@ %global classic_version 1.0.2 Name: php-markdown -Version: 1.5.0 -Release: 2%{?dist} +Version: 1.6.0 +Release: 1%{?dist} Summary: Markdown implementation in PHP Group: Development/Languages @@ -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 + * Thu Jun 18 2015 Fedora Release Engineering - 1.5.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild 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 502ff2742ebba6cbed0afa58cebb93fa474d4aa0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 4 Feb 2016 17:21:02 +0000 Subject: [PATCH 08/38] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- php-markdown.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-markdown.spec b/php-markdown.spec index 6925e23..e860da3 100644 --- a/php-markdown.spec +++ b/php-markdown.spec @@ -3,7 +3,7 @@ Name: php-markdown Version: 1.6.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Markdown implementation in PHP Group: Development/Languages @@ -78,6 +78,9 @@ rm -rf %{buildroot} %changelog +* Thu Feb 04 2016 Fedora Release Engineering - 1.6.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Sat Dec 26 2015 Remi Collet - 1.6.0-1 - Mardown PSR-0 library version 1.6.0 - add simple autoloader From a3b050dd528fa1d0d27912ebe60ed4e81d3cca07 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Sun, 30 Oct 2016 11:52:49 +0100 Subject: [PATCH 09/38] - Mardown PSR-0 library version 1.7.0 - switch to fedora/autoloader - add minimal %check for version and autoloader --- .gitignore | 1 + php-markdown.spec | 29 +++++++++++++++++++++++++---- sources | 2 +- 3 files changed, 27 insertions(+), 5 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 e860da3..1f6029c 100644 --- a/php-markdown.spec +++ b/php-markdown.spec @@ -2,8 +2,8 @@ %global classic_version 1.0.2 Name: php-markdown -Version: 1.6.0 -Release: 2%{?dist} +Version: 1.7.0 +Release: 1%{?dist} Summary: Markdown implementation in PHP Group: Development/Languages @@ -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 + * Thu Feb 04 2016 Fedora Release Engineering - 1.6.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild 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 8cdcf4aac4d2ce157e9ab6ef53c31b98f59e0fd9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 11 Feb 2017 06:47:10 +0000 Subject: [PATCH 10/38] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- php-markdown.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-markdown.spec b/php-markdown.spec index 1f6029c..077bc63 100644 --- a/php-markdown.spec +++ b/php-markdown.spec @@ -3,7 +3,7 @@ Name: php-markdown Version: 1.7.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Markdown implementation in PHP Group: Development/Languages @@ -94,6 +94,9 @@ rm -rf %{buildroot} %changelog +* Sat Feb 11 2017 Fedora Release Engineering - 1.7.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Sun Oct 30 2016 Remi Collet - 1.7.0-1 - Mardown PSR-0 library version 1.7.0 - switch to fedora/autoloader From 4b8487097d91c1fb30a09a1641a67a26152270f9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 27 Jul 2017 07:50:47 +0000 Subject: [PATCH 11/38] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- php-markdown.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-markdown.spec b/php-markdown.spec index 077bc63..7e8bd52 100644 --- a/php-markdown.spec +++ b/php-markdown.spec @@ -3,7 +3,7 @@ Name: php-markdown Version: 1.7.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Markdown implementation in PHP Group: Development/Languages @@ -94,6 +94,9 @@ rm -rf %{buildroot} %changelog +* Thu Jul 27 2017 Fedora Release Engineering - 1.7.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Sat Feb 11 2017 Fedora Release Engineering - 1.7.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From 6dab9dbeb5938d6a45b2f4bc2c0ebfde997d89c1 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 15 Jan 2018 15:08:52 +0100 Subject: [PATCH 12/38] Mardown PSR-0/PSR-4 library version 1.8.0 --- .gitignore | 1 + php-markdown.spec | 22 +++++++++++++--------- sources | 4 ++-- 3 files changed, 16 insertions(+), 11 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 7e8bd52..0ea6f7c 100644 --- a/php-markdown.spec +++ b/php-markdown.spec @@ -1,9 +1,17 @@ +# 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 -Release: 3%{?dist} +Version: 1.8.0 +Release: 1%{?dist} Summary: Markdown implementation in PHP Group: Development/Languages @@ -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 + * Thu Jul 27 2017 Fedora Release Engineering - 1.7.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild 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 From 3d3f52e9c34e487c45cb7800e50270bd03780515 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 9 Feb 2018 03:49:12 +0000 Subject: [PATCH 13/38] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- php-markdown.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-markdown.spec b/php-markdown.spec index 0ea6f7c..b0c197c 100644 --- a/php-markdown.spec +++ b/php-markdown.spec @@ -11,7 +11,7 @@ Name: php-markdown Version: 1.8.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Markdown implementation in PHP Group: Development/Languages @@ -95,6 +95,9 @@ require_once "%{buildroot}%{_datadir}/php/Michelf/markdown-autoload.php"; %changelog +* Fri Feb 09 2018 Fedora Release Engineering - 1.8.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Mon Jan 15 2018 Remi Collet - 1.8.0-1 - Mardown PSR-0/PSR-4 library version 1.8.0 From 906852144432b30ef33f8c39dca01f4837bc9959 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 13 Jul 2018 21:38:34 +0000 Subject: [PATCH 14/38] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- php-markdown.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-markdown.spec b/php-markdown.spec index b0c197c..3286b31 100644 --- a/php-markdown.spec +++ b/php-markdown.spec @@ -11,7 +11,7 @@ Name: php-markdown Version: 1.8.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Markdown implementation in PHP Group: Development/Languages @@ -95,6 +95,9 @@ require_once "%{buildroot}%{_datadir}/php/Michelf/markdown-autoload.php"; %changelog +* Fri Jul 13 2018 Fedora Release Engineering - 1.8.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Fri Feb 09 2018 Fedora Release Engineering - 1.8.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From b003df23eddee15f57e941265ac525f3ac6dcbac Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 28 Jan 2019 20:18:11 +0100 Subject: [PATCH 15/38] Remove obsolete Group tag References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag --- php-markdown.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/php-markdown.spec b/php-markdown.spec index 3286b31..9ea5568 100644 --- a/php-markdown.spec +++ b/php-markdown.spec @@ -14,7 +14,6 @@ Version: 1.8.0 Release: 3%{?dist} Summary: Markdown implementation in PHP -Group: Development/Languages License: BSD URL: https://michelf.ca/projects/php-markdown/ Source0: http://littoral.michelf.ca/code/php-markdown/%{name}-lib-%{version}.zip From 05781217a41a2c539c9ce48f9a27c29981c5d29c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 2 Feb 2019 02:58:45 +0000 Subject: [PATCH 16/38] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- php-markdown.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-markdown.spec b/php-markdown.spec index 9ea5568..5f0d6c1 100644 --- a/php-markdown.spec +++ b/php-markdown.spec @@ -11,7 +11,7 @@ Name: php-markdown Version: 1.8.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Markdown implementation in PHP License: BSD @@ -94,6 +94,9 @@ require_once "%{buildroot}%{_datadir}/php/Michelf/markdown-autoload.php"; %changelog +* Sat Feb 02 2019 Fedora Release Engineering - 1.8.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Fri Jul 13 2018 Fedora Release Engineering - 1.8.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 12cc077d917bfbf24f05e8679962195b26775d00 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 26 Jul 2019 09:25:59 +0000 Subject: [PATCH 17/38] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- php-markdown.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-markdown.spec b/php-markdown.spec index 5f0d6c1..981dc18 100644 --- a/php-markdown.spec +++ b/php-markdown.spec @@ -11,7 +11,7 @@ Name: php-markdown Version: 1.8.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Markdown implementation in PHP License: BSD @@ -94,6 +94,9 @@ require_once "%{buildroot}%{_datadir}/php/Michelf/markdown-autoload.php"; %changelog +* Fri Jul 26 2019 Fedora Release Engineering - 1.8.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Sat Feb 02 2019 Fedora Release Engineering - 1.8.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From b50ae606841f21f39030aa5ee6cd1483fd26ffd6 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 26 Jul 2019 15:21:56 +0200 Subject: [PATCH 18/38] drop old classic version use git snapshot as next version will have test suite add patch for PHP 7.4, adapted for 1.8.0 from https://github.com/michelf/php-markdown/pull/316 --- .gitignore | 1 + composer.json | 26 ++++++++ makesrc.sh | 28 ++++++++ php-markdown-php74.patch | 137 +++++++++++++++++++++++++++++++++++++++ php-markdown.spec | 46 +++++++------ sources | 3 +- 6 files changed, 215 insertions(+), 26 deletions(-) create mode 100644 composer.json create mode 100755 makesrc.sh create mode 100644 php-markdown-php74.patch diff --git a/.gitignore b/.gitignore index cb1a652..6448a84 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ php-markdown-1.0.1n.zip /php-markdown-lib-1.6.0.zip /php-markdown-lib-1.7.0.zip /php-markdown-lib-1.8.0.zip +/php-markdown-1.8.0-01ab082.tgz diff --git a/composer.json b/composer.json new file mode 100644 index 0000000..6b1993d --- /dev/null +++ b/composer.json @@ -0,0 +1,26 @@ +{ + "name": "michelf/php-markdown", + "type": "library", + "description": "PHP Markdown", + "homepage": "https://michelf.ca/projects/php-markdown/", + "keywords": ["markdown"], + "license": "BSD-3-Clause", + "authors": [ + { + "name": "Michel Fortin", + "email": "michel.fortin@michelf.ca", + "homepage": "https://michelf.ca/", + "role": "Developer" + }, + { + "name": "John Gruber", + "homepage": "https://daringfireball.net/" + } + ], + "require": { + "php": ">=5.3.0" + }, + "autoload": { + "psr-4": { "Michelf\\": "Michelf/" } + } +} diff --git a/makesrc.sh b/makesrc.sh new file mode 100755 index 0000000..87d223d --- /dev/null +++ b/makesrc.sh @@ -0,0 +1,28 @@ +#!/bin/bash + +NAME=$(basename $PWD) +OWNER=$(sed -n '/^%global gh_owner/{s/.* //;p}' $NAME.spec) +PROJECT=$(sed -n '/^%global gh_project/{s/.* //;p}' $NAME.spec) +VERSION=$(sed -n '/^Version:/{s/.* //;p}' $NAME.spec) +COMMIT=$(sed -n '/^%global gh_commit/{s/.* //;p}' $NAME.spec) +SHORT=${COMMIT:0:7} + +echo -e "\nCreate git snapshot\nName=$NAME, Owner=$OWNER, Project=$PROJECT, Version=$VERSION\n" + +echo "Cloning..." +rm -rf $PROJECT-$COMMIT +git clone https://github.com/$OWNER/$PROJECT.git $PROJECT-$COMMIT + +echo "Getting commit..." +pushd $PROJECT-$COMMIT +git checkout $COMMIT +cp composer.json ../composer.json +popd + +echo "Archiving..." +tar czf $NAME-$VERSION-$SHORT.tgz --exclude .git $PROJECT-$COMMIT + +echo "Cleaning..." +rm -rf $PROJECT-$COMMIT + +echo "Done." diff --git a/php-markdown-php74.patch b/php-markdown-php74.patch new file mode 100644 index 0000000..fb6d782 --- /dev/null +++ b/php-markdown-php74.patch @@ -0,0 +1,137 @@ +diff -up Michelf/MarkdownExtra.php.php74 Michelf/MarkdownExtra.php +--- Michelf/MarkdownExtra.php.php74 2019-07-26 15:03:52.000000000 +0200 ++++ Michelf/MarkdownExtra.php 2019-07-26 15:07:25.255088870 +0200 +@@ -212,9 +212,9 @@ class MarkdownExtra extends \Michelf\Mar + $attributes = array(); + $id = false; + foreach ($elements as $element) { +- if ($element{0} == '.') { ++ if ($element[0] == '.') { + $classes[] = substr($element, 1); +- } else if ($element{0} == '#') { ++ } else if ($element[0] == '#') { + if ($id === false) $id = substr($element, 1); + } else if (strpos($element, '=') > 0) { + $parts = explode('=', $element, 2); +@@ -508,14 +508,14 @@ class MarkdownExtra extends \Michelf\Mar + } + } + // Check for: Indented code block. +- else if ($tag{0} == "\n" || $tag{0} == " ") { ++ else if ($tag[0] == "\n" || $tag[0] == " ") { + // Indented code block: pass it unchanged, will be handled + // later. + $parsed .= $tag; + } + // Check for: Code span marker + // Note: need to check this after backtick fenced code blocks +- else if ($tag{0} == "`") { ++ else if ($tag[0] == "`") { + // Find corresponding end marker. + $tag_re = preg_quote($tag); + if (preg_match('{^(?>.+?|\n(?!\n))*?(?clean_tags_re . ')\b}', $tag) || +- $tag{1} == '!' || $tag{1} == '?') ++ $tag[1] == '!' || $tag[1] == '?') + { + // Need to parse tag and following text using the HTML parser. + // (don't check for markdown attribute) +@@ -564,7 +564,7 @@ class MarkdownExtra extends \Michelf\Mar + preg_match('{^) + // Comments and Processing Instructions. + if (preg_match('{^auto_close_tags_re . ')\b}', $tag) || +- $tag{1} == '!' || $tag{1} == '?') ++ $tag[1] == '!' || $tag[1] == '?') + { + // Just add the tag to the block as if it was text. + $block_text .= $tag; +@@ -683,7 +683,7 @@ class MarkdownExtra extends \Michelf\Mar + // Increase/decrease nested tag count. Only do so if + // the tag's name match base tag's. + if (preg_match('{^header_id_func) ? call_user_func($this->header_id_func, $matches[1]) : null; + +@@ -1466,7 +1466,7 @@ class MarkdownExtra extends \Michelf\Mar + + $classes = array(); + if ($classname != "") { +- if ($classname{0} == '.') ++ if ($classname[0] == '.') + $classname = substr($classname, 1); + $classes[] = $this->code_class_prefix . $classname; + } +diff -up Michelf/Markdown.php.php74 Michelf/Markdown.php +--- Michelf/Markdown.php.php74 2019-07-26 15:03:52.000000000 +0200 ++++ Michelf/Markdown.php 2019-07-26 15:06:27.924736197 +0200 +@@ -952,7 +952,7 @@ class Markdown implements MarkdownInterf + return $matches[0]; + } + +- $level = $matches[2]{0} == '=' ? 1 : 2; ++ $level = $matches[2][0] == '=' ? 1 : 2; + + // ID attribute generation + $idAtt = $this->_generateIdFromHeaderValue($matches[1]); +@@ -1358,7 +1358,7 @@ class Markdown implements MarkdownInterf + } else { + // Other closing marker: close one em or strong and + // change current token state to match the other +- $token_stack[0] = str_repeat($token{0}, 3-$token_len); ++ $token_stack[0] = str_repeat($token[0], 3-$token_len); + $tag = $token_len == 2 ? "strong" : "em"; + $span = $text_stack[0]; + $span = $this->runSpanGamut($span); +@@ -1383,7 +1383,7 @@ class Markdown implements MarkdownInterf + } else { + // Reached opening three-char emphasis marker. Push on token + // stack; will be handled by the special condition above. +- $em = $token{0}; ++ $em = $token[0]; + $strong = "$em$em"; + array_unshift($token_stack, $token); + array_unshift($text_stack, ''); +@@ -1796,9 +1796,9 @@ class Markdown implements MarkdownInterf + * @return string + */ + protected function handleSpanToken($token, &$str) { +- switch ($token{0}) { ++ switch ($token[0]) { + case "\\": +- return $this->hashPart("&#". ord($token{1}). ";"); ++ return $this->hashPart("&#". ord($token[1]). ";"); + case "`": + // Search for end marker in remaining text. + if (preg_match('/^(.*?[^`])'.preg_quote($token).'(?!`)(.*)$/sm', diff --git a/php-markdown.spec b/php-markdown.spec index 981dc18..74e492e 100644 --- a/php-markdown.spec +++ b/php-markdown.spec @@ -5,19 +5,22 @@ # # Please preserve changelog entries # - -# We still provide the classic library, for now -%global classic_version 1.0.2 +%global gh_commit 01ab082b355bf188d907b9929cd99b2923053495 +%global gh_short %(c=%{gh_commit}; echo ${c:0:7}) +%global gh_owner michelf +%global gh_project php-markdown Name: php-markdown Version: 1.8.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Markdown implementation in PHP License: BSD 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 +Source0: %{name}-%{version}-%{gh_short}.tgz +Source1: makesrc.sh + +Patch0: php-markdown-php74.patch BuildArch: noarch BuildRequires: php-fedora-autoloader-devel @@ -42,21 +45,14 @@ Autoloader: %{_datadir}/php/Michelf/markdown-autoload.php %prep -%setup -q -n 'PHP Markdown Lib %{version}' -a 1 +%setup -q -n %{gh_project}-%{gh_commit} +%patch0 -p0 -# documentation and licenses -mkdir -p library lic/library -mv Readme.* composer.json library -mv License.* lic/library - -mkdir -p classic lic/classic -cd "PHP Markdown %{classic_version}" -mv License.text ../lic/classic -mv "PHP Markdown Readme.text" ../classic/Readme.text +mv License.md LICENSE %build -# Generate simple autoloader +: Generate simple autoloader %{_bindir}/phpab \ --template fedora \ --output Michelf/markdown-autoload.php \ @@ -70,9 +66,6 @@ install -d %{buildroot}%{_datadir}/php/ # PSR-0 library 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 ' @@ -85,15 +78,20 @@ require_once "%{buildroot}%{_datadir}/php/Michelf/markdown-autoload.php"; %files %{!?_licensedir:%global license %%doc} -%license lic/* -%doc library classic -# Classic version -%{_datadir}/php/markdown.php +%license LICENSE +%doc composer.json +%doc *.md # Library version %{_datadir}/php/Michelf %changelog +* Fri Jul 26 2019 Remi Collet - 1.8.0-6 +- drop old classic version +- use git snapshot as next version will have test suite +- add patch for PHP 7.4, adapted for 1.8.0 from + https://github.com/michelf/php-markdown/pull/316 + * Fri Jul 26 2019 Fedora Release Engineering - 1.8.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/sources b/sources index ebec71d..9a22b1b 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -SHA512 (php-markdown-1.0.2.zip) = b876cd3196a532f28f9a942ec04bcc0766bc804f9f2918291109943847117c5532dce0f06ad9ae535efa55de57d88a8a4a9537c3bb47ef104c3901c014604dfa -SHA512 (php-markdown-lib-1.8.0.zip) = 2b38d52f10cc74abfb787c1d01237fca6c4da9e4681e9c2999d70af7100a4759d45c73a5dff4b48f5d237d3e0c9aec4f918593e7dfb4517ca73c7ec12429b523 +SHA512 (php-markdown-1.8.0-01ab082.tgz) = dd2fca98761db35e6fe13be681199056d1173095f87a6cfb2eb62626b246a6dc3c41252ec47ca1bf5be11957d5dfa41dfd288ab181e2075db47c0acc9ab855e1 From b999cd58dd09d6b655c0738ded37b32b42c1fe59 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 2 Dec 2019 12:14:28 +0100 Subject: [PATCH 19/38] update to 1.9.0 run upstream test suite --- .gitignore | 1 + composer.json | 3 +++ php-markdown.spec | 33 +++++++++++++++++++++++++-------- sources | 2 +- 4 files changed, 30 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 6448a84..3159a83 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ php-markdown-1.0.1n.zip /php-markdown-lib-1.7.0.zip /php-markdown-lib-1.8.0.zip /php-markdown-1.8.0-01ab082.tgz +/php-markdown-1.9.0-c83178d.tgz diff --git a/composer.json b/composer.json index 6b1993d..0935075 100644 --- a/composer.json +++ b/composer.json @@ -22,5 +22,8 @@ }, "autoload": { "psr-4": { "Michelf\\": "Michelf/" } + }, + "require-dev": { + "phpunit/phpunit": ">=4.3 <5.8" } } diff --git a/php-markdown.spec b/php-markdown.spec index 74e492e..5358e53 100644 --- a/php-markdown.spec +++ b/php-markdown.spec @@ -5,14 +5,14 @@ # # Please preserve changelog entries # -%global gh_commit 01ab082b355bf188d907b9929cd99b2923053495 +%global gh_commit c83178d49e372ca967d1a8c77ae4e051b3a3c75c %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner michelf %global gh_project php-markdown Name: php-markdown -Version: 1.8.0 -Release: 6%{?dist} +Version: 1.9.0 +Release: 1%{?dist} Summary: Markdown implementation in PHP License: BSD @@ -20,12 +20,12 @@ URL: https://michelf.ca/projects/php-markdown/ Source0: %{name}-%{version}-%{gh_short}.tgz Source1: makesrc.sh -Patch0: php-markdown-php74.patch - BuildArch: noarch BuildRequires: php-fedora-autoloader-devel # For tests -BuildRequires: php-cli +# "require-dev": { +# "phpunit/phpunit": ">=4.3 <5.8" +BuildRequires: phpunit Requires: php(language) >= 5.3 Requires: php-pcre @@ -46,8 +46,6 @@ Autoloader: %{_datadir}/php/Michelf/markdown-autoload.php %prep %setup -q -n %{gh_project}-%{gh_commit} -%patch0 -p0 - mv License.md LICENSE @@ -74,6 +72,21 @@ require_once "%{buildroot}%{_datadir}/php/Michelf/markdown-autoload.php"; echo "Version=$ver, expected=%{version}\n"; return (version_compare($ver, "%{version}", "=") ? 0 : 1); ' +cat << 'EOF' | tee bs.php + - 1.9.0-1 +- update to 1.9.0 +- run upstream test suite + * Fri Jul 26 2019 Remi Collet - 1.8.0-6 - drop old classic version - use git snapshot as next version will have test suite diff --git a/sources b/sources index 9a22b1b..90c8999 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-markdown-1.8.0-01ab082.tgz) = dd2fca98761db35e6fe13be681199056d1173095f87a6cfb2eb62626b246a6dc3c41252ec47ca1bf5be11957d5dfa41dfd288ab181e2075db47c0acc9ab855e1 +SHA512 (php-markdown-1.9.0-c83178d.tgz) = 3f4564ed999f16e822ec409fed66114b54b17aa2676bc53a04d35e5e721908c5980dd7a5f7b10cfdc1f08fa44dbf3fedf537c5d5705e74b71d0f56372ab80790 From ce434581b62515c540a803057e73f16f30a5eaa6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 30 Jan 2020 07:51:51 +0000 Subject: [PATCH 20/38] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- php-markdown.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-markdown.spec b/php-markdown.spec index 5358e53..11dc61b 100644 --- a/php-markdown.spec +++ b/php-markdown.spec @@ -12,7 +12,7 @@ Name: php-markdown Version: 1.9.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Markdown implementation in PHP License: BSD @@ -99,6 +99,9 @@ exit $ret %changelog +* Thu Jan 30 2020 Fedora Release Engineering - 1.9.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Mon Dec 2 2019 Remi Collet - 1.9.0-1 - update to 1.9.0 - run upstream test suite From 608be2697e450511bad0c28b7d73b764d11cbc30 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jul 2020 21:30:57 +0000 Subject: [PATCH 21/38] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- php-markdown.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-markdown.spec b/php-markdown.spec index 11dc61b..6d12950 100644 --- a/php-markdown.spec +++ b/php-markdown.spec @@ -12,7 +12,7 @@ Name: php-markdown Version: 1.9.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Markdown implementation in PHP License: BSD @@ -99,6 +99,9 @@ exit $ret %changelog +* Tue Jul 28 2020 Fedora Release Engineering - 1.9.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Thu Jan 30 2020 Fedora Release Engineering - 1.9.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From b205009dd6079be2615fb9a778c79ac54f898d71 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 07:09:20 +0000 Subject: [PATCH 22/38] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- php-markdown.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-markdown.spec b/php-markdown.spec index 6d12950..5cb5f81 100644 --- a/php-markdown.spec +++ b/php-markdown.spec @@ -12,7 +12,7 @@ Name: php-markdown Version: 1.9.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Markdown implementation in PHP License: BSD @@ -99,6 +99,9 @@ exit $ret %changelog +* Wed Jan 27 2021 Fedora Release Engineering - 1.9.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Tue Jul 28 2020 Fedora Release Engineering - 1.9.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From a96f94bb0945d8c25ad912f2a0c821c1a7f68ece Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 02:29:33 +0000 Subject: [PATCH 23/38] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- php-markdown.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-markdown.spec b/php-markdown.spec index 5cb5f81..2b016ca 100644 --- a/php-markdown.spec +++ b/php-markdown.spec @@ -12,7 +12,7 @@ Name: php-markdown Version: 1.9.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Markdown implementation in PHP License: BSD @@ -99,6 +99,9 @@ exit $ret %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 1.9.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Wed Jan 27 2021 Fedora Release Engineering - 1.9.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 138a26f2855d93134b61c07c76067ca9d80e9657 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 24 Nov 2021 09:31:21 +0100 Subject: [PATCH 24/38] v1.9.1 --- .gitignore | 1 + php-markdown-php74.patch | 137 --------------------------------------- php-markdown.spec | 11 ++-- sources | 2 +- 4 files changed, 9 insertions(+), 142 deletions(-) delete mode 100644 php-markdown-php74.patch diff --git a/.gitignore b/.gitignore index 3159a83..29e0a79 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ php-markdown-1.0.1n.zip /php-markdown-lib-1.8.0.zip /php-markdown-1.8.0-01ab082.tgz /php-markdown-1.9.0-c83178d.tgz +/php-markdown-1.9.1-5024d62.tgz diff --git a/php-markdown-php74.patch b/php-markdown-php74.patch deleted file mode 100644 index fb6d782..0000000 --- a/php-markdown-php74.patch +++ /dev/null @@ -1,137 +0,0 @@ -diff -up Michelf/MarkdownExtra.php.php74 Michelf/MarkdownExtra.php ---- Michelf/MarkdownExtra.php.php74 2019-07-26 15:03:52.000000000 +0200 -+++ Michelf/MarkdownExtra.php 2019-07-26 15:07:25.255088870 +0200 -@@ -212,9 +212,9 @@ class MarkdownExtra extends \Michelf\Mar - $attributes = array(); - $id = false; - foreach ($elements as $element) { -- if ($element{0} == '.') { -+ if ($element[0] == '.') { - $classes[] = substr($element, 1); -- } else if ($element{0} == '#') { -+ } else if ($element[0] == '#') { - if ($id === false) $id = substr($element, 1); - } else if (strpos($element, '=') > 0) { - $parts = explode('=', $element, 2); -@@ -508,14 +508,14 @@ class MarkdownExtra extends \Michelf\Mar - } - } - // Check for: Indented code block. -- else if ($tag{0} == "\n" || $tag{0} == " ") { -+ else if ($tag[0] == "\n" || $tag[0] == " ") { - // Indented code block: pass it unchanged, will be handled - // later. - $parsed .= $tag; - } - // Check for: Code span marker - // Note: need to check this after backtick fenced code blocks -- else if ($tag{0} == "`") { -+ else if ($tag[0] == "`") { - // Find corresponding end marker. - $tag_re = preg_quote($tag); - if (preg_match('{^(?>.+?|\n(?!\n))*?(?clean_tags_re . ')\b}', $tag) || -- $tag{1} == '!' || $tag{1} == '?') -+ $tag[1] == '!' || $tag[1] == '?') - { - // Need to parse tag and following text using the HTML parser. - // (don't check for markdown attribute) -@@ -564,7 +564,7 @@ class MarkdownExtra extends \Michelf\Mar - preg_match('{^) - // Comments and Processing Instructions. - if (preg_match('{^auto_close_tags_re . ')\b}', $tag) || -- $tag{1} == '!' || $tag{1} == '?') -+ $tag[1] == '!' || $tag[1] == '?') - { - // Just add the tag to the block as if it was text. - $block_text .= $tag; -@@ -683,7 +683,7 @@ class MarkdownExtra extends \Michelf\Mar - // Increase/decrease nested tag count. Only do so if - // the tag's name match base tag's. - if (preg_match('{^header_id_func) ? call_user_func($this->header_id_func, $matches[1]) : null; - -@@ -1466,7 +1466,7 @@ class MarkdownExtra extends \Michelf\Mar - - $classes = array(); - if ($classname != "") { -- if ($classname{0} == '.') -+ if ($classname[0] == '.') - $classname = substr($classname, 1); - $classes[] = $this->code_class_prefix . $classname; - } -diff -up Michelf/Markdown.php.php74 Michelf/Markdown.php ---- Michelf/Markdown.php.php74 2019-07-26 15:03:52.000000000 +0200 -+++ Michelf/Markdown.php 2019-07-26 15:06:27.924736197 +0200 -@@ -952,7 +952,7 @@ class Markdown implements MarkdownInterf - return $matches[0]; - } - -- $level = $matches[2]{0} == '=' ? 1 : 2; -+ $level = $matches[2][0] == '=' ? 1 : 2; - - // ID attribute generation - $idAtt = $this->_generateIdFromHeaderValue($matches[1]); -@@ -1358,7 +1358,7 @@ class Markdown implements MarkdownInterf - } else { - // Other closing marker: close one em or strong and - // change current token state to match the other -- $token_stack[0] = str_repeat($token{0}, 3-$token_len); -+ $token_stack[0] = str_repeat($token[0], 3-$token_len); - $tag = $token_len == 2 ? "strong" : "em"; - $span = $text_stack[0]; - $span = $this->runSpanGamut($span); -@@ -1383,7 +1383,7 @@ class Markdown implements MarkdownInterf - } else { - // Reached opening three-char emphasis marker. Push on token - // stack; will be handled by the special condition above. -- $em = $token{0}; -+ $em = $token[0]; - $strong = "$em$em"; - array_unshift($token_stack, $token); - array_unshift($text_stack, ''); -@@ -1796,9 +1796,9 @@ class Markdown implements MarkdownInterf - * @return string - */ - protected function handleSpanToken($token, &$str) { -- switch ($token{0}) { -+ switch ($token[0]) { - case "\\": -- return $this->hashPart("&#". ord($token{1}). ";"); -+ return $this->hashPart("&#". ord($token[1]). ";"); - case "`": - // Search for end marker in remaining text. - if (preg_match('/^(.*?[^`])'.preg_quote($token).'(?!`)(.*)$/sm', diff --git a/php-markdown.spec b/php-markdown.spec index 2b016ca..59527ed 100644 --- a/php-markdown.spec +++ b/php-markdown.spec @@ -5,14 +5,14 @@ # # Please preserve changelog entries # -%global gh_commit c83178d49e372ca967d1a8c77ae4e051b3a3c75c +%global gh_commit 5024d623c1a057dcd2d076d25b7d270a1d0d55f3 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner michelf %global gh_project php-markdown Name: php-markdown -Version: 1.9.0 -Release: 5%{?dist} +Version: 1.9.1 +Release: 1%{?dist} Summary: Markdown implementation in PHP License: BSD @@ -79,7 +79,7 @@ require "test/bootstrap.php"; EOF ret=0 -for php in php php72 php73 php74 +for php in php php74 php80 php81 do if which $php then @@ -99,6 +99,9 @@ exit $ret %changelog +* Wed Nov 24 2021 Remi Collet - 1.9.1-1 +- update to 1.9.1 + * Fri Jul 23 2021 Fedora Release Engineering - 1.9.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild diff --git a/sources b/sources index 90c8999..d1f7930 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-markdown-1.9.0-c83178d.tgz) = 3f4564ed999f16e822ec409fed66114b54b17aa2676bc53a04d35e5e721908c5980dd7a5f7b10cfdc1f08fa44dbf3fedf537c5d5705e74b71d0f56372ab80790 +SHA512 (php-markdown-1.9.1-5024d62.tgz) = e8a7e6e0a0c109a461abac6442b6fabbe9f3a53c7ed25dc64ed82e70e645971afc559353cd7f86202695571356aa791b7055161336cb54b5034125e4f3be27a2 From fb2af78a803f151200bea5c8edbe0589b5692f60 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 21 Jan 2022 07:52:32 +0000 Subject: [PATCH 25/38] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- php-markdown.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-markdown.spec b/php-markdown.spec index 59527ed..94e59ac 100644 --- a/php-markdown.spec +++ b/php-markdown.spec @@ -12,7 +12,7 @@ Name: php-markdown Version: 1.9.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Markdown implementation in PHP License: BSD @@ -99,6 +99,9 @@ exit $ret %changelog +* Fri Jan 21 2022 Fedora Release Engineering - 1.9.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Wed Nov 24 2021 Remi Collet - 1.9.1-1 - update to 1.9.1 From 8b14bb274c7fa5eb42dc20b185ea9482370baaf0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 22 Jul 2022 13:46:00 +0000 Subject: [PATCH 26/38] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- php-markdown.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-markdown.spec b/php-markdown.spec index 94e59ac..186ad85 100644 --- a/php-markdown.spec +++ b/php-markdown.spec @@ -12,7 +12,7 @@ Name: php-markdown Version: 1.9.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Markdown implementation in PHP License: BSD @@ -99,6 +99,9 @@ exit $ret %changelog +* Fri Jul 22 2022 Fedora Release Engineering - 1.9.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Fri Jan 21 2022 Fedora Release Engineering - 1.9.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 05d0e405c2101ad235a91997f05dac51ba3ecd0c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 20 Jan 2023 08:47:50 +0000 Subject: [PATCH 27/38] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- php-markdown.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-markdown.spec b/php-markdown.spec index 186ad85..61422db 100644 --- a/php-markdown.spec +++ b/php-markdown.spec @@ -12,7 +12,7 @@ Name: php-markdown Version: 1.9.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Markdown implementation in PHP License: BSD @@ -99,6 +99,9 @@ exit $ret %changelog +* Fri Jan 20 2023 Fedora Release Engineering - 1.9.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Fri Jul 22 2022 Fedora Release Engineering - 1.9.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From e48598fa707b6669b227031a4b4339c59a94aeb1 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Wed, 1 Mar 2023 14:13:12 -0600 Subject: [PATCH 28/38] migrated to SPDX license --- php-markdown.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/php-markdown.spec b/php-markdown.spec index 61422db..d352eb4 100644 --- a/php-markdown.spec +++ b/php-markdown.spec @@ -12,10 +12,10 @@ Name: php-markdown Version: 1.9.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Markdown implementation in PHP -License: BSD +License: BSD-3-Clause URL: https://michelf.ca/projects/php-markdown/ Source0: %{name}-%{version}-%{gh_short}.tgz Source1: makesrc.sh @@ -99,6 +99,9 @@ exit $ret %changelog +* Wed Mar 01 2023 Gwyn Ciesla - 1.9.1-5 +- migrated to SPDX license + * Fri Jan 20 2023 Fedora Release Engineering - 1.9.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 37912e83ef6ffe9ed9218d7b67743931272d6b9f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 21 Jul 2023 04:26:34 +0000 Subject: [PATCH 29/38] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- php-markdown.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-markdown.spec b/php-markdown.spec index d352eb4..aff9273 100644 --- a/php-markdown.spec +++ b/php-markdown.spec @@ -12,7 +12,7 @@ Name: php-markdown Version: 1.9.1 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Markdown implementation in PHP License: BSD-3-Clause @@ -99,6 +99,9 @@ exit $ret %changelog +* Fri Jul 21 2023 Fedora Release Engineering - 1.9.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Wed Mar 01 2023 Gwyn Ciesla - 1.9.1-5 - migrated to SPDX license From 5bf2a74d68dc53d24bb62871ea6ba33bc8ce143c Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 29 Sep 2023 08:31:41 +0200 Subject: [PATCH 30/38] FTBFS --- .gitignore | 16 ---- composer.json | 29 ------ dead.package | 1 + makesrc.sh | 28 ------ php-markdown.spec | 224 ---------------------------------------------- sources | 1 - 6 files changed, 1 insertion(+), 298 deletions(-) delete mode 100644 .gitignore delete mode 100644 composer.json create mode 100644 dead.package delete mode 100755 makesrc.sh delete mode 100644 php-markdown.spec delete mode 100644 sources diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 29e0a79..0000000 --- a/.gitignore +++ /dev/null @@ -1,16 +0,0 @@ -clog -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 -/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 -/php-markdown-1.8.0-01ab082.tgz -/php-markdown-1.9.0-c83178d.tgz -/php-markdown-1.9.1-5024d62.tgz diff --git a/composer.json b/composer.json deleted file mode 100644 index 0935075..0000000 --- a/composer.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "name": "michelf/php-markdown", - "type": "library", - "description": "PHP Markdown", - "homepage": "https://michelf.ca/projects/php-markdown/", - "keywords": ["markdown"], - "license": "BSD-3-Clause", - "authors": [ - { - "name": "Michel Fortin", - "email": "michel.fortin@michelf.ca", - "homepage": "https://michelf.ca/", - "role": "Developer" - }, - { - "name": "John Gruber", - "homepage": "https://daringfireball.net/" - } - ], - "require": { - "php": ">=5.3.0" - }, - "autoload": { - "psr-4": { "Michelf\\": "Michelf/" } - }, - "require-dev": { - "phpunit/phpunit": ">=4.3 <5.8" - } -} diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..e602d74 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +FTBFS diff --git a/makesrc.sh b/makesrc.sh deleted file mode 100755 index 87d223d..0000000 --- a/makesrc.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/bash - -NAME=$(basename $PWD) -OWNER=$(sed -n '/^%global gh_owner/{s/.* //;p}' $NAME.spec) -PROJECT=$(sed -n '/^%global gh_project/{s/.* //;p}' $NAME.spec) -VERSION=$(sed -n '/^Version:/{s/.* //;p}' $NAME.spec) -COMMIT=$(sed -n '/^%global gh_commit/{s/.* //;p}' $NAME.spec) -SHORT=${COMMIT:0:7} - -echo -e "\nCreate git snapshot\nName=$NAME, Owner=$OWNER, Project=$PROJECT, Version=$VERSION\n" - -echo "Cloning..." -rm -rf $PROJECT-$COMMIT -git clone https://github.com/$OWNER/$PROJECT.git $PROJECT-$COMMIT - -echo "Getting commit..." -pushd $PROJECT-$COMMIT -git checkout $COMMIT -cp composer.json ../composer.json -popd - -echo "Archiving..." -tar czf $NAME-$VERSION-$SHORT.tgz --exclude .git $PROJECT-$COMMIT - -echo "Cleaning..." -rm -rf $PROJECT-$COMMIT - -echo "Done." diff --git a/php-markdown.spec b/php-markdown.spec deleted file mode 100644 index aff9273..0000000 --- a/php-markdown.spec +++ /dev/null @@ -1,224 +0,0 @@ -# Fedora spec file for php-markdown -# -# License: MIT -# http://opensource.org/licenses/MIT -# -# Please preserve changelog entries -# -%global gh_commit 5024d623c1a057dcd2d076d25b7d270a1d0d55f3 -%global gh_short %(c=%{gh_commit}; echo ${c:0:7}) -%global gh_owner michelf -%global gh_project php-markdown - -Name: php-markdown -Version: 1.9.1 -Release: 6%{?dist} -Summary: Markdown implementation in PHP - -License: BSD-3-Clause -URL: https://michelf.ca/projects/php-markdown/ -Source0: %{name}-%{version}-%{gh_short}.tgz -Source1: makesrc.sh - -BuildArch: noarch -BuildRequires: php-fedora-autoloader-devel -# For tests -# "require-dev": { -# "phpunit/phpunit": ">=4.3 <5.8" -BuildRequires: phpunit - -Requires: php(language) >= 5.3 -Requires: php-pcre -Requires: php-composer(fedora/autoloader) - -Provides: php-composer(michelf/php-markdown) = %{version} - - -%description -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}. - -Autoloader: %{_datadir}/php/Michelf/markdown-autoload.php - - -%prep -%setup -q -n %{gh_project}-%{gh_commit} -mv License.md LICENSE - - -%build -: Generate simple autoloader -%{_bindir}/phpab \ - --template fedora \ - --output Michelf/markdown-autoload.php \ - Michelf -cat Michelf/markdown-autoload.php - - -%install -install -d %{buildroot}%{_datadir}/php/ - -# PSR-0 library -cp -pr Michelf %{buildroot}%{_datadir}/php/Michelf - - -%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); -' -cat << 'EOF' | tee bs.php - - 1.9.1-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Wed Mar 01 2023 Gwyn Ciesla - 1.9.1-5 -- migrated to SPDX license - -* Fri Jan 20 2023 Fedora Release Engineering - 1.9.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Fri Jul 22 2022 Fedora Release Engineering - 1.9.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Fri Jan 21 2022 Fedora Release Engineering - 1.9.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Wed Nov 24 2021 Remi Collet - 1.9.1-1 -- update to 1.9.1 - -* Fri Jul 23 2021 Fedora Release Engineering - 1.9.0-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Wed Jan 27 2021 Fedora Release Engineering - 1.9.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Tue Jul 28 2020 Fedora Release Engineering - 1.9.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Thu Jan 30 2020 Fedora Release Engineering - 1.9.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Mon Dec 2 2019 Remi Collet - 1.9.0-1 -- update to 1.9.0 -- run upstream test suite - -* Fri Jul 26 2019 Remi Collet - 1.8.0-6 -- drop old classic version -- use git snapshot as next version will have test suite -- add patch for PHP 7.4, adapted for 1.8.0 from - https://github.com/michelf/php-markdown/pull/316 - -* Fri Jul 26 2019 Fedora Release Engineering - 1.8.0-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Sat Feb 02 2019 Fedora Release Engineering - 1.8.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Fri Jul 13 2018 Fedora Release Engineering - 1.8.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Fri Feb 09 2018 Fedora Release Engineering - 1.8.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Mon Jan 15 2018 Remi Collet - 1.8.0-1 -- Mardown PSR-0/PSR-4 library version 1.8.0 - -* Thu Jul 27 2017 Fedora Release Engineering - 1.7.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Sat Feb 11 2017 Fedora Release Engineering - 1.7.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* 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 - -* Thu Feb 04 2016 Fedora Release Engineering - 1.6.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Sat Dec 26 2015 Remi Collet - 1.6.0-1 -- Mardown PSR-0 library version 1.6.0 -- add simple autoloader - -* Thu Jun 18 2015 Fedora Release Engineering - 1.5.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* 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 - -* Sat Jun 07 2014 Fedora Release Engineering - 1.4.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* 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 - -* Sun Aug 04 2013 Fedora Release Engineering - 1.2.7-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* 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) - -* Tue Jan 29 2013 Remi Collet - 1.0.1p-1 -- Updated to 1.0.1p -- don't requires php - -* Fri Jul 20 2012 Fedora Release Engineering - 1.0.1n-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Sat Jan 14 2012 Fedora Release Engineering - 1.0.1n-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Wed Feb 09 2011 Fedora Release Engineering - 1.0.1n-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Mon May 03 2010 Rakesh Pandit 1.0.1n-1 -- Updated to 1.0.1n - -* Sun Jul 26 2009 Fedora Release Engineering - 1.0.1m-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Sun May 24 2009 Rakesh Pandit 1.0.1m-2 -- Fixed mixed use of space and tabs, using install in place of cp - -* Sun May 24 2009 Rakesh Pandit 1.0.1m-1 -- Initial package diff --git a/sources b/sources deleted file mode 100644 index d1f7930..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -SHA512 (php-markdown-1.9.1-5024d62.tgz) = e8a7e6e0a0c109a461abac6442b6fabbe9f3a53c7ed25dc64ed82e70e645971afc559353cd7f86202695571356aa791b7055161336cb54b5034125e4f3be27a2 From 621f167e8a23863adfb2cf5ed0d0b17133a2cab4 Mon Sep 17 00:00:00 2001 From: Tomas Hrcka Date: Fri, 6 Oct 2023 10:24:36 +0200 Subject: [PATCH 31/38] Unretirement request: https://pagure.io/releng/issue/11710 --- .gitignore | 16 ++++ composer.json | 29 ++++++ dead.package | 1 - makesrc.sh | 28 ++++++ php-markdown.spec | 224 ++++++++++++++++++++++++++++++++++++++++++++++ sources | 1 + 6 files changed, 298 insertions(+), 1 deletion(-) create mode 100644 .gitignore create mode 100644 composer.json delete mode 100644 dead.package create mode 100755 makesrc.sh create mode 100644 php-markdown.spec create mode 100644 sources diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..29e0a79 --- /dev/null +++ b/.gitignore @@ -0,0 +1,16 @@ +clog +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 +/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 +/php-markdown-1.8.0-01ab082.tgz +/php-markdown-1.9.0-c83178d.tgz +/php-markdown-1.9.1-5024d62.tgz diff --git a/composer.json b/composer.json new file mode 100644 index 0000000..0935075 --- /dev/null +++ b/composer.json @@ -0,0 +1,29 @@ +{ + "name": "michelf/php-markdown", + "type": "library", + "description": "PHP Markdown", + "homepage": "https://michelf.ca/projects/php-markdown/", + "keywords": ["markdown"], + "license": "BSD-3-Clause", + "authors": [ + { + "name": "Michel Fortin", + "email": "michel.fortin@michelf.ca", + "homepage": "https://michelf.ca/", + "role": "Developer" + }, + { + "name": "John Gruber", + "homepage": "https://daringfireball.net/" + } + ], + "require": { + "php": ">=5.3.0" + }, + "autoload": { + "psr-4": { "Michelf\\": "Michelf/" } + }, + "require-dev": { + "phpunit/phpunit": ">=4.3 <5.8" + } +} diff --git a/dead.package b/dead.package deleted file mode 100644 index e602d74..0000000 --- a/dead.package +++ /dev/null @@ -1 +0,0 @@ -FTBFS diff --git a/makesrc.sh b/makesrc.sh new file mode 100755 index 0000000..87d223d --- /dev/null +++ b/makesrc.sh @@ -0,0 +1,28 @@ +#!/bin/bash + +NAME=$(basename $PWD) +OWNER=$(sed -n '/^%global gh_owner/{s/.* //;p}' $NAME.spec) +PROJECT=$(sed -n '/^%global gh_project/{s/.* //;p}' $NAME.spec) +VERSION=$(sed -n '/^Version:/{s/.* //;p}' $NAME.spec) +COMMIT=$(sed -n '/^%global gh_commit/{s/.* //;p}' $NAME.spec) +SHORT=${COMMIT:0:7} + +echo -e "\nCreate git snapshot\nName=$NAME, Owner=$OWNER, Project=$PROJECT, Version=$VERSION\n" + +echo "Cloning..." +rm -rf $PROJECT-$COMMIT +git clone https://github.com/$OWNER/$PROJECT.git $PROJECT-$COMMIT + +echo "Getting commit..." +pushd $PROJECT-$COMMIT +git checkout $COMMIT +cp composer.json ../composer.json +popd + +echo "Archiving..." +tar czf $NAME-$VERSION-$SHORT.tgz --exclude .git $PROJECT-$COMMIT + +echo "Cleaning..." +rm -rf $PROJECT-$COMMIT + +echo "Done." diff --git a/php-markdown.spec b/php-markdown.spec new file mode 100644 index 0000000..aff9273 --- /dev/null +++ b/php-markdown.spec @@ -0,0 +1,224 @@ +# Fedora spec file for php-markdown +# +# License: MIT +# http://opensource.org/licenses/MIT +# +# Please preserve changelog entries +# +%global gh_commit 5024d623c1a057dcd2d076d25b7d270a1d0d55f3 +%global gh_short %(c=%{gh_commit}; echo ${c:0:7}) +%global gh_owner michelf +%global gh_project php-markdown + +Name: php-markdown +Version: 1.9.1 +Release: 6%{?dist} +Summary: Markdown implementation in PHP + +License: BSD-3-Clause +URL: https://michelf.ca/projects/php-markdown/ +Source0: %{name}-%{version}-%{gh_short}.tgz +Source1: makesrc.sh + +BuildArch: noarch +BuildRequires: php-fedora-autoloader-devel +# For tests +# "require-dev": { +# "phpunit/phpunit": ">=4.3 <5.8" +BuildRequires: phpunit + +Requires: php(language) >= 5.3 +Requires: php-pcre +Requires: php-composer(fedora/autoloader) + +Provides: php-composer(michelf/php-markdown) = %{version} + + +%description +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}. + +Autoloader: %{_datadir}/php/Michelf/markdown-autoload.php + + +%prep +%setup -q -n %{gh_project}-%{gh_commit} +mv License.md LICENSE + + +%build +: Generate simple autoloader +%{_bindir}/phpab \ + --template fedora \ + --output Michelf/markdown-autoload.php \ + Michelf +cat Michelf/markdown-autoload.php + + +%install +install -d %{buildroot}%{_datadir}/php/ + +# PSR-0 library +cp -pr Michelf %{buildroot}%{_datadir}/php/Michelf + + +%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); +' +cat << 'EOF' | tee bs.php + - 1.9.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Wed Mar 01 2023 Gwyn Ciesla - 1.9.1-5 +- migrated to SPDX license + +* Fri Jan 20 2023 Fedora Release Engineering - 1.9.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Fri Jul 22 2022 Fedora Release Engineering - 1.9.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Fri Jan 21 2022 Fedora Release Engineering - 1.9.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Wed Nov 24 2021 Remi Collet - 1.9.1-1 +- update to 1.9.1 + +* Fri Jul 23 2021 Fedora Release Engineering - 1.9.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Wed Jan 27 2021 Fedora Release Engineering - 1.9.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Tue Jul 28 2020 Fedora Release Engineering - 1.9.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Thu Jan 30 2020 Fedora Release Engineering - 1.9.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Mon Dec 2 2019 Remi Collet - 1.9.0-1 +- update to 1.9.0 +- run upstream test suite + +* Fri Jul 26 2019 Remi Collet - 1.8.0-6 +- drop old classic version +- use git snapshot as next version will have test suite +- add patch for PHP 7.4, adapted for 1.8.0 from + https://github.com/michelf/php-markdown/pull/316 + +* Fri Jul 26 2019 Fedora Release Engineering - 1.8.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Sat Feb 02 2019 Fedora Release Engineering - 1.8.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Fri Jul 13 2018 Fedora Release Engineering - 1.8.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Fri Feb 09 2018 Fedora Release Engineering - 1.8.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Mon Jan 15 2018 Remi Collet - 1.8.0-1 +- Mardown PSR-0/PSR-4 library version 1.8.0 + +* Thu Jul 27 2017 Fedora Release Engineering - 1.7.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Sat Feb 11 2017 Fedora Release Engineering - 1.7.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* 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 + +* Thu Feb 04 2016 Fedora Release Engineering - 1.6.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Sat Dec 26 2015 Remi Collet - 1.6.0-1 +- Mardown PSR-0 library version 1.6.0 +- add simple autoloader + +* Thu Jun 18 2015 Fedora Release Engineering - 1.5.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* 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 + +* Sat Jun 07 2014 Fedora Release Engineering - 1.4.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* 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 + +* Sun Aug 04 2013 Fedora Release Engineering - 1.2.7-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* 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) + +* Tue Jan 29 2013 Remi Collet - 1.0.1p-1 +- Updated to 1.0.1p +- don't requires php + +* Fri Jul 20 2012 Fedora Release Engineering - 1.0.1n-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Sat Jan 14 2012 Fedora Release Engineering - 1.0.1n-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Wed Feb 09 2011 Fedora Release Engineering - 1.0.1n-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Mon May 03 2010 Rakesh Pandit 1.0.1n-1 +- Updated to 1.0.1n + +* Sun Jul 26 2009 Fedora Release Engineering - 1.0.1m-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Sun May 24 2009 Rakesh Pandit 1.0.1m-2 +- Fixed mixed use of space and tabs, using install in place of cp + +* Sun May 24 2009 Rakesh Pandit 1.0.1m-1 +- Initial package diff --git a/sources b/sources new file mode 100644 index 0000000..d1f7930 --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (php-markdown-1.9.1-5024d62.tgz) = e8a7e6e0a0c109a461abac6442b6fabbe9f3a53c7ed25dc64ed82e70e645971afc559353cd7f86202695571356aa791b7055161336cb54b5034125e4f3be27a2 From 17db8577b0dae28f2e2f0c5bfd23f0d4e5b1a4bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Wed, 4 Oct 2023 22:56:38 +0100 Subject: [PATCH 32/38] Update php-markdown to 2.0.0 --- .gitignore | 1 + composer.json | 29 +++++++++++++++++++++++++++-- php-markdown.spec | 19 +++++++++++-------- sources | 2 +- 4 files changed, 40 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index 29e0a79..c5a550a 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ php-markdown-1.0.1n.zip /php-markdown-1.8.0-01ab082.tgz /php-markdown-1.9.0-c83178d.tgz /php-markdown-1.9.1-5024d62.tgz +/php-markdown-2.0.0.tar.gz diff --git a/composer.json b/composer.json index 0935075..7cb59cf 100644 --- a/composer.json +++ b/composer.json @@ -18,12 +18,37 @@ } ], "require": { - "php": ">=5.3.0" + "php": ">=7.4" }, "autoload": { "psr-4": { "Michelf\\": "Michelf/" } }, "require-dev": { - "phpunit/phpunit": ">=4.3 <5.8" + "friendsofphp/php-cs-fixer": "^3.0", + "phpunit/phpunit": "^9.5", + "phpstan/phpstan": ">=1.0", + "phpstan/phpstan-phpunit": ">=1.0" + }, + + "scripts": { + "tests": "vendor/bin/phpunit test/", + "phpstan": [ + "vendor/bin/phpstan analyse Michelf/ --level=5", + "vendor/bin/phpstan analyse -c test/phpstan.neon test/ --level=5" + ], + "codestyle": "vendor/bin/php-cs-fixer fix Michelf --dry-run --verbose --show-progress=none", + "codestyle-fix": "vendor/bin/php-cs-fixer fix Michelf" + }, + + "archive": { + "exclude": [ + "/.github/", + "/test/", + "/.editorconfig", + "/.gitignore", + "/.scrutinizer.yml", + "/.travis.yml", + "/phpunit.xml.dist" + ] } } diff --git a/php-markdown.spec b/php-markdown.spec index aff9273..2747bbc 100644 --- a/php-markdown.spec +++ b/php-markdown.spec @@ -11,13 +11,13 @@ %global gh_project php-markdown Name: php-markdown -Version: 1.9.1 -Release: 6%{?dist} +Version: 2.0.0 +Release: 1%{?dist} Summary: Markdown implementation in PHP License: BSD-3-Clause URL: https://michelf.ca/projects/php-markdown/ -Source0: %{name}-%{version}-%{gh_short}.tgz +Source0: https://github.com/michelf/php-markdown/archive/%{version}/%{name}-%{version}.tar.gz Source1: makesrc.sh BuildArch: noarch @@ -25,9 +25,9 @@ BuildRequires: php-fedora-autoloader-devel # For tests # "require-dev": { # "phpunit/phpunit": ">=4.3 <5.8" -BuildRequires: phpunit +BuildRequires: phpunit10 -Requires: php(language) >= 5.3 +Requires: php(language) >= 7.4 Requires: php-pcre Requires: php-composer(fedora/autoloader) @@ -45,7 +45,7 @@ Autoloader: %{_datadir}/php/Michelf/markdown-autoload.php %prep -%setup -q -n %{gh_project}-%{gh_commit} +%setup -q mv License.md LICENSE @@ -79,11 +79,11 @@ require "test/bootstrap.php"; EOF ret=0 -for php in php php74 php80 php81 +for php in php php74 php81 php82 php83 do if which $php then - $php %{_bindir}/phpunit --bootstrap bs.php || ret=1 + $php %{_bindir}/phpunit10 --bootstrap bs.php || ret=1 fi done exit $ret @@ -99,6 +99,9 @@ exit $ret %changelog +* Wed Oct 04 2023 Sérgio Basto - 2.0.0-1 +- Update php-markdown to 2.0.0 + * Fri Jul 21 2023 Fedora Release Engineering - 1.9.1-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild diff --git a/sources b/sources index d1f7930..e26d3a3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-markdown-1.9.1-5024d62.tgz) = e8a7e6e0a0c109a461abac6442b6fabbe9f3a53c7ed25dc64ed82e70e645971afc559353cd7f86202695571356aa791b7055161336cb54b5034125e4f3be27a2 +SHA512 (php-markdown-2.0.0.tar.gz) = a848bc7374f8392d21824acbc1fb11c37f961e1780fb2c735a4d4d09949fb51a6962d8d2f6df2dfca92d00a33da82062d5e2a8b8301cb476242e1fc17af673b5 From 86d1ce79145c8f87f0d12c8b1d3638fb73b5d367 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 21 Jan 2024 20:57:00 +0000 Subject: [PATCH 33/38] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- php-markdown.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-markdown.spec b/php-markdown.spec index 2747bbc..b06a03d 100644 --- a/php-markdown.spec +++ b/php-markdown.spec @@ -12,7 +12,7 @@ Name: php-markdown Version: 2.0.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Markdown implementation in PHP License: BSD-3-Clause @@ -99,6 +99,9 @@ exit $ret %changelog +* Sun Jan 21 2024 Fedora Release Engineering - 2.0.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Wed Oct 04 2023 Sérgio Basto - 2.0.0-1 - Update php-markdown to 2.0.0 From 50c08d9afe006e2c9feec634c35030b959b8f109 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jan 2024 22:43:44 +0000 Subject: [PATCH 34/38] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- php-markdown.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-markdown.spec b/php-markdown.spec index b06a03d..2435e8e 100644 --- a/php-markdown.spec +++ b/php-markdown.spec @@ -12,7 +12,7 @@ Name: php-markdown Version: 2.0.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Markdown implementation in PHP License: BSD-3-Clause @@ -99,6 +99,9 @@ exit $ret %changelog +* Thu Jan 25 2024 Fedora Release Engineering - 2.0.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sun Jan 21 2024 Fedora Release Engineering - 2.0.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 593fdc3ba31b92a91c5b2079e9e8c7fffa57dd09 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jul 2024 06:58:00 +0000 Subject: [PATCH 35/38] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- php-markdown.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-markdown.spec b/php-markdown.spec index 2435e8e..62eff59 100644 --- a/php-markdown.spec +++ b/php-markdown.spec @@ -12,7 +12,7 @@ Name: php-markdown Version: 2.0.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Markdown implementation in PHP License: BSD-3-Clause @@ -99,6 +99,9 @@ exit $ret %changelog +* Fri Jul 19 2024 Fedora Release Engineering - 2.0.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Thu Jan 25 2024 Fedora Release Engineering - 2.0.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From f5d1ea316098209eb11c646d7585559dc8b5e6ec Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 18 Jan 2025 09:08:53 +0000 Subject: [PATCH 36/38] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- php-markdown.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-markdown.spec b/php-markdown.spec index 62eff59..f84fa05 100644 --- a/php-markdown.spec +++ b/php-markdown.spec @@ -12,7 +12,7 @@ Name: php-markdown Version: 2.0.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Markdown implementation in PHP License: BSD-3-Clause @@ -99,6 +99,9 @@ exit $ret %changelog +* Sat Jan 18 2025 Fedora Release Engineering - 2.0.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Fri Jul 19 2024 Fedora Release Engineering - 2.0.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 54288f43bc0c4b73d0aa66003f79b305b8fb640d Mon Sep 17 00:00:00 2001 From: Tim Landscheidt Date: Sun, 23 Mar 2025 05:07:54 +0000 Subject: [PATCH 37/38] Remove outdated information from package description --- php-markdown.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/php-markdown.spec b/php-markdown.spec index f84fa05..b495572 100644 --- a/php-markdown.spec +++ b/php-markdown.spec @@ -12,7 +12,7 @@ Name: php-markdown Version: 2.0.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Markdown implementation in PHP License: BSD-3-Clause @@ -38,9 +38,6 @@ Provides: php-composer(michelf/php-markdown) = %{version} 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}. - Autoloader: %{_datadir}/php/Michelf/markdown-autoload.php @@ -99,6 +96,9 @@ exit $ret %changelog +* Sun Mar 23 2025 Tim Landscheidt - 2.0.0-6 +- Remove outdated information from package description + * Sat Jan 18 2025 Fedora Release Engineering - 2.0.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 419b89b2abfc272fd7b259d52e0a3109872de7f0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 05:14:34 +0000 Subject: [PATCH 38/38] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- php-markdown.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-markdown.spec b/php-markdown.spec index b495572..56470b6 100644 --- a/php-markdown.spec +++ b/php-markdown.spec @@ -12,7 +12,7 @@ Name: php-markdown Version: 2.0.0 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Markdown implementation in PHP License: BSD-3-Clause @@ -96,6 +96,9 @@ exit $ret %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 2.0.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Sun Mar 23 2025 Tim Landscheidt - 2.0.0-6 - Remove outdated information from package description