- drop obsoletes that never existed, modernize spec

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

diff --git a/php-pecl-idn.spec b/php-pecl-idn.spec
index a3e4e6814d0284db9749c14e3b2694a4fca687f0..1effade1131a3f38fce59d877826684d9b535219 100644 (file)
--- a/php-pecl-idn.spec
+++ b/php-pecl-idn.spec
@@ -1,13 +1,13 @@
-%define                _modname        idn
-%define                _status         beta
-Summary:       %{_modname} - binding to the GNU libidn
-Summary(pl.UTF-8):     %{_modname} - wiązanie do GNU libidn
+%define                modname idn
+%define                status  beta
+Summary:       %{modname} - binding to the GNU libidn
+Summary(pl.UTF-8):     %{modname} - wiązanie do GNU libidn
 Name:          php-pecl-idn
 Version:       0.2.0
-Release:       1
+Release:       2
 License:       PHP 3.0
 Group:         Development/Languages/PHP
-Source0:       http://pecl.php.net/get/%{_modname}-%{version}.tgz
+Source0:       http://pecl.php.net/get/%{modname}-%{version}.tgz
 # Source0-md5: f42dadf9b15bfc897458ff8735f05f78
 URL:           http://pecl.php.net/package/idn/
 BuildRequires: libidn-devel
@@ -15,37 +15,38 @@ BuildRequires:      php-devel >= 3:5.0.0
 BuildRequires: rpmbuild(macros) >= 1.344
 %{?requires_php_extension}
 Requires:      php-common >= 4:5.0.4
-Obsoletes:     php-pear-idn
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 Binding to the GNU libidn for using Internationalized Domain Names.
 
-In PECL status of this package is: %{_status}.
+In PECL status of this package is: %{status}.
 
 %description -l pl.UTF-8
 Wiązanie do GNU libidn do używania umiędzynarodowionych nazw domen
 (Internationalized Domain Names).
 
-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}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{php_sysconfdir}/conf.d,%{php_extensiondir}}
+install -d $RPM_BUILD_ROOT%{php_sysconfdir}/conf.d
 
-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
+%{__make} install \
+       EXTENSION_DIR=%{php_extensiondir} \
+       INSTALL_ROOT=$RPM_BUILD_ROOT
+cat <<'EOF' > $RPM_BUILD_ROOT%{php_sysconfdir}/conf.d/%{modname}.ini
+; Enable %{modname} extension module
+extension=%{modname}.so
 EOF
 
 %clean
@@ -61,6 +62,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