- rename php-bzip2 -> php-bz2 to match extension name; rel 2

Changed files:
    php.spec -> 1.887

diff --git a/php.spec b/php.spec
index e2f29c33a8243e6f8735f5e7a66064db97ae4e0f..26aae0fae0d9f4dce008a0d814237904117ad4d3 100644 (file)
--- a/php.spec
+++ b/php.spec
@@ -102,7 +102,7 @@ ERROR: You need to select at least one Apache SAPI to build shared modules.
 %undefine      with_filter
 %endif
 
-%define                rel             1
+%define                rel             2
 Summary:       PHP: Hypertext Preprocessor
 Summary(fr.UTF-8):     Le langage de script embarque-HTML PHP
 Summary(pl.UTF-8):     Język skryptowy PHP
@@ -556,19 +556,22 @@ precision math functions support.
 Moduł PHP umożliwiający korzystanie z dokładnych funkcji
 matematycznych takich jak w programie bc.
 
-%package bzip2
+%package bz2
 Summary:       Bzip2 extension module for PHP
 Summary(pl.UTF-8):     Moduł bzip2 dla PHP
 Group:         Libraries
 URL:           http://www.php.net/manual/en/book.bzip2.php
 Requires:      %{name}-common = %{epoch}:%{version}-%{release}
+Provides:      php(bz2)
 Provides:      php(bzip2)
+Provides:      php-bzip2 = %{epoch}:%{version}-%{release}
+Obsoletes:     php-bzip2
 
-%description bzip2
+%description bz2
 This is a dynamic shared object (DSO) for PHP that will add bzip2
 compression support to PHP.
 
-%description bzip2 -l pl.UTF-8
+%description bz2 -l pl.UTF-8
 Moduł PHP umożliwiający używanie kompresji bzip2.
 
 %package calendar
@@ -2392,7 +2395,7 @@ fi
 
 # extension scripts defines
 %extension_scripts bcmath
-%extension_scripts bzip2
+%extension_scripts bz2
 %extension_scripts calendar
 %extension_scripts ctype
 %extension_scripts curl
@@ -2460,9 +2463,6 @@ fi
 %triggerun bcmath -- %{name}-bcmath < 4:5.0.4-9.1
 %{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*bcmath\.so/d' %{_sysconfdir}/php.ini
 
-%triggerun bzip2 -- %{name}-bzip2 < 4:5.0.4-9.1
-%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*bzip2\.so/d' %{_sysconfdir}/php.ini
-
 %triggerun calendar -- %{name}-calendar < 4:5.0.4-9.1
 %{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*calendar\.so/d' %{_sysconfdir}/php.ini
 
@@ -2706,7 +2706,7 @@ fi
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/bcmath.ini
 %attr(755,root,root) %{php_extensiondir}/bcmath.so
 
-%files bzip2
+%files bz2
 %defattr(644,root,root,755)
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/bz2.ini
 %attr(755,root,root) %{php_extensiondir}/bz2.so