[packages/yubikey-val] pldize; adapter

glen glen at pld-linux.org
Tue Jan 31 00:41:12 CET 2017


commit f9b176515d801522aac63181d04af4ec169057c5
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Tue Jan 31 01:40:55 2017 +0200

    pldize; adapter

 yubikey-val.spec | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)
---
diff --git a/yubikey-val.spec b/yubikey-val.spec
index 78b4ab7..b4cd015 100644
--- a/yubikey-val.spec
+++ b/yubikey-val.spec
@@ -1,15 +1,23 @@
+%include	/usr/lib/rpm/macros.php
 Summary:	The YubiKey Validation Server
 Name:		yubikey-val
 Version:	2.10
 Release:	0.1
 License:	BSD
 Group:		Applications/System
-URL:		http://code.google.com/p/yubikey-val-server-php/
+# FIXME: no source0
 Source0:	http://yubikey-val-server-php.googlecode.com/files/%{name}-%{version}.tgz
+URL:		http://code.google.com/p/yubikey-val-server-php/
 Patch0:		%{name}-Makefile.patch
+BuildRequires:	rpm-php-pearprov >= 4.4.2-11
+BuildRequires:	rpmbuild(macros) >= 1.654
+Requires:	php(core)
+Requires:	php(curl)
+Requires:	php(mcrypt)
+Requires:	php(pdo)
+Requires:	php-pear
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-Requires:	php(core) Requires: php-mcrypt Requires: php-curl Requires: php-pear Requires: php-pdo
 
 %description
 This is a server that validates Yubikey OTPs. It is written in PHP,
@@ -32,7 +40,7 @@ rm -rf $RPM_BUILD_ROOT
 	docprefix=$RPM_BUILD_ROOT%{_docdir}/ykval \
 	muninprefix=$RPM_BUILD_ROOT%{_datadir}/munin/plugins
 
-rm -rf $RPM_BUILD_ROOT%{_docdir}
+rm -r $RPM_BUILD_ROOT%{_docdir}
 mv $RPM_BUILD_ROOT%{_sysconfdir}/ykval/ykval-config.php-template $RPM_BUILD_ROOT%{_sysconfdir}/ykval/ykval-config.php
 
 %clean
@@ -41,7 +49,7 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc doc/* ykval-db.sql
+%dir %{_sysconfdir}/ykval
 %config(noreplace) %{_sysconfdir}/ykval/ykval-config.php
-%dir %{_sysconfdir}/ykval/
-%{_datadir}/ykval/
 %attr(755,root,root) %{_sbindir}/*
+%{_datadir}/ykval
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/yubikey-val.git/commitdiff/f9b176515d801522aac63181d04af4ec169057c5



More information about the pld-cvs-commit mailing list