]> git.pld-linux.org Git - packages/dokuwiki.git/blobdiff - dokuwiki.spec
projects / packages / dokuwiki.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
package vendor/composer/installed.json
[packages/dokuwiki.git] / dokuwiki.spec
diff --git a/dokuwiki.spec b/dokuwiki.spec
index 679ed1ba130b8b97ba537d5acf1571342ef12478..36b5910eb3408035daaa7fdd464f6415bf041869 100644 (file)
--- a/dokuwiki.spec
+++ b/dokuwiki.spec
@@ -1,4 +1,4 @@
-%define                subver  2015-08-10a
+%define                subver  2017-02-19c
 %define                ver             %(echo %{subver} | tr -d -)
 #define                snap    1
 #define                rc_     1
@@ -8,12 +8,12 @@ Summary:      PHP-based Wiki webapplication
 Summary(pl.UTF-8):     Aplikacja WWW Wiki oparta na PHP
 Name:          dokuwiki
 Version:       %{ver}
-Release:       0.3
+Release:       0.5
 License:       GPL v2
 Group:         Applications/WWW
-# Source0Download: http://download.dokuwiki.org/archive
-Source0:       http://download.dokuwiki.org/src/dokuwiki/%{name}-%{subver}.tgz
-# Source0-md5: a4b8ae00ce94e42d4ef52dd8f4ad30fe
+# Source0Download: https://download.dokuwiki.org/archive
+Source0:       https://download.dokuwiki.org/src/dokuwiki/%{name}-%{subver}.tgz
+# Source0-md5: 324ae70a6322057604edc04b39c9b334
 Source1:       %{name}-apache.conf
 Source2:       %{name}-lighttpd.conf
 Source3:       http://glen.alkohol.ee/pld/jude.png
@@ -28,34 +28,28 @@ Source9:    http://trac.edgewall.org/export/9404/trunk/doc/trac_icon_16x16.png
 Source10:      pld.gif
 Source11:      http://glen.alkohol.ee/pld/astah.png
 # Source11-md5:        b1c999e6988440c9e2af6a12e9a56451
+Source12:      gitlab.png
+# Source12-md5:        619cec6f2b083269b1ec9cd50d9e6ef2
+Source13:      http://mirrors.jenkins-ci.org/art/jenkins-logo/16x16/headshot.png?/jenkins.png
+# Source13-md5:        ae892e4ca43ffab88f6e3dca951f3e8a
 Patch66:       %{name}-config.patch
 Patch0:                %{name}-paths.patch
-Patch1:                system-jquery.patch
 Patch2:                style-width.patch
 Patch4:                %{name}-geshi.patch
 Patch5:                %{name}-http_auth-option.patch
 Patch8:                %{name}-notify-respect-minor.patch
 Patch10:       %{name}-mailtext.patch
 Patch11:       %{name}-notifyns.patch
-Patch15:       simplepie.patch
 Patch19:       pld-branding.patch
 Patch20:       fixprivilegeescalationbug.diff
 Patch21:       task-1821.patch
-Patch22:       adldap.patch
 Patch24:       more-buttons.patch
-Patch25:       system-phpseclib.patch
 Patch26:       system-lessphp.patch
 Patch27:       iconsizes-dump.patch
 URL:           https://www.dokuwiki.org/
 BuildRequires: fslint
 BuildRequires: rpm-php-pearprov >= 4.4.2-11
 BuildRequires: rpmbuild(macros) >= 1.693
-Requires:      jquery >= 1.8
-#Requires:     jquery >= 1.9.1
-Requires:      jquery-cookie
-#Requires:     jquery-migrate
-#Requires:     jquery-ui >= 1.10.2
-Requires:      jquery-ui >= 1.8
 Requires:      lessphp >= 0.3.9
 Requires:      php(core) >= %{php_min_version}
 Requires:      php(session)
@@ -68,9 +62,11 @@ Requires:    webserver(access)
 Requires:      webserver(alias)
 Requires:      webserver(php)
 Suggests:      php(gd)
-Suggests:      php-adldap >= 4.0.4
 Obsoletes:     dokuwiki-plugin-jquery
