- unify

- R: session ext: memcache.so: undefined symbol: php_session_create_id

Changed files:
    php-pecl-memcache.spec -> 1.37

diff --git a/php-pecl-memcache.spec b/php-pecl-memcache.spec
index 0c0c0d2369ef0cdb53c443aaa0fe04b22adc6293..2c5a2feda9ba2d16d4e2383adcdf35dbc5684cef 100644 (file)
--- a/php-pecl-memcache.spec
+++ b/php-pecl-memcache.spec
@@ -1,22 +1,22 @@
-%define                _modname        memcache
-%define                _status         beta
-Summary:       %{_modname} - a memcached extension
-Summary(pl.UTF-8):     %{_modname} - rozszerzenie memcached
-Name:          php-pecl-%{_modname}
+%define                modname memcache
+Summary:       %{modname} - a memcached extension
+Summary(pl.UTF-8):     %{modname} - rozszerzenie memcached
+Name:          php-pecl-%{modname}
 Version:       3.0.4
 Release:       1
 License:       PHP 3.01
 Group:         Development/Languages/PHP
-Source0:       http://pecl.php.net/get/%{_modname}-%{version}.tgz
+Source0:       http://pecl.php.net/get/%{modname}-%{version}.tgz
 # Source0-md5: 07933ce0191274201ea6905cd509c5b0
 URL:           http://pecl.php.net/package/memcache/
 BuildRequires: php-devel >= 3:5.0.0
 BuildRequires: rpmbuild(macros) >= 1.344
 %{?requires_php_extension}
 Requires:      php-common >= 4:5.0.4
+Requires:      php-session
 Requires:      php-zlib
 #Suggests:     memcached
-Obsoletes:     php-pear-%{_modname}
+Obsoletes:     php-pear-%{modname}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -26,8 +26,6 @@ applications to decrease database load by storing objects in memory.
 This extension allows you to work with memcached through handy OO and
 procedural interfaces.
 
-In PECL status of this extension is: %{_status}.
-
 %description -l pl.UTF-8
 Memcached to zaprojektowany dla dynamicznych aplikacji internetowych
 daemon cachujący mający za zadanie zmniejszenie obciążenia bazy danych
@@ -36,13 +34,11 @@ przez przechowywanie w pamięci obiektów.
 To rozszerzenie umożliwia pracę z memcached za pomocą poręcznego
 zorientowanego obiektowo (oraz przez procedury) interfejsu.
 
-To rozszerzenie ma w PECL status: %{_status}.
-
 %prep
 %setup -q -c
+mv %{modname}-%{version}/* .
 
 %build
-cd %{_modname}-%{version}
 phpize
 %configure \
        --with-zlib-dir=/usr
@@ -50,12 +46,12 @@ phpize
 
 %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,%{php_extensiondir},%{_examplesdir}/%{name}-%{version}}
 
-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 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
 ;memcache.allow_failover=1
 ;memcache.chunk_size=8192
 ;memcache.default_port=11211
@@ -65,6 +61,7 @@ extension=%{_modname}.so
 ;memcache.hash_strategy=consistent
 ;memcache.hash_function=crc32
 EOF
+cp -a example.php memcache.php $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -79,6 +76,7 @@ fi
 
 %files
 %defattr(644,root,root,755)
-%doc %{_modname}-%{version}/{CREDITS,README,example.php,memcache.php}
-%config(noreplace) %verify(not md5 mtime size) %{php_sysconfdir}/conf.d/%{_modname}.ini
-%attr(755,root,root) %{php_extensiondir}/%{_modname}.so
+%doc CREDITS README
+%config(noreplace) %verify(not md5 mtime size) %{php_sysconfdir}/conf.d/%{modname}.ini
+%attr(755,root,root) %{php_extensiondir}/%{modname}.so
+%{_examplesdir}/%{name}-%{version}