From d9676248362e665c9e6c13b183583aff39c5fc79 Mon Sep 17 00:00:00 2001 From: Artur Frenszek-Iwicki Date: Sep 15 2022 09:52:24 +0000 Subject: Update to v2022-07-31a "Igor" --- diff --git a/.gitignore b/.gitignore index e08280b..f044e3e 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,5 @@ dokuwiki-2009-12-25c.tgz /dokuwiki-2018-04-22a.tgz /dokuwiki-2018-04-22b.tgz /dokuwiki-2020-07-29.tgz +/dokuwiki-2022-07-31.tgz +/dokuwiki-2022-07-31a.tgz diff --git a/dokuwiki-rm-bundled-libs.patch b/dokuwiki-rm-bundled-libs.patch index 29a98b3..636c71e 100644 --- a/dokuwiki-rm-bundled-libs.patch +++ b/dokuwiki-rm-bundled-libs.patch @@ -1,12 +1,16 @@ -diff -ru dokuwiki-2020-07-29--orig/vendor/composer/autoload_classmap.php dokuwiki-2020-07-29--patched/vendor/composer/autoload_classmap.php ---- dokuwiki-2020-07-29--orig/vendor/composer/autoload_classmap.php 2020-07-29 11:35:28.000000000 +0200 -+++ dokuwiki-2020-07-29--patched/vendor/composer/autoload_classmap.php 2020-08-26 02:12:22.151866021 +0200 -@@ -6,30 +6,30 @@ +diff -r -U4 dokuwiki-2022-07-31--orig/vendor/composer/autoload_classmap.php dokuwiki-2022-07-31--patched/vendor/composer/autoload_classmap.php +--- dokuwiki-2022-07-31--orig/vendor/composer/autoload_classmap.php 2022-07-31 14:00:17.000000000 +0200 ++++ dokuwiki-2022-07-31--patched/vendor/composer/autoload_classmap.php 2022-09-15 11:26:48.491226228 +0200 +@@ -5,32 +5,32 @@ + $vendorDir = dirname(__DIR__); $baseDir = dirname($vendorDir); return array( - 'AtomCreator03' => $vendorDir . '/openpsa/universalfeedcreator/lib/Creator/AtomCreator03.php', - 'AtomCreator10' => $vendorDir . '/openpsa/universalfeedcreator/lib/Creator/AtomCreator10.php', ++ 'AtomCreator03' => '/usr/share/php/openpsa-universalfeedcreator/Creator/AtomCreator03.php', ++ 'AtomCreator10' => '/usr/share/php/openpsa-universalfeedcreator/Creator/AtomCreator10.php', + 'Composer\\InstalledVersions' => $vendorDir . '/composer/InstalledVersions.php', - 'FeedCreator' => $vendorDir . '/openpsa/universalfeedcreator/lib/Creator/FeedCreator.php', - 'FeedDate' => $vendorDir . '/openpsa/universalfeedcreator/lib/Element/FeedDate.php', - 'FeedHtmlField' => $vendorDir . '/openpsa/universalfeedcreator/lib/Element/FeedHtmlField.php', @@ -31,8 +35,6 @@ diff -ru dokuwiki-2020-07-29--orig/vendor/composer/autoload_classmap.php dokuwik - 'lessc_formatter_compressed' => $vendorDir . '/marcusschwarz/lesserphp/lessc.inc.php', - 'lessc_formatter_lessjs' => $vendorDir . '/marcusschwarz/lesserphp/lessc.inc.php', - 'lessc_parser' => $vendorDir . '/marcusschwarz/lesserphp/lessc.inc.php', -+ 'AtomCreator03' => '/usr/share/php/openpsa-universalfeedcreator/Creator/AtomCreator03.php', -+ 'AtomCreator10' => '/usr/share/php/openpsa-universalfeedcreator/Creator/AtomCreator10.php', + 'FeedCreator' => '/usr/share/php/openpsa-universalfeedcreator/Creator/FeedCreator.php', + 'FeedDate' => '/usr/share/php/openpsa-universalfeedcreator/Element/FeedDate.php', + 'FeedHtmlField' => '/usr/share/php/openpsa-universalfeedcreator/Element/FeedHtmlField.php', @@ -58,24 +60,24 @@ diff -ru dokuwiki-2020-07-29--orig/vendor/composer/autoload_classmap.php dokuwik + 'lessc_formatter_lessjs' => '/usr/share/php/marcusschwarz-lesserphp/lessc.inc.php', + 'lessc_parser' => '/usr/share/php/marcusschwarz-lesserphp/lessc.inc.php', ); -diff -ru dokuwiki-2020-07-29--orig/vendor/composer/autoload_files.php dokuwiki-2020-07-29--patched/vendor/composer/autoload_files.php ---- dokuwiki-2020-07-29--orig/vendor/composer/autoload_files.php 2020-07-29 11:35:28.000000000 +0200 -+++ dokuwiki-2020-07-29--patched/vendor/composer/autoload_files.php 2020-08-26 02:14:59.845469754 +0200 -@@ -6,7 +6,7 @@ +diff -r -U4 dokuwiki-2022-07-31--orig/vendor/composer/autoload_files.php dokuwiki-2022-07-31--patched/vendor/composer/autoload_files.php +--- dokuwiki-2022-07-31--orig/vendor/composer/autoload_files.php 2022-07-31 14:00:17.000000000 +0200 ++++ dokuwiki-2022-07-31--patched/vendor/composer/autoload_files.php 2022-09-15 11:26:48.492226235 +0200 +@@ -5,7 +5,7 @@ + $vendorDir = dirname(__DIR__); $baseDir = dirname($vendorDir); return array( - 'fdc0e9724ddc47859c8bf0c1ea0a623a' => $vendorDir . '/openpsa/universalfeedcreator/lib/constants.php', -- '5255c38a0faeba867671b61dfda6d864' => $vendorDir . '/paragonie/random_compat/lib/random.php', - 'decc78cc4436b1292c6c0d151b19445c' => $vendorDir . '/phpseclib/phpseclib/phpseclib/bootstrap.php', + 'fdc0e9724ddc47859c8bf0c1ea0a623a' => '/usr/share/php/openpsa-universalfeedcreator/constants.php', -+ '5255c38a0faeba867671b61dfda6d864' => '/usr/share/php/random_compat/random.php', + 'decc78cc4436b1292c6c0d151b19445c' => '/usr/share/php/phpseclib/bootstrap.php', ); -diff -ru dokuwiki-2020-07-29--orig/vendor/composer/autoload_namespaces.php dokuwiki-2020-07-29--patched/vendor/composer/autoload_namespaces.php ---- dokuwiki-2020-07-29--orig/vendor/composer/autoload_namespaces.php 2020-07-29 11:35:28.000000000 +0200 -+++ dokuwiki-2020-07-29--patched/vendor/composer/autoload_namespaces.php 2020-08-26 02:16:27.773800910 +0200 -@@ -6,6 +6,6 @@ +diff -r -U4 dokuwiki-2022-07-31--orig/vendor/composer/autoload_namespaces.php dokuwiki-2022-07-31--patched/vendor/composer/autoload_namespaces.php +--- dokuwiki-2022-07-31--orig/vendor/composer/autoload_namespaces.php 2022-07-31 14:00:17.000000000 +0200 ++++ dokuwiki-2022-07-31--patched/vendor/composer/autoload_namespaces.php 2022-09-15 11:26:48.492226235 +0200 +@@ -5,7 +5,7 @@ + $vendorDir = dirname(__DIR__); $baseDir = dirname($vendorDir); return array( @@ -84,42 +86,47 @@ diff -ru dokuwiki-2020-07-29--orig/vendor/composer/autoload_namespaces.php dokuw + 'SimplePie' => array('/usr/share/php/php-simplepie'), + 'EmailAddressValidator' => array('/usr/share/php/php-email-address-validation'), ); -diff -ru dokuwiki-2020-07-29--orig/vendor/composer/autoload_psr4.php dokuwiki-2020-07-29--patched/vendor/composer/autoload_psr4.php ---- dokuwiki-2020-07-29--orig/vendor/composer/autoload_psr4.php 2020-07-29 11:35:28.000000000 +0200 -+++ dokuwiki-2020-07-29--patched/vendor/composer/autoload_psr4.php 2020-08-26 02:02:40.032659437 +0200 -@@ -8,5 +8,5 @@ - return array( +diff -r -U4 dokuwiki-2022-07-31--orig/vendor/composer/autoload_psr4.php dokuwiki-2022-07-31--patched/vendor/composer/autoload_psr4.php +--- dokuwiki-2022-07-31--orig/vendor/composer/autoload_psr4.php 2022-07-31 14:00:17.000000000 +0200 ++++ dokuwiki-2022-07-31--patched/vendor/composer/autoload_psr4.php 2022-09-15 11:26:48.492226235 +0200 +@@ -9,7 +9,7 @@ + 'splitbrain\\slika\\tests\\' => array($vendorDir . '/splitbrain/slika/tests'), + 'splitbrain\\slika\\' => array($vendorDir . '/splitbrain/slika/src'), 'splitbrain\\phpcli\\' => array($vendorDir . '/splitbrain/php-cli/src'), 'splitbrain\\PHPArchive\\' => array($vendorDir . '/splitbrain/php-archive/src'), - 'phpseclib\\' => array($vendorDir . '/phpseclib/phpseclib/phpseclib'), + 'phpseclib\\' => array('/usr/share/php/phpseclib'), + 'IXR\\' => array($vendorDir . '/kissifrot/php-ixr/src'), ); -diff -ru dokuwiki-2020-07-29--orig/vendor/composer/autoload_static.php dokuwiki-2020-07-29--patched/vendor/composer/autoload_static.php ---- dokuwiki-2020-07-29--orig/vendor/composer/autoload_static.php 2020-07-29 11:35:28.000000000 +0200 -+++ dokuwiki-2020-07-29--patched/vendor/composer/autoload_static.php 2020-08-26 02:15:22.848556388 +0200 -@@ -7,9 +7,9 @@ +diff -r -U4 dokuwiki-2022-07-31--orig/vendor/composer/autoload_static.php dokuwiki-2022-07-31--patched/vendor/composer/autoload_static.php +--- dokuwiki-2022-07-31--orig/vendor/composer/autoload_static.php 2022-07-31 14:00:17.000000000 +0200 ++++ dokuwiki-2022-07-31--patched/vendor/composer/autoload_static.php 2022-09-15 11:28:15.564793139 +0200 +@@ -6,10 +6,10 @@ + class ComposerStaticInita19a915ee98347a0c787119619d2ff9b { public static $files = array ( - 'fdc0e9724ddc47859c8bf0c1ea0a623a' => __DIR__ . '/..' . '/openpsa/universalfeedcreator/lib/constants.php', -- '5255c38a0faeba867671b61dfda6d864' => __DIR__ . '/..' . '/paragonie/random_compat/lib/random.php', - 'decc78cc4436b1292c6c0d151b19445c' => __DIR__ . '/..' . '/phpseclib/phpseclib/phpseclib/bootstrap.php', + 'fdc0e9724ddc47859c8bf0c1ea0a623a' => '/usr/share/php/openpsa-universalfeedcreator/constants.php', -+ '5255c38a0faeba867671b61dfda6d864' => '/usr/share/php/random_compat/random.php', + 'decc78cc4436b1292c6c0d151b19445c' => '/usr/share/php/phpseclib/bootstrap.php', ); public static $prefixLengthsPsr4 = array ( -@@ -35,7 +35,7 @@ + 's' => +@@ -47,9 +47,9 @@ + 0 => __DIR__ . '/..' . '/splitbrain/php-archive/src', ), 'phpseclib\\' => array ( - 0 => __DIR__ . '/..' . '/phpseclib/phpseclib/phpseclib', + 0 => '/usr/share/php/phpseclib', ), - ); - -@@ -44,45 +44,45 @@ + 'IXR\\' => + array ( + 0 => __DIR__ . '/..' . '/kissifrot/php-ixr/src', +@@ -60,48 +60,48 @@ + 'S' => array ( 'SimplePie' => array ( @@ -140,6 +147,9 @@ diff -ru dokuwiki-2020-07-29--orig/vendor/composer/autoload_static.php dokuwiki- public static $classMap = array ( - 'AtomCreator03' => __DIR__ . '/..' . '/openpsa/universalfeedcreator/lib/Creator/AtomCreator03.php', - 'AtomCreator10' => __DIR__ . '/..' . '/openpsa/universalfeedcreator/lib/Creator/AtomCreator10.php', ++ 'AtomCreator03' => '/usr/share/php/openpsa-universalfeedcreator/Creator/AtomCreator03.php', ++ 'AtomCreator10' => '/usr/share/php/openpsa-universalfeedcreator/Creator/AtomCreator10.php', + 'Composer\\InstalledVersions' => __DIR__ . '/..' . '/composer/InstalledVersions.php', - 'FeedCreator' => __DIR__ . '/..' . '/openpsa/universalfeedcreator/lib/Creator/FeedCreator.php', - 'FeedDate' => __DIR__ . '/..' . '/openpsa/universalfeedcreator/lib/Element/FeedDate.php', - 'FeedHtmlField' => __DIR__ . '/..' . '/openpsa/universalfeedcreator/lib/Element/FeedHtmlField.php', @@ -164,8 +174,6 @@ diff -ru dokuwiki-2020-07-29--orig/vendor/composer/autoload_static.php dokuwiki- - 'lessc_formatter_compressed' => __DIR__ . '/..' . '/marcusschwarz/lesserphp/lessc.inc.php', - 'lessc_formatter_lessjs' => __DIR__ . '/..' . '/marcusschwarz/lesserphp/lessc.inc.php', - 'lessc_parser' => __DIR__ . '/..' . '/marcusschwarz/lesserphp/lessc.inc.php', -+ 'AtomCreator03' => '/usr/share/php/openpsa-universalfeedcreator/Creator/AtomCreator03.php', -+ 'AtomCreator10' => '/usr/share/php/openpsa-universalfeedcreator/Creator/AtomCreator10.php', + 'FeedCreator' => '/usr/share/php/openpsa-universalfeedcreator/Creator/FeedCreator.php', + 'FeedDate' => '/usr/share/php/openpsa-universalfeedcreator/Element/FeedDate.php', + 'FeedHtmlField' => '/usr/share/php/openpsa-universalfeedcreator/Element/FeedHtmlField.php', @@ -193,3 +201,4 @@ diff -ru dokuwiki-2020-07-29--orig/vendor/composer/autoload_static.php dokuwiki- ); public static function getInitializer(ClassLoader $loader) + { diff --git a/dokuwiki.spec b/dokuwiki.spec index 01f4160..1db53c8 100644 --- a/dokuwiki.spec +++ b/dokuwiki.spec @@ -2,10 +2,10 @@ Name: dokuwiki Summary: Standards compliant simple to use wiki License: GPLv2 -%global releasenum 2020-07-29 -%global releasetag %(rel=%{releasenum}; echo ${rel//-/}) +%global releasenum 2022-07-31a +%global releasetag %(rel="%{releasenum}"; echo "${rel//-/}") Version: %{releasetag} -Release: 6%{?dist} +Release: 1%{?dist} URL: https://www.dokuwiki.org/dokuwiki Source0: https://download.dokuwiki.org/src/%{name}/%{name}-%{releasenum}.tgz @@ -23,11 +23,16 @@ Requires: php-composer(aziraphale/email-address-validator) >= 2.0.1 # dokuwiki relies on a certain bugfix backported into geshi/geshi, # hence the requirement also includes the RPM release number Requires: php-composer(geshi/geshi) >= 1.0.9.1-5 -Requires: php-composer(marcusschwarz/lesserphp) -Requires: php-composer(openpsa/universalfeedcreator) -Requires: php-composer(paragonie/random_compat) -Requires: php-composer(phpseclib/phpseclib) -Requires: php-composer(simplepie/simplepie) +Requires: php-composer(marcusschwarz/lesserphp) >= 0.5.5 +Requires: php-composer(openpsa/universalfeedcreator) >= 1.8.4.1 +Requires: php-composer(phpseclib/phpseclib) >= 2.0.31 +Requires: php-composer(simplepie/simplepie) >= 1.5.6 + +# TODO: Unbundle these, duh +Provides: bundled(php-kissifrot-php-ixr) = 1.8.3 +Provides: bundled(php-splitbrain-php-archive) = 1.2.1 +Provides: bundled(php-splitbrain-php-cli) = 1.1.8 +Provides: bundled(php-splitbrain-slika) = 1.0.5 %description @@ -62,8 +67,6 @@ rm -r vendor/geshi rm -r vendor/marcusschwarz # universalfeedcreator rm -r vendor/openpsa -# random_compat -rm -r vendor/paragonie # phpseclib rm -r vendor/phpseclib # simplepie @@ -214,6 +217,11 @@ fi %doc DOKUWIKI-SELINUX.README %changelog +* Thu Sep 15 2022 Artur Frenszek-Iwicki - 20220731a-1 +- Update to latest upstream release (2022-07-31a "Igor") +- Add minimum versions for all dependencies +- Add "Provides: bundled()" for not-yet-unbundled libraries + * Thu Jul 21 2022 Fedora Release Engineering - 20200729-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild diff --git a/sources b/sources index 94aa998..48e4edd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (dokuwiki-2020-07-29.tgz) = 093474bf5d5bb2c95400692927cbc8ffbe7666f178ffaa648a043ef05a2b32471feeed5de282c36b41e6e80e0a065909ea2ced8ecffc7fb339bda902697d596c +SHA512 (dokuwiki-2022-07-31a.tgz) = 894edee7c141362220315abb9c12a1f513911583114491e51a0bb2ae6176719c87c57ba7273431964f010804f3c32b6c13e5d1ad6e4a93da04c1b990a33c5a6f