summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2016-05-04 18:00:21 +0200
committerRemi Collet <fedora@famillecollet.com>2016-05-04 18:00:21 +0200
commit026d99bd5939e86317520e4b40168283133ef6f1 (patch)
tree44cd90e5203edf7602e78107e6475e6bd82721c1
parent20e089b0bd2d4a80acd23113b8b35f15d7c39d58 (diff)
php-pecl-apcu: always obso. apc
-rw-r--r--php-pecl-apcu.spec17
1 files changed, 4 insertions, 13 deletions
diff --git a/php-pecl-apcu.spec b/php-pecl-apcu.spec
index 9bbfba2..ba4e29b 100644
--- a/php-pecl-apcu.spec
+++ b/php-pecl-apcu.spec
@@ -39,7 +39,7 @@ Version: 4.0.11
Release: 0.1.%{gh_date}git%{gh_short}%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{pecl_name}-%{version}-%{gh_short}.tar.gz
%else
-Release: 1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
+Release: 2%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
Source0: http://pecl.php.net/get/%{pecl_name}-%{version}.tgz
%endif
Source1: %{pecl_name}.ini
@@ -68,11 +68,7 @@ Provides: %{?scl_prefix}php-pecl(apcu)%{?_isa} = %{version}
Provides: %{?scl_prefix}php-pecl-apcu = %{version}-%{release}
Provides: %{?scl_prefix}php-pecl-apcu%{?_isa} = %{version}-%{release}
%endif
-%if "%{php_version}" < "5.5"
-Conflicts: %{?scl_prefix}php-pecl-apc < 4
-%else
Obsoletes: %{?scl_prefix}php-pecl-apc < 4
-%endif
# Same provides than APC, this is a drop in replacement
Provides: %{?scl_prefix}php-apc = %{version}
@@ -133,11 +129,7 @@ Summary: APCu developer files (header)
Group: Development/Libraries
Requires: %{name}%{?_isa} = %{version}-%{release}
Requires: %{?scl_prefix}php-devel%{?_isa}
-%if "%{php_version}" < "5.5"
-Conflicts: %{?scl_prefix}php-pecl-apc-devel < 4
-%else
Obsoletes: %{?scl_prefix}php-pecl-apc-devel < 4
-%endif
Provides: %{?scl_prefix}php-pecl-apc-devel = %{version}-%{release}
Provides: %{?scl_prefix}php-pecl-apc-devel%{?_isa} = %{version}-%{release}
@@ -156,11 +148,7 @@ Requires: %{name} = %{version}-%{release}
Requires: mod_php
Requires: php-gd
Requires: httpd
-%if "%{php_version}" < "5.5"
-Conflicts: apc-panel < 4
-%else
Obsoletes: apc-panel < 4
-%endif
Provides: apc-panel = %{version}-%{release}
%description -n apcu-panel
@@ -344,6 +332,9 @@ fi
%changelog
+* Wed May 4 2016 Remi Collet <remi@fedoraproject.org> - 4.0.11-2
+- always obsoletes apc
+
* Wed Apr 20 2016 Remi Collet <remi@fedoraproject.org> - 4.0.11-1
- Update to 4.0.11 (stable)