summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2015-05-18 17:09:36 +0200
committerRemi Collet <fedora@famillecollet.com>2015-05-18 17:09:36 +0200
commit712f0ad613ddaea5edf10fbb2f9f87d90a39f819 (patch)
treea61d7a5a620d2263d761ae5b31a0ee467d390a42
parent5af1f8effd032a893f42b256595fe16a2d27e5f5 (diff)
php-pear-Auth-Yubico: 2.5 (backport)HEADmaster
-rw-r--r--Makefile2
-rw-r--r--php-pear-Auth-Yubico.spec18
2 files changed, 14 insertions, 6 deletions
diff --git a/Makefile b/Makefile
index 1e65467..13af741 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
SRCDIR := $(shell pwd)
NAME := $(shell basename $(SRCDIR))
-include ../common/Makefile
+include ../../../common/Makefile
diff --git a/php-pear-Auth-Yubico.spec b/php-pear-Auth-Yubico.spec
index e84efe9..6d0aab2 100644
--- a/php-pear-Auth-Yubico.spec
+++ b/php-pear-Auth-Yubico.spec
@@ -1,16 +1,20 @@
-%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
+# remirepo spec file for php-pear-Auth-Yubico, from Fedora
+
+%{!?__pear: %global __pear %{_bindir}/pear}
+%{!?pear_metadir: %global pear_metadir %{pear_phpdir}}
+
%global pear_name Auth_Yubico
%global channel __uri
Name: php-pear-Auth-Yubico
-Version: 2.4
+Version: 2.5
Release: 1%{?dist}
Summary: Authentication class for verifying Yubico OTP tokens
Group: Development/Libraries
License: BSD
-URL: http://php-yubico.googlecode.com/
-Source0: http://php-yubico.googlecode.com/files/Auth_Yubico-%{version}.tgz
+URL: https://developers.yubico.com/php-yubico/
+Source0: https://developers.yubico.com/php-yubico/Releases/Auth_Yubico-%{version}.tgz
Patch1: php-pear-Auth-Yubico-2.3.channel.patch
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildArch: noarch
@@ -61,7 +65,7 @@ rm -rf "${RPM_BUILD_ROOT}"
# Clean up unnecessary files.
-rm -rf "${RPM_BUILD_ROOT}%{pear_phpdir}/".??*
+rm -rf "${RPM_BUILD_ROOT}%{pear_metadir}/".??*
# Install XML package description.
@@ -108,6 +112,10 @@ fi
#-------------------------------------------------------------------------------
%changelog
#-------------------------------------------------------------------------------
+
+* Wed May 13 2015 Patrick Monnerat <pm@datasphere.ch> 2.5-1
+- New upstream release.
+
* Sat Mar 31 2012 Remi Collet <RPMS@FamilleCollet.com> - 2.4.1
- upstream 2.4, rebuild for remi repository