- unify

Changed files:
    php-pecl-dbx.spec -> 1.18

diff --git a/php-pecl-dbx.spec b/php-pecl-dbx.spec
index 348bfc573e954b2e19fa78cd04ea8bd9ce65df42..894b30874290be405442dd268ce498eb4a271d68 100644 (file)
--- a/php-pecl-dbx.spec
+++ b/php-pecl-dbx.spec
@@ -1,13 +1,13 @@
-%define                _modname        dbx
-%define                _status         stable
-Summary:       %{_modname} - database abstraction functions
-Summary(pl.UTF-8):     %{_modname} - funkcje abstrakcji baz danych
-Name:          php-pecl-%{_modname}
+%define                modname dbx
+%define                status          stable
+Summary:       %{modname} - database abstraction functions
+Summary(pl.UTF-8):     %{modname} - funkcje abstrakcji baz danych
+Name:          php-pecl-%{modname}
 Version:       1.1.0
 Release:       9
 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: 82d1091c75e047c4a8f9aea7b279e13b
 URL:           http://pecl.php.net/package/dbx/
 BuildRequires: php-devel >= 3:5.0.0
@@ -27,7 +27,7 @@ these databases.
 The currently supported databases are MySQL, ODBC, Oracle (oci8), MS
 SQL Server, PostgreSQL, FrontBase, Sybase-CT and SQLite.
 
-In PECL status of this extension is: %{_status}.
+In PECL status of this extension is: %{status}.
 
 %description -l pl.UTF-8
 Moduł dbx to warstwa abstrakcji baz danych. Funkcje dbx pozwalają na
@@ -38,13 +38,13 @@ ale interfejsem do modułów do obsługi baz danych.
 Aktualnie wspierane bazy danych to MySQL, ODBC, Oracle (oci8), MS SQL
 Server, PostgreSQL, FrontBase, Sybase-CT oraz SQLite.
 
-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
 %{__make}
@@ -52,11 +52,10 @@ phpize
 %install
 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
@@ -72,6 +71,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