rpms/php-pecl-apc/devel php-pecl-apc.spec,1.8,1.9 sources,1.4,1.5

[Tim Jackson (timj)]

Author: timj

Update of /cvs/pkgs/rpms/php-pecl-apc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15577

Modified Files:
	php-pecl-apc.spec sources 
Log Message:
Update to upstream 3.0.19



Index: php-pecl-apc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-pecl-apc/devel/php-pecl-apc.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- php-pecl-apc.spec	18 Feb 2008 22:30:49 -0000	1.8
+++ php-pecl-apc.spec	13 Jul 2008 11:17:18 -0000	1.9
@@ -1,31 +1,44 @@
+%{!?__pecl: %{expand: %%global __pecl %{_bindir}/pecl}}
 %define php_extdir %(php-config --extension-dir 2>/dev/null || echo %{_libdir}/php4)                     
+%global php_zendabiver %((echo 0; php -i 2>/dev/null | sed -n 's/^PHP Extension => //p') | tail -1)
+%global php_version %((echo 0; php-config --version 2>/dev/null) | tail -1)
+%define pecl_name APC
+
 Summary:       APC caches and optimizes PHP intermediate code
 Name:          php-pecl-apc
-Version:       3.0.14
-Release:       3%{?dist}
-License:       PHP License
+Version:       3.0.19
+Release:       1%{?dist}
+License:       PHP
 Group:         Development/Languages
 URL:           http://pecl.php.net/package/APC
 Source:        http://pecl.php.net/get/APC-%{version}.tgz
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root
 Conflicts:     php-mmcache php-eaccelerator
-BuildRequires: php-devel httpd-devel
-Obsoletes:     php-apc
+BuildRequires: php-devel httpd-devel php-pear
 %if %{?php_zend_api}0
-Requires:     php(zend-abi) = %{php_zend_api}
-Requires:     php(api) = %{php_core_api}
+# Require clean ABI/API versions if available (Fedora)
+Requires:      php(zend-abi) = %{php_zend_api}
+Requires:      php(api) = %{php_core_api}
+%else
+%if "%{rhel}" == "5"
+# RHEL5 where we have php-common providing the Zend ABI the "old way"
+Requires:      php-zend-abi = %{php_zendabiver}
 %else
-Requires:     php-api = %{php_apiver}
+# RHEL4 where we have no php-common and nothing providing the Zend ABI...
+Requires:      php = %{php_version}
+%endif
 %endif
-Provides:      php-apc = %{version}-%{release}
-Provides:     php-pecl(apc)
+Provides:      php-pecl(%{pecl_name}) = %{version}
+
+Requires(post): %{__pecl}
+Requires(postun): %{__pecl}
 
 %description
-APC is a free, open, and robust framework for 
-caching and optimizing PHP intermediate code.
+APC is a free, open, and robust framework for caching and optimizing PHP
+intermediate code.
 
 %prep
-%setup -q -n APC-%{version}
+%setup -q -n %{pecl_name}-%{version}
 
 %build
 %{_bindir}/phpize
@@ -36,6 +49,10 @@
 %{__rm} -rf %{buildroot}
 %{__make} install INSTALL_ROOT=%{buildroot}
 
+# Install the package XML file
+%{__mkdir_p} %{buildroot}%{pecl_xmldir}
+%{__install} -m 644 ../package.xml %{buildroot}%{pecl_xmldir}/%{pecl_name}.xml
+
 # Drop in the bit of configuration
 %{__mkdir_p} %{buildroot}%{_sysconfdir}/php.d
 %{__cat} > %{buildroot}%{_sysconfdir}/php.d/apc.ini << 'EOF'
@@ -54,6 +71,19 @@
 apc.cache_by_default=1
 EOF
 
+# Fix the charset of NOTICE
+iconv -f iso-8859-1 -t utf8 NOTICE >NOTICE.utf8
+mv NOTICE.utf8 NOTICE
+
+%post
+%{__pecl} install --nodeps --soft --force --register-only --nobuild %{pecl_xmldir}/%{pecl_name}.xml >/dev/null || :
+
+
+%postun
+if [ $1 -eq 0 ]  ; then
+%{__pecl} uninstall --nodeps --ignore-errors --register-only %{pecl_name} >/dev/null || :
+fi
+
 %clean
 %{__rm} -rf %{buildroot}
 
@@ -62,8 +92,16 @@
 %doc TECHNOTES.txt CHANGELOG LICENSE NOTICE TODO INSTALL apc.php
 %config(noreplace) %{_sysconfdir}/php.d/apc.ini
 %{php_extdir}/apc.so
+%{pecl_xmldir}/%{pecl_name}.xml
 
 %changelog
+* Wed Jun 25 2008 Tim Jackson <rpm at timj.co.uk> - 3.0.19-1
+- Update to 3.0.19
+- Fix PHP Zend API/ABI dependencies to work on EL-4/5
+- Fix "License" tag
+- Fix encoding of "NOTICE" file
+- Add registration via PECL
+
 * Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 3.0.14-3
 - Autorebuild for GCC 4.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-pecl-apc/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	28 Jun 2007 13:41:58 -0000	1.4
+++ sources	13 Jul 2008 11:17:18 -0000	1.5
@@ -1 +1 @@
-0f452f936239b6107d3e2e5cda4f4bda  APC-3.0.14.tgz
+951f43d2873e3572f5d5ae71a9b66f90  APC-3.0.19.tgz