- release 7

Changed files:
    php-pecl-fileinfo.spec -> 1.22

diff --git a/php-pecl-fileinfo.spec b/php-pecl-fileinfo.spec
index 864bff206797e745dba204b00c4df20feeb9c8ee..553928f99fe1d454cc9d3d0fc3c23805e6912ec1 100644 (file)
--- a/php-pecl-fileinfo.spec
+++ b/php-pecl-fileinfo.spec
@@ -1,24 +1,22 @@
-%define                _modname        fileinfo
-%define                _smodname       Fileinfo
-%define                _status         beta
-Summary:       %{_modname} - libmagic bindings
-Summary(pl.UTF-8):     %{_modname} - dowiązania biblioteki libmagic
-Name:          php-pecl-%{_modname}
+%define                modname fileinfo
+%define                smodname        Fileinfo
+%define                status          beta
+Summary:       %{modname} - libmagic bindings
+Summary(pl.UTF-8):     %{modname} - dowiązania biblioteki libmagic
+Name:          php-pecl-%{modname}
 Version:       1.0.4
-Release:       6
+Release:       7
 License:       PHP
 Group:         Development/Languages/PHP
-Source0:       http://pecl.php.net/get/%{_smodname}-%{version}.tgz
+Source0:       http://pecl.php.net/get/%{smodname}-%{version}.tgz
 # Source0-md5: 2854e749db157365c769cb9496f5586f
 Patch0:                pecl-fileinfo-defaultdb.patch
 URL:           http://pecl.php.net/package/Fileinfo/
 BuildRequires: libmagic-devel
-BuildRequires: php-devel >= 3:5.0.0
+BuildRequires: php-devel >= 4:5.0.4
 BuildRequires: rpmbuild(macros) >= 1.344
 Provides:      php(fileinfo)
 %{?requires_php_extension}
-Requires:      php-common >= 4:5.0.4
-Obsoletes:     php-pear-%{_modname}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -29,7 +27,7 @@ etc...
 Additionally it can also be used to retrieve the MIME type for a
 particular file and for text files proper language encoding.
 
-In PECL status of this extension is: %{_status}.
+In PECL status of this extension is: %{status}.
 
 %description -l pl.UTF-8
 To rozszerzenie pozwala na uzyskanie wielu informacji na temat plików.
@@ -38,14 +36,14 @@ Informacje te uwzględniają między innymi rozmiar, jakość, długość itp.
 Dodatkowo może być użyte do uzyskania typu MIME danego pliku, a dla
 plików tekstowych - użytego kodowania.
 
-To rozszerzenie ma w PECL status: %{_status}.
+To rozszerzenie ma w PECL status: %{status}.
 
 %prep
-%setup -q -c
-%patch0 -p1
+%setup -qc
+mv %{smodname}-%{version}/* .
+%patch0 -p2
 
 %build
-cd %{_smodname}-%{version}
 phpize
 %configure
 %{__make}
@@ -54,10 +52,10 @@ phpize
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{php_sysconfdir}/conf.d,%{php_extensiondir}}
 
-install %{_smodname}-%{version}/modules/%{_modname}.so $RPM_BUILD_ROOT%{php_extensiondir}
-cat <<'EOF' > $RPM_BUILD_ROOT%{php_sysconfdir}/conf.d/%{_modname}.ini
-; Enable %{_modname} extension module
-extension=%{_modname}.so
+install -p modules/%{modname}.so $RPM_BUILD_ROOT%{php_extensiondir}
+cat <<'EOF' > $RPM_BUILD_ROOT%{php_sysconfdir}/conf.d/%{modname}.ini
+; Enable %{modname} extension module
+extension=%{modname}.so
 EOF
 
 %clean
@@ -73,6 +71,6 @@ fi
 
 %files
 %defattr(644,root,root,755)
-%doc %{_smodname}-%{version}/{CREDITS,EXPERIMENTAL,fileinfo.php}
-%config(noreplace) %verify(not md5 mtime size) %{php_sysconfdir}/conf.d/%{_modname}.ini
-%attr(755,root,root) %{php_extensiondir}/%{_modname}.so
+%doc CREDITS EXPERIMENTAL fileinfo.php
+%config(noreplace) %verify(not md5 mtime size) %{php_sysconfdir}/conf.d/%{modname}.ini
+%attr(755,root,root) %{php_extensiondir}/%{modname}.so