rpms/php-eaccelerator/F-7 .cvsignore, 1.8, 1.9 php-eaccelerator.spec, 1.29, 1.30 sources, 1.8, 1.9 eaccelerator-0.9.5-php52fix.patch, 1.1, NONE eaccelerator-0.9.5-trac187.patch, 1.1, NONE

[Matthias Saou (thias)]

Author: thias

Update of /cvs/extras/rpms/php-eaccelerator/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3394/F-7

Modified Files:
	.cvsignore php-eaccelerator.spec sources 
Removed Files:
	eaccelerator-0.9.5-php52fix.patch 
	eaccelerator-0.9.5-trac187.patch 
Log Message:
Update to 0.9.5.1 and cleanup to conform to current PHP packaging guidelines.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-eaccelerator/F-7/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	16 Oct 2006 16:44:20 -0000	1.8
+++ .cvsignore	15 Jul 2007 10:52:15 -0000	1.9
@@ -1 +1 @@
-eaccelerator-0.9.5.tar.bz2
+eaccelerator-0.9.5.1.tar.bz2


Index: php-eaccelerator.spec
===================================================================
RCS file: /cvs/extras/rpms/php-eaccelerator/F-7/php-eaccelerator.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- php-eaccelerator.spec	16 May 2007 14:28:25 -0000	1.29
+++ php-eaccelerator.spec	15 Jul 2007 10:52:15 -0000	1.30
@@ -1,32 +1,22 @@
-# Useful defaults when building in chroots on systems where PHP is unavailable
-%define default_extdir  %{_libdir}/php4
-%define default_apiver  20041225
-%define default_version 5.2.2
-
-%define module_version 0.9.5
-
-%define php_extdir %(php-config --extension-dir 2>/dev/null || echo %{default_extdir})
-%define php_apiver %((echo %{default_apiver}; php -i 2>/dev/null | sed -n 's/^PHP API => //p') | tail -1)
-%{!?php_version:%define php_version %(php-config --version 2>/dev/null || echo %{default_version})}
+%global php_extdir  %(php-config --extension-dir 2>/dev/null || echo "undefined")
 
 # This is the apache userid, only used for sysvipc semaphores which is the
-# default on ppc since spinlock is not detected
+# default on ppc since spinlock is not detected (not supported?)
 %define userid 48
 
 Summary: PHP accelerator, optimizer, encoder and dynamic content cacher
 Name: php-eaccelerator
-Version: %{php_version}_%{module_version}
-Release: 2%{?dist}
+Version: 0.9.5.1
+Release: 1
+Epoch: 1
 License: GPL
 Group: Development/Languages
 URL: http://eaccelerator.net/
-Source: http://bart.eaccelerator.net/source/%{module_version}/eaccelerator-%{module_version}.tar.bz2
+Source: http://bart.eaccelerator.net/source/%{version}/eaccelerator-%{version}.tar.bz2
 Patch0: eaccelerator-0.9.5-rc1-config.patch
-Patch1: eaccelerator-0.9.5-php52fix.patch
-Patch2: eaccelerator-0.9.5-trac187.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-Requires: php-api = %{php_apiver}
-Requires: php-common = %{php_version}
+Requires: php(zend-abi) = %{php_zend_api}
+Requires: php(api) = %{php_core_api}
 Provides: php-zend_extension
 Conflicts: php-mmcache
 BuildRequires: php, php-devel
@@ -40,26 +30,23 @@
 
 
 %prep
-%setup -q -n eaccelerator-%{module_version}
+%setup -q -n eaccelerator-%{version}
 %patch0 -p1 -b .config
-%patch1 -p2 -b .php52fix
-%patch2 -p1 -b .trac187
 # Change paths in the example config, other values are changed by a patch
-%{__perl} -pi -e 's|/usr/lib/php4/|%{php_extdir}/|g;
-                  s|/tmp/eaccelerator|%{_var}/cache/php-eaccelerator|g' \
+%{__sed} -i 's|/usr/lib/php4/|%{php_extdir}/|g;
+             s|/tmp/eaccelerator|%{_var}/cache/php-eaccelerator|g' \
     eaccelerator.ini
 
 
 %build
 phpize
 %configure \
-    --with-eaccelerator-shared-memory \
-    --with-eaccelerator-sessions \
-    --with-eaccelerator-content-caching \
 %ifarch ppc ppc64
-    --with-eaccelerator-userid="%{userid}"
+    --with-eaccelerator-userid="%{userid}" \
 %endif
-
+    --with-eaccelerator-shared-memory \
+    --with-eaccelerator-sessions \
+    --with-eaccelerator-content-caching
 %{__make} %{?_smp_mflags}
 
 
@@ -82,7 +69,7 @@
 %preun
 # Upon last removal (not update), clean all cache files
 if [ $1 -eq 0 ]; then
-    rm -rf %{_var}/cache/php-eaccelerator/* &>/dev/null || :
+    %{__rm} -rf %{_var}/cache/php-eaccelerator/* &>/dev/null || :
 fi
 
 
@@ -96,6 +83,14 @@
 
 
 %changelog
+* Fri Jun 22 2007 Matthias Saou <http://freshrpms.net/> 1:0.9.5.1-1
+- Update to 0.9.5.1.
+- Major spec file cleanup, based on current PHP packaging guidelines.
+- Set Epoch to 1, since the proper versionning is lower than previously :-(
+- Remove two upstreamed patches (php52fix and trac187).
+- Use sed instead of perl for the config file changes.
+- No longer use dist because we want to use the same package on F-n and n+1.
+
 * Wed May 16 2007 Matthias Saou <http://freshrpms.net/> 5.2.2_0.9.5-2
 - Include ppc64 %%ifarch, since it's now a Fedora target.
 - Include patch to fix trac bug #187.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-eaccelerator/F-7/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	16 Oct 2006 16:44:20 -0000	1.8
+++ sources	15 Jul 2007 10:52:15 -0000	1.9
@@ -1 +1 @@
-dad54af67488b83a2af6e30f661f613b  eaccelerator-0.9.5.tar.bz2
+d4759d444f55801762af963df6fca9ff  eaccelerator-0.9.5.1.tar.bz2


--- eaccelerator-0.9.5-php52fix.patch DELETED ---


--- eaccelerator-0.9.5-trac187.patch DELETED ---