packages: php/php.spec - rename php-bzip2 -> php-bz2 to match extension nam...

[glen]

Author: glen                         Date: Sat Aug 21 13:22:27 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rename php-bzip2 -> php-bz2 to match extension name; rel 2

---- Files affected:
packages/php:
   php.spec (1.886 -> 1.887) 

---- Diffs:

================================================================
Index: packages/php/php.spec
diff -u packages/php/php.spec:1.886 packages/php/php.spec:1.887
--- packages/php/php.spec:1.886	Fri Aug  6 00:33:45 2010
+++ packages/php/php.spec	Sat Aug 21 15:22:21 2010
@@ -103,7 +103,7 @@
 %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
@@ -557,19 +557,22 @@
 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
@@ -2393,7 +2396,7 @@
 
 # extension scripts defines
 %extension_scripts bcmath
-%extension_scripts bzip2
+%extension_scripts bz2
 %extension_scripts calendar
 %extension_scripts ctype
 %extension_scripts curl
@@ -2461,9 +2464,6 @@
 %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
 
@@ -2707,7 +2707,7 @@
 %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
@@ -3139,6 +3139,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.887  2010/08/21 13:22:21  glen
+- rename php-bzip2 -> php-bz2 to match extension name; rel 2
+
 Revision 1.886  2010/08/05 22:33:45  glen
 - more tests made happy
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/php/php.spec?r1=1.886&r2=1.887&f=u