From 8ea32e66b63784e926da0cc9d5c06beb8f409e7d Mon Sep 17 00:00:00 2001 From: Artur Frenszek-Iwicki Date: Oct 10 2022 20:11:37 +0000 Subject: Unbundle libraries --- diff --git a/dokuwiki-rm-bundled-libs.patch b/dokuwiki-rm-bundled-libs.patch index 636c71e..f23024f 100644 --- a/dokuwiki-rm-bundled-libs.patch +++ b/dokuwiki-rm-bundled-libs.patch @@ -88,20 +88,28 @@ diff -r -U4 dokuwiki-2022-07-31--orig/vendor/composer/autoload_namespaces.php do ); 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'), ++++ dokuwiki-2022-07-31--patched/vendor/composer/autoload_psr4.php 2022-10-10 21:53:08.825874873 +0200 +@@ -5,11 +5,10 @@ + $vendorDir = dirname(__DIR__); + $baseDir = dirname($vendorDir); + + return array( +- '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'), +- 'IXR\\' => array($vendorDir . '/kissifrot/php-ixr/src'), ++ 'splitbrain\\slika\\' => array('/usr/share/php/splitbrain/slika'), ++ 'splitbrain\\phpcli\\' => array('/usr/share/php/splitbrain/phpcli'), ++ 'splitbrain\\PHPArchive\\' => array('/usr/share/php/splitbrain/PHPAchive'), + 'phpseclib\\' => array('/usr/share/php/phpseclib'), - 'IXR\\' => array($vendorDir . '/kissifrot/php-ixr/src'), ++ 'IXR\\' => array('/usr/share/php/kissifrot/IXR'), ); 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 @@ ++++ dokuwiki-2022-07-31--patched/vendor/composer/autoload_static.php 2022-10-10 21:57:16.947572123 +0200 +@@ -6,16 +6,15 @@ class ComposerStaticInita19a915ee98347a0c787119619d2ff9b { @@ -114,8 +122,35 @@ diff -r -U4 dokuwiki-2022-07-31--orig/vendor/composer/autoload_static.php dokuwi public static $prefixLengthsPsr4 = array ( 's' => -@@ -47,9 +47,9 @@ - 0 => __DIR__ . '/..' . '/splitbrain/php-archive/src', + array ( +- 'splitbrain\\slika\\tests\\' => 23, + 'splitbrain\\slika\\' => 17, + 'splitbrain\\phpcli\\' => 18, + 'splitbrain\\PHPArchive\\' => 22, + ), +@@ -29,79 +28,75 @@ + ), + ); + + public static $prefixDirsPsr4 = array ( +- 'splitbrain\\slika\\tests\\' => +- array ( +- 0 => __DIR__ . '/..' . '/splitbrain/slika/tests', +- ), + 'splitbrain\\slika\\' => + array ( +- 0 => __DIR__ . '/..' . '/splitbrain/slika/src', ++ 0 => '/usr/share/php/splitbrain/slika', + ), + 'splitbrain\\phpcli\\' => + array ( +- 0 => __DIR__ . '/..' . '/splitbrain/php-cli/src', ++ 0 => '/usr/share/php/splitbrain/phpcli', + ), + 'splitbrain\\PHPArchive\\' => + array ( +- 0 => __DIR__ . '/..' . '/splitbrain/php-archive/src', ++ 0 => '/usr/share/php/splitbrain/PHPArchive', ), 'phpseclib\\' => array ( @@ -124,8 +159,12 @@ diff -r -U4 dokuwiki-2022-07-31--orig/vendor/composer/autoload_static.php dokuwi ), 'IXR\\' => array ( - 0 => __DIR__ . '/..' . '/kissifrot/php-ixr/src', -@@ -60,48 +60,48 @@ +- 0 => __DIR__ . '/..' . '/kissifrot/php-ixr/src', ++ 0 => '/usr/share/php/kissifrot/IXR', + ), + ); + + public static $prefixesPsr0 = array ( 'S' => array ( 'SimplePie' => diff --git a/dokuwiki.spec b/dokuwiki.spec index 1db53c8..4722d03 100644 --- a/dokuwiki.spec +++ b/dokuwiki.spec @@ -5,7 +5,7 @@ License: GPLv2 %global releasenum 2022-07-31a %global releasetag %(rel="%{releasenum}"; echo "${rel//-/}") Version: %{releasetag} -Release: 1%{?dist} +Release: 2%{?dist} URL: https://www.dokuwiki.org/dokuwiki Source0: https://download.dokuwiki.org/src/%{name}/%{name}-%{releasenum}.tgz @@ -23,16 +23,14 @@ 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(kissifrot/php-ixr) >= 1.8.3 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 +Requires: php-composer(splitbrain/php-archive) >= 1.2.1 +Requires: php-composer(splitbrain/php-cli) >= 1.1.8 +Requires: php-composer(splitbrain/slika) >= 1.0.5 %description @@ -60,17 +58,31 @@ Configures DokuWiki to run in SELinux enabled environments. # Remove bundled code that's available as Fedora packages # email-address-validator -rm -r vendor/aziraphale +rm -r vendor/aziraphale/email-address-validator +rmdir vendor/aziraphale || true # geshi -rm -r vendor/geshi +rm -r vendor/geshi/geshi +rmdir vendor/geshi || true +# kissifrot/php-ixr +rm -r vendor/kissifrot/php-ixr +rmdir vendor/kissifrot || true # lesserphp -rm -r vendor/marcusschwarz +rm -r vendor/marcusschwarz/lesserphp +rmdir vendor/marcusschwarz || true # universalfeedcreator -rm -r vendor/openpsa +rm -r vendor/openpsa/universalfeedcreator +rmdir vendor/openpsa || true # phpseclib -rm -r vendor/phpseclib +rm -r vendor/phpseclib/phpseclib +rmdir vendor/phpseclib || true # simplepie -rm -r vendor/simplepie +rm -r vendor/simplepie/simplepie +rmdir vendor/simplepie || true +# splitbrain/php-archive, splitbrain/php-cli, splitbrain/slika +rm -r vendor/splitbrain/php-archive +rm -r vendor/splitbrain/php-cli +rm -r vendor/splitbrain/slika +rmdir vendor/splitbrain || true %patch1 -p1 -b .bundled @@ -217,6 +229,12 @@ fi %doc DOKUWIKI-SELINUX.README %changelog +* Mon Oct 10 2022 Artur Frenszek-Iwicki - 20220731a-2 +- Unbundle php-splitbrain-php-archive +- Unbundle php-splitbrain-php-cli +- Unbundle php-splitbrain-slika +- Unbundle php-kissifrot-php-ixr + * Thu Sep 15 2022 Artur Frenszek-Iwicki - 20220731a-1 - Update to latest upstream release (2022-07-31a "Igor") - Add minimum versions for all dependencies