[packages/eventum/dev-3.0: 7/7] update cli install

glen glen at pld-linux.org
Tue Feb 3 01:49:30 CET 2015


commit 4a74b463ecf90e291df0c7ad83d01fa9312bde52
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Mon Feb 2 22:05:00 2015 +0200

    update cli install

 eventum.spec | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)
---
diff --git a/eventum.spec b/eventum.spec
index 92cb7cb..eab9fe8 100644
--- a/eventum.spec
+++ b/eventum.spec
@@ -397,6 +397,7 @@ Summary(pl.UTF-8):	Interfejs linii poleceń dla Eventum
 Group:		Applications/WWW
 Requires:	%{name}-base = %{version}-%{release}
 Requires:	php(core) >= %{php_min_version}
+Requires:	php(phar)
 Requires:	php-pear-XML_RPC
 
 %description cli
@@ -509,7 +510,7 @@ install -d \
 	$RPM_BUILD_ROOT%{_appdir}/{include,htdocs/misc,upgrade} \
 	$RPM_BUILD_ROOT%{systemdtmpfilesdir}
 
-%{__make} install-eventum install-irc install-scm install-jpgraph install-localization \
+%{__make} install-eventum install-cli install-irc install-scm install-jpgraph install-localization \
 	sysconfdir=%{_webappdir} \
 	localedir=%{_localedir} \
 	DESTDIR=$RPM_BUILD_ROOT
@@ -550,10 +551,6 @@ cp -p %{SOURCE17} $RPM_BUILD_ROOT%{systemdtmpfilesdir}/%{name}.conf
 # scm
 cp -p %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/scm.php
 
-# skip pear for cli
-#rm -r $RPM_BUILD_ROOT%{_datadir}/%{name}/cli
-#cp -a cli/lib/eventum $RPM_BUILD_ROOT%{_datadir}/%{name}/cli
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -762,8 +759,7 @@ done
 %files cli
 %defattr(644,root,root,755)
 %doc cli/eventumrc
-#%attr(755,root,root) %{_bindir}/%{name}
-#%{_appdir}/cli
+%attr(755,root,root) %{_bindir}/%{name}
 
 %files scm
 %defattr(644,root,root,755)
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/eventum.git/commitdiff/4a74b463ecf90e291df0c7ad83d01fa9312bde52



More information about the pld-cvs-commit mailing list