summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--PHPINFO2
-rw-r--r--REFLECTION6
-rw-r--r--composer.json13
-rw-r--r--php-pecl-md4c.spec69
4 files changed, 54 insertions, 36 deletions
diff --git a/PHPINFO b/PHPINFO
index 31afa02..d3c3be4 100644
--- a/PHPINFO
+++ b/PHPINFO
@@ -3,4 +3,4 @@ md4c
MD4C => enabled
PHP-MD4C version => 1.1
-MD4C system library version => 0.5.2
+MD4C system library version => 0.5.3
diff --git a/REFLECTION b/REFLECTION
index 39d5898..86b33b8 100644
--- a/REFLECTION
+++ b/REFLECTION
@@ -1,8 +1,8 @@
-Extension [ <persistent> extension #87 md4c version 1.1 ] {
+Extension [ <persistent> extension #97 md4c version 1.1 ] {
- Constants [2] {
- Constant [ int MD4C_DIALECT_GITHUB ] { 3852 }
- Constant [ int MD4C_FLAG_NOINDENTEDCODEBLOCKS ] { 16 }
+ Constant [ <persistent> int MD4C_DIALECT_GITHUB ] { 3852 }
+ Constant [ <persistent> int MD4C_FLAG_NOINDENTEDCODEBLOCKS ] { 16 }
}
- Functions {
diff --git a/composer.json b/composer.json
new file mode 100644
index 0000000..b341ae4
--- /dev/null
+++ b/composer.json
@@ -0,0 +1,13 @@
+{
+ "name": "pecl/md4c",
+ "type": "php-ext",
+ "license": "MIT",
+ "description": "Convert Markdown or CommonMark to HTML using MD4C",
+ "require": {
+ "php": ">= 8.0.0"
+ },
+ "php-ext": {
+ "extension-name": "md4c",
+ "configure-options": []
+ }
+}
diff --git a/php-pecl-md4c.spec b/php-pecl-md4c.spec
index a0b04f9..4ffd267 100644
--- a/php-pecl-md4c.spec
+++ b/php-pecl-md4c.spec
@@ -1,8 +1,8 @@
# remirepo spec file for php-pecl-md4c
#
-# Copyright (c) 2024 Remi Collet
-# License: CC-BY-SA-4.0
-# http://creativecommons.org/licenses/by-sa/4.0/
+# SPDX-FileCopyrightText: Copyright 2024-2026 Remi Collet
+# SPDX-License-Identifier: CECILL-2.1
+# http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
#
# Please, preserve the changelog entries
#
@@ -12,28 +12,35 @@
%bcond_without libmd4c
%global pecl_name md4c
+%global pie_vend pecl
+%global pie_proj %{pecl_name}
%global ini_name 40-%{pecl_name}.ini
%global upstream_version 1.1
#global upstream_prever dev
#global upstream_rpmrel DEV
-%global sources %{pecl_name}-%{upstream_version}%{?upstream_prever}
%global bundledver 0.5.2
%global buildver %(pkg-config --silence-errors --modversion md4c-html 2>/dev/null || echo 65536)
-Summary: Convert Markdown to HTML
+# Github forge
+%global gh_vend eklausme
+%global gh_proj php-md4c
+%global forgeurl https://github.com/%{gh_vend}/%{gh_proj}
+%global tag %{upstream_version}%{?upstream_prever}
+
Name: %{?scl_prefix}php-pecl-%{pecl_name}
-Version: %{upstream_version}%{?upstream_prever:~%{upstream_rpmrel}}
-Release: 1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
+Summary: Convert Markdown to HTML
# Copy/paste library http://github.com/mity/md4c is MIT
# Extension is MIT
License: MIT
-URL: https://pecl.php.net/package/%{pecl_name}
-Source0: https://pecl.php.net/get/%{pecl_name}-%{upstream_version}%{?upstream_prever}.tgz
+Version: %{upstream_version}%{?upstream_prever:~%{upstream_rpmrel}}
+Release: 2%{?dist}
+%forgemeta
+URL: %{forgeurl}
+Source0: %{forgesource}
BuildRequires: make
BuildRequires: %{?dtsprefix}gcc
BuildRequires: %{?scl_prefix}php-devel >= 8.0
-BuildRequires: %{?scl_prefix}php-pear
%if %{with libmd4c}
BuildRequires: md4c-devel >= %{bundledver}
Requires: md4c%{?_isa} >= %{buildver}
@@ -45,10 +52,15 @@ Requires: %{?scl_prefix}php(api) = %{php_core_api}
%if %{without libmd4c}
Provides: bundled(md4c) = %{bundledver}
%endif
-Provides: %{?scl_prefix}php-%{pecl_name} = %{version}
-Provides: %{?scl_prefix}php-%{pecl_name}%{?_isa} = %{version}
-Provides: %{?scl_prefix}php-pecl(%{pecl_name}) = %{version}
-Provides: %{?scl_prefix}php-pecl(%{pecl_name})%{?_isa} = %{version}
+# Extension
+Provides: %{?scl_prefix}php-%{pecl_name} = %{version}
+Provides: %{?scl_prefix}php-%{pecl_name}%{?_isa} = %{version}
+# PECL
+Provides: %{?scl_prefix}php-pecl(%{pecl_name}) = %{version}
+Provides: %{?scl_prefix}php-pecl(%{pecl_name})%{?_isa} = %{version}
+# PIE
+Provides: %{?scl_prefix}php-pie(%{pie_vend}/%{pie_proj}) = %{version}
+Provides: %{?scl_prefix}php-%{pie_vend}-%{pie_proj} = %{version}
%description
@@ -63,11 +75,7 @@ Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSIO
%prep
-%setup -q -c
-# Don't install/register tests
-sed -e 's/role="test"/role="src"/' \
- -e '/LICENSE/s/role="doc"/role="src"/' \
- -i package.xml
+%forgesetup
# Drop in the bit of configuration
cat > %{ini_name} << 'EOF'
@@ -79,7 +87,6 @@ EOF
%build
%{?dtsenable}
-cd %{sources}
%{__phpize}
sed -e 's/INSTALL_ROOT/DESTDIR/' -i build/Makefile.global
@@ -93,21 +100,12 @@ sed -e 's/INSTALL_ROOT/DESTDIR/' -i build/Makefile.global
%install
%{?dtsenable}
-cd %{sources}
: Install the extension
%make_install
: Install the configuration file
-install -D -m 644 ../%{ini_name} %{buildroot}%{php_inidir}/%{ini_name}
-
-: Install the package XML file
-install -D -m 644 ../package.xml %{buildroot}%{pecl_xmldir}/%{name}.xml
-
-: Install Documentation
-for i in $(grep 'role="doc"' ../package.xml | sed -e 's/^.*name="//;s/".*$//')
-do install -Dpm 644 $i %{buildroot}%{pecl_docdir}/%{pecl_name}/$i
-done
+install -D -m 644 %{ini_name} %{buildroot}%{php_inidir}/%{ini_name}
%check
@@ -118,14 +116,21 @@ done
%files
-%license %{sources}/LICENSE*
-%{pecl_xmldir}/%{name}.xml
+%license LICENSE*
+%doc composer.json
+%doc *.md
%config(noreplace) %{php_inidir}/%{ini_name}
%{php_extdir}/%{pecl_name}.so
%changelog
+* Wed Apr 22 2026 Remi Collet <remi@remirepo.net> - 1.1-2
+- re-license spec file to CECILL-2.1
+- add pie virtual provides (no yet published)
+- drop pear/pecl dependency
+- sources from github
+
* Mon Dec 2 2024 Remi Collet <remi@remirepo.net> - 1.1-1
- update to 1.1
- use system libmd4c
generated by cgit (git 2.34.1) at 2026-04-25 13:03:08 +0000