summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile2
-rw-r--r--php-pecl-radius.spec26
2 files changed, 20 insertions, 8 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-pecl-radius.spec b/php-pecl-radius.spec
index 466a241..18ad89c 100644
--- a/php-pecl-radius.spec
+++ b/php-pecl-radius.spec
@@ -4,7 +4,7 @@
Name: php-pecl-radius
Version: 1.2.5
-Release: 12%{?dist}
+Release: 14%{?dist}
Summary: Radius client library
License: BSD
@@ -16,20 +16,29 @@ Source0: http://pecl.php.net/get/radius-%{version}.tgz
Patch0: radius-php54.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: php-devel php-pear >= 1:1.4.9-1.2
+BuildRequires: php-devel
+BuildRequires: php-pear
Requires(post): %{__pecl}
Requires(postun): %{__pecl}
-Provides: php-pecl(%{pecl_name}) = %{version}
-
Requires: php(zend-abi) = %{php_zend_api}
Requires: php(api) = %{php_core_api}
-# RPM 4.8
+Provides: php-%{pecl_name} = %{version}
+Provides: php-%{pecl_name}%{?_isa} = %{version}
+Provides: php-pecl(%{pecl_name}) = %{version}
+Provides: php-pecl(%{pecl_name})%{?_isa} = %{version}
+
+# Other third party repo stuff
+Obsoletes: php53-pecl-%{pecl_name}
+Obsoletes: php53u-pecl-%{pecl_name}
+%if "%{php_version}" > "5.4"
+Obsoletes: php54-pecl-%{pecl_name}
+%endif
+
+# Filter private shared
%{?filter_provides_in: %filter_provides_in %{_libdir}/.*\.so$}
%{?filter_setup}
-# RPM 4.9
-%global __provides_exclude_from %{?__provides_exclude_from:%__provides_exclude_from|}%{_libdir}/.*\\.so$
%description
@@ -121,6 +130,9 @@ rm -rf %{buildroot}
%changelog
+* Fri Nov 18 2011 Remi Collet <rpms@famillecollet.com> 1.2.5-14
+- also provides php-radius
+
* Fri Nov 18 2011 Remi Collet <rpms@famillecollet.com> 1.2.5-12
- php 5.4 build