package vendor/composer/installed.json

[packages/dokuwiki.git] / dokuwiki.spec

diff --git a/dokuwiki.spec b/dokuwiki.spec
index 46fa610111373cb4b8a6fa0e9bfb98b3f89fdbaf..36b5910eb3408035daaa7fdd464f6415bf041869 100644 (file)
--- a/dokuwiki.spec
+++ b/dokuwiki.spec
@@ -1,4 +1,4 @@
-%define                subver  2017-02-19b
+%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.1
+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: ea11e4046319710a2bc6fdf58b5cda86
+# 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
@@ -43,7 +43,6 @@ Patch11:      %{name}-notifyns.patch
 Patch19:       pld-branding.patch
 Patch20:       fixprivilegeescalationbug.diff
 Patch21:       task-1821.patch
-Patch22:       adldap.patch
 Patch24:       more-buttons.patch
 Patch26:       system-lessphp.patch
 Patch27:       iconsizes-dump.patch
@@ -63,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
@@ -79,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
@@ -139,7 +140,6 @@ echo '====== PlayGround ======' >  data/pages/playground/playground.txt
 %patch19 -p1
 %patch20 -p1
 %patch21 -p1
-%patch22 -p1
 %patch24 -p1
 %patch26 -p1
 %patch27 -p1
@@ -161,16 +161,12 @@ find -name _dummy | xargs %{__rm}
 # source for security.png
 %{__rm} data/security.xcf
 
-%{__rm} vendor/composer/installed.json
 %{__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
 
@@ -389,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