+Obsoletes:     dokuwiki-plugin-showlogin2
+Conflicts:     dokuwiki-plugin-gallery < 20161222
 Conflicts:     dokuwiki-plugin-icalevents < 20120909
+Conflicts:     dokuwiki-plugin-odt < 20170218
 # can use gz compression to store attic pages
 Suggests:      php(zlib)
 BuildArch:     noarch
@@ -84,7 +80,7 @@ BuildRoot:    %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %define                _cachedir               /var/cache/%{name}
 %define                find_lang       %{_usrlibrpm}/dokuwiki-find-lang.sh %{buildroot}
 
-%define                _noautoreq_pear /usr/share/php/geshi.php /usr/share/php/adLDAP/.*
+%define                _noautoreq_pear /usr/share/php/geshi.php
 
 # exclude optional php dependencies
 %define                _noautophp      php-bzip2 php-bcmath php-zip php-date php-ftp php-hash php-ldap php-mbstring php-mysql php-pgsql php-tokenizer
@@ -135,20 +131,16 @@ test -e data/pages/playground/playground.txt || \
 echo '====== PlayGround ======' >  data/pages/playground/playground.txt
 
 %patch0 -p1
-%patch1 -p1
 %patch2 -p1
 %patch4 -p1
 %patch5 -p1
 %patch8 -p1
 %patch10 -p1
 %patch11 -p1
-%patch15 -p1
 %patch19 -p1
 %patch20 -p1
 %patch21 -p1
-%patch22 -p1
 %patch24 -p1
-%patch25 -p1
 %patch26 -p1
 %patch27 -p1
 
@@ -169,39 +161,25 @@ find -name _dummy | xargs %{__rm}
 # source for security.png
 %{__rm} data/security.xcf
 
+%{__rm} lib/scripts/jquery/update.sh
+
 # use system geshi package
 %{__rm} -r vendor/easybook/geshi
 rmdir vendor/easybook
 
-# use system adldap package
-%{__rm} -r lib/plugins/authad/adLDAP
-
 # use system simplepie package
-%{__rm} inc/SimplePie.php
+#%{__rm} inc/SimplePie.php
 
 # use system lessphp package
 %{__rm} inc/lessc.inc.php
 
-# use system lib
-%{__rm} -r inc/phpseclib
-
 # flash source on git tarballs
 rm -rf lib/plugins/testing
 rm -rf lib/plugins/*/_test
 
-# use system packages
-%{__rm} lib/scripts/jquery/update.sh
-%{__rm} lib/scripts/jquery/jquery-ui.js
-%{__rm} lib/scripts/jquery/jquery-ui.min.js
-%{__rm} lib/scripts/jquery/jquery.cookie.js
-%{__rm} lib/scripts/jquery/jquery.js
-%{__rm} lib/scripts/jquery/jquery.min.js
-%{__rm} lib/scripts/jquery/jquery-migrate.js
-%{__rm} lib/scripts/jquery/jquery-migrate.min.js
-%{__rm} -r lib/scripts/jquery/jquery-ui-theme
-
 # pagetools - tools for development
-%{__rm} -r lib/tpl/dokuwiki/images/pagetools*
+%{__rm} -r lib/tpl/dokuwiki/images/pagetools
+%{__rm} lib/tpl/dokuwiki/images/pagetools-build*
 
 # cleanup backups after patching
 find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f
@@ -215,16 +193,17 @@ fi
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_sysconfdir}/{lang,plugin_lang},%{_localstatedir},%{_cachedir},%{_appdir}/{bin,inc,lib}}
+install -d $RPM_BUILD_ROOT{%{_sysconfdir}/{lang,plugin_lang},%{_localstatedir},%{_cachedir},%{_appdir}}
 
 # hardlink test
 cp -al VERSION $RPM_BUILD_ROOT%{_appdir} 2>/dev/null && l=l
 
 cp -a$l *.php $RPM_BUILD_ROOT%{_appdir}
 cp -p$l VERSION $RPM_BUILD_ROOT%{_appdir}
-cp -a$l bin/* $RPM_BUILD_ROOT%{_appdir}/bin
-cp -a$l inc/* $RPM_BUILD_ROOT%{_appdir}/inc
-cp -a$l lib/* $RPM_BUILD_ROOT%{_appdir}/lib
+cp -a$l bin $RPM_BUILD_ROOT%{_appdir}
+cp -a$l inc $RPM_BUILD_ROOT%{_appdir}
+cp -a$l lib $RPM_BUILD_ROOT%{_appdir}
+cp -a$l vendor $RPM_BUILD_ROOT%{_appdir}
 cp -a$l conf/* $RPM_BUILD_ROOT%{_sysconfdir}
 cp -a$l data/* $RPM_BUILD_ROOT%{_localstatedir}
 touch $RPM_BUILD_ROOT%{_sysconfdir}/acronyms.local.conf
@@ -245,6 +224,8 @@ cp -p %{SOURCE7} $RPM_BUILD_ROOT%{_appdir}/lib/images/interwiki/cacti.gif
 cp -p %{SOURCE8} $RPM_BUILD_ROOT%{_appdir}/lib/images/interwiki/nagios.gif
 cp -p %{SOURCE9} $RPM_BUILD_ROOT%{_appdir}/lib/images/interwiki/trac.png
 cp -p %{SOURCE10} $RPM_BUILD_ROOT%{_appdir}/lib/images/interwiki/pld.gif
+cp -p %{SOURCE12} $RPM_BUILD_ROOT%{_appdir}/lib/images/interwiki/gitlab.png
+cp -p %{SOURCE13} $RPM_BUILD_ROOT%{_appdir}/lib/images/interwiki/jenkins.png
 
 cp -p %{SOURCE3} $RPM_BUILD_ROOT%{_appdir}/lib/images/fileicons/jude.png
 cp -p %{SOURCE11} $RPM_BUILD_ROOT%{_appdir}/lib/images/fileicons/asta.png
@@ -369,8 +350,29 @@ exit 0
 %{_appdir}/inc/*.php
 %{_appdir}/inc/preload.php.dist
 %{_appdir}/inc/Form
+%{_appdir}/inc/Ui
 %{_appdir}/inc/parser
 
+# composer generated vendor autoload
+%dir %{_appdir}/vendor
+%{_appdir}/vendor/README
+%{_appdir}/vendor/autoload.php
+%{_appdir}/vendor/composer
+
+# bundled packages
+# verbose files to detect new addons
+%dir %{_appdir}/vendor/splitbrain
+%{_appdir}/vendor/splitbrain/php-archive
+
+%dir %{_appdir}/vendor/paragonie
+%{_appdir}/vendor/paragonie/random_compat
+
+%dir %{_appdir}/vendor/phpseclib
+%{_appdir}/vendor/phpseclib/phpseclib
+
+%dir %{_appdir}/vendor/simplepie
+%{_appdir}/vendor/simplepie/simplepie
+
 %dir %{_appdir}/lib
 # allow plugins dir permission change to allow installation of plugins from admin
 # however does not work with rpm 4.5
@@ -383,6 +385,7 @@ exit 0
 %dir %{_appdir}/lib/plugins/authad
 %{_appdir}/lib/plugins/authad/*.php
 %{_appdir}/lib/plugins/authad/*.txt
+%{_appdir}/lib/plugins/authad/adLDAP
 %{_appdir}/lib/plugins/authad/conf
 %dir %{_appdir}/lib/plugins/authldap
 %{_appdir}/lib/plugins/authldap/*.php
@@ -392,6 +395,11 @@ exit 0
 %{_appdir}/lib/plugins/authmysql/*.php
 %{_appdir}/lib/plugins/authmysql/*.txt
 %{_appdir}/lib/plugins/authmysql/conf
+%dir %{_appdir}/lib/plugins/authpdo
+%{_appdir}/lib/plugins/authpdo/*.php
+%{_appdir}/lib/plugins/authpdo/*.txt
+%{_appdir}/lib/plugins/authpdo/README
+%{_appdir}/lib/plugins/authpdo/conf
 %{_appdir}/lib/plugins/authpgsql/*.php
 %{_appdir}/lib/plugins/authpgsql/conf
 %{_appdir}/lib/plugins/authpgsql/*.txt
@@ -464,3 +472,5 @@ exit 0
 %files setup
 %defattr(644,root,root,755)
 %{_appdir}/install.php
+
+
PHP-based Wiki webapplication
This page took 0.079018 seconds and 4 git commands to generate.