[packages/dokuwiki] package vendor; rel 1

glen glen at pld-linux.org
Fri Sep 25 21:29:11 CEST 2015


commit a1fe08cfa9e0ff718ac88db3c3572772fb8fdeb8
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Fri Sep 25 22:28:51 2015 +0300

    package vendor; rel 1

 dokuwiki.spec | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)
---
diff --git a/dokuwiki.spec b/dokuwiki.spec
index 679ed1b..f87aedc 100644
--- a/dokuwiki.spec
+++ b/dokuwiki.spec
@@ -8,7 +8,7 @@ Summary:	PHP-based Wiki webapplication
 Summary(pl.UTF-8):	Aplikacja WWW Wiki oparta na PHP
 Name:		dokuwiki
 Version:	%{ver}
-Release:	0.3
+Release:	1
 License:	GPL v2
 Group:		Applications/WWW
 # Source0Download: http://download.dokuwiki.org/archive
@@ -215,16 +215,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
@@ -371,6 +372,16 @@ exit 0
 %{_appdir}/inc/Form
 %{_appdir}/inc/parser
 
+# composer generated vendor autoload
+%dir %{_appdir}/vendor
+%{_appdir}/vendor/README
+%{_appdir}/vendor/autoload.php
+%{_appdir}/vendor/composer
+
+# bundled packages
+%dir %{_appdir}/vendor/splitbrain
+%{_appdir}/vendor/splitbrain/php-archive
+
 %dir %{_appdir}/lib
 # allow plugins dir permission change to allow installation of plugins from admin
 # however does not work with rpm 4.5
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/dokuwiki.git/commitdiff/a1fe08cfa9e0ff718ac88db3c3572772fb8fdeb8



More information about the pld-cvs-commit mailing list