commit 61e95c9ffb5c04c1089782f864ecc569384ab716
Author: Jakub Bogusz <[email protected]>
Date: Thu May 24 21:47:22 2018 +0200
- new URLs, up to 1.15
- updated Makefile patch
yubikey-ksm-Makefile.patch | 22 +++++++++++-----------
yubikey-ksm.spec | 34 ++++++++++++++++++++++------------
2 files changed, 33 insertions(+), 23 deletions(-)
---
diff --git a/yubikey-ksm.spec b/yubikey-ksm.spec
index df557cf..83a620c 100644
--- a/yubikey-ksm.spec
+++ b/yubikey-ksm.spec
@@ -1,30 +1,38 @@
+%include /usr/lib/rpm/macros.php
Summary: The YubiKey Key Storage Module
+Summary(pl.UTF-8): YubiKey Key Storage Module - moduł przechowywania kluczy
Name: yubikey-ksm
-Version: 1.5
+Version: 1.15
Release: 0.1
License: BSD
Group: Applications/System
-URL: http://code.google.com/p/yubikey-ksm/
-Source0: http://yubikey-ksm.googlecode.com/files/%{name}-%{version}.tgz
+Source0:
https://developers.yubico.com/yubikey-ksm/Releases/%{name}-%{version}.tgz
+# Source0-md5: b1040524edb0b52899154920716f3f66
Patch0: %{name}-Makefile.patch
-BuildRequires: perl-generators
+URL: https://developers.yubico.com/yubikey-ksm/
+BuildRequires: rpm-php-pearprov >= 4.4.2-11
+BuildRequires: rpmbuild(macros) >= 1.654
Requires: php(core)
Requires: php(mcrypt)
Requires: php(pdo)
BuildArch: noarch
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+%define _noautoreq_pear ykksm-.*
+
%description
The YubiKey Key Storage Module (YK-KSM) provides a AES key storage
facility for use with a YubiKey validation server.
+%description -l pl.UTF-8
+YubiKey Key Storage Module (YK-KSM) pozwala na przechowywanie kluczy
+AES w użyciu wraz z serwerem sprawdzających poprawność YubiKey.
+
%prep
%setup -q
-%patch0 -p0
+%patch0 -p1
cp .htaccess htaccess
-%build
-
%install
rm -rf $RPM_BUILD_ROOT
@@ -32,18 +40,20 @@ rm -rf $RPM_BUILD_ROOT
etcprefix=$RPM_BUILD_ROOT%{_sysconfdir}/ykksm \
binprefix=$RPM_BUILD_ROOT%{_bindir} \
phpprefix=$RPM_BUILD_ROOT%{_datadir}/ykksm \
+ manprefix=$RPM_BUILD_ROOT%{_mandir}/man1 \
docprefix=$RPM_BUILD_ROOT%{_docdir}/ykksm
-rm -rf $RPM_BUILD_ROOT%{_docdir}
-rm -rf $RPM_BUILD_ROOT%{_datadir}/ykksm/.htaccess
+%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/ykksm
+%{__rm} $RPM_BUILD_ROOT%{_datadir}/ykksm/.htaccess
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
-%config(noreplace) %{_sysconfdir}/ykksm/ykksm-config.php
-%dir %{_sysconfdir}/ykksm/
+%doc ChangeLog NEWS README doc/*.txt ykksm-db.sql htaccess
+%dir %{_sysconfdir}/ykksm
+%config(noreplace) %verify(not md5 mtime size)
%{_sysconfdir}/ykksm/ykksm-config.php
%attr(755,root,root) %{_bindir}/ykksm-*
%{_datadir}/ykksm
-%doc doc/* ykksm-db.sql htaccess
+%{_mandir}/man1/ykksm-*.1*
diff --git a/yubikey-ksm-Makefile.patch b/yubikey-ksm-Makefile.patch
index 68c93a0..9d07270 100644
--- a/yubikey-ksm-Makefile.patch
+++ b/yubikey-ksm-Makefile.patch
@@ -1,11 +1,11 @@
---- Makefile.orig 2010-08-31 09:47:45.621122489 -0500
-+++ Makefile 2010-08-31 09:47:57.117377617 -0500
-@@ -58,7 +58,7 @@
- install -D ykksm-import.pl $(binprefix)/ykksm-import
- install -D ykksm-export.pl $(binprefix)/ykksm-export
- install -D ykksm-checksum.pl $(binprefix)/ykksm-checksum
-- install -D --backup --mode 640 --group $(wwwgroup) ykksm-config.php
$(etcprefix)/ykksm-config.php
-+ install -D --backup --mode 640 ykksm-config.php
$(etcprefix)/ykksm-config.php
- install -D ykksm-db.sql $(docprefix)/ykksm-db.sql
- install -D Makefile $(docprefix)/ykksm.mk
- install -D $(DOCS) $(docprefix)/
+--- yubikey-ksm-1.15/Makefile.orig 2018-05-24 21:42:02.222914802 +0200
++++ yubikey-ksm-1.15/Makefile 2018-05-24 21:42:57.299580841 +0200
+@@ -61,7 +61,7 @@
+ install -D ykksm-import $(DESTDIR)$(binprefix)/ykksm-import
+ install -D ykksm-export $(DESTDIR)$(binprefix)/ykksm-export
+ install -D ykksm-checksum $(DESTDIR)$(binprefix)/ykksm-checksum
+- install -D --backup --mode 640 --group $(wwwgroup) ykksm-config.php
$(DESTDIR)$(etcprefix)/ykksm-config.php
++ install -D --mode 640 ykksm-config.php
$(DESTDIR)$(etcprefix)/ykksm-config.php
+ install -D ykksm-gen-keys.1 $(DESTDIR)$(manprefix)/ykksm-gen-keys.1
+ install -D ykksm-import.1 $(DESTDIR)$(manprefix)/ykksm-import.1
+ install -D ykksm-export.1 $(DESTDIR)$(manprefix)/ykksm-export.1
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/yubikey-ksm.git/commitdiff/61e95c9ffb5c04c1089782f864ecc569384ab716
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
