- spec unify

Changed files:
    php-pecl-mailparse.spec -> 1.25

diff --git a/php-pecl-mailparse.spec b/php-pecl-mailparse.spec
index 7c2c170298bfd2393767cfecf7a489e171bd9843..54c9f40b2406e365579d374f6b4888d7a4ea7628 100644 (file)
--- a/php-pecl-mailparse.spec
+++ b/php-pecl-mailparse.spec
@@ -1,13 +1,13 @@
-%define                _modname        mailparse
-%define                _status         stable
-Summary:       %{_modname} - email message manipulation
-Summary(pl.UTF-8):     %{_modname} - obrabianie wiadomości E-mail
-Name:          php-pecl-%{_modname}
+%define                modname mailparse
+%define                status          stable
+Summary:       %{modname} - email message manipulation
+Summary(pl.UTF-8):     %{modname} - obrabianie wiadomości E-mail
+Name:          php-pecl-%{modname}
 Version:       2.1.5
 Release:       3
 License:       PHP 2.02
 Group:         Development/Languages/PHP
-Source0:       http://pecl.php.net/get/%{_modname}-%{version}.tgz
+Source0:       http://pecl.php.net/get/%{modname}-%{version}.tgz
 # Source0-md5: 0c0134fb6f5903c8fb6c9e2205263d2c
 URL:           http://pecl.php.net/package/mailparse/
 BuildRequires: php-devel >= 4:5.2.0-7.2
@@ -20,23 +20,23 @@ BuildRoot:  %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 Mailparse is an extension for parsing and working with email messages.
 It can deal with rfc822 and rfc2045 (MIME) compliant messages.
 
-In PECL status of this package is: %{_status}.
+In PECL status of this package is: %{status}.
 
 %description -l pl.UTF-8
 Mailparse to rozszerzenie do analizy i pracy z wiadomościami poczty
 elektronicznej. Radzi sobie z wiadomościami zgodnymi z RFC822 oraz
 RFC2024 (MIME).
 
-To rozszerzenie ma w PECL status: %{_status}.
+To rozszerzenie ma w PECL status: %{status}.
 
 %prep
-%setup -q -c
+%setup -qc
+mv %{modname}-%{version}/* .
 
 %build
-cd %{_modname}-%{version}
 phpize
 %configure \
-       --with-%{_modname}=%{_prefix}/X11R6/include/X11/
+       --with-%{modname}=%{_prefix}/X11R6/include/X11/
 
 %{__make} CPPFLAGS="-DHAVE_CONFIG_H -I%{_prefix}/X11R6/include/X11"
 
@@ -44,10 +44,10 @@ phpize
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{php_sysconfdir}/conf.d,%{php_extensiondir}}
 
-install %{_modname}-%{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
@@ -63,6 +63,6 @@ fi
 
 %files
 %defattr(644,root,root,755)
-%doc %{_modname}-%{version}/CREDITS
-%config(noreplace) %verify(not md5 mtime size) %{php_sysconfdir}/conf.d/%{_modname}.ini
-%attr(755,root,root) %{php_extensiondir}/%{_modname}.so
+%doc CREDITS
+%config(noreplace) %verify(not md5 mtime size) %{php_sysconfdir}/conf.d/%{modname}.ini
+%attr(755,root,root) %{php_extensiondir}/%{modname}.so