[packaging] Branch 'feature-el5-kolab-2.4' - 14 commits - .gitignore php-pecl-apc.spec sources

Jeroen van Meeuwen vanmeeuwen at kolabsys.com
Thu Jul 21 19:55:05 CEST 2011


 .gitignore        |    7 ++----
 php-pecl-apc.spec |   60 +++++++++++++++++++++++++++++++++++++++++++++---------
 sources           |    2 -
 3 files changed, 55 insertions(+), 14 deletions(-)

New commits:
commit b731d6c4831957ace692d28823aa99f5743aff9e
Merge: df0dea0... 0ffe538...
Author: Jeroen van Meeuwen (Ergo Project) <jeroen.van.meeuwen at ergo-project.org>
Date:   Thu Jul 21 13:54:55 2011 -0400

    Merge branch 'fedora/master' into feature-el5-kolab-2.4
    
    Conflicts:
    	.gitignore
    	php-pecl-apc.spec
    	sources



commit 0ffe538a177607a1e901f374ac44a4337619b182
Author: Jeroen van Meeuwen (Ergo Project) <jeroen.van.meeuwen at ergo-project.org>
Date:   Thu Jul 21 13:28:06 2011 -0400

    - Ship apc.php in a static location as well, so that it is easier to
      refer to in webserver configuration files (monitoring...)
    - Fix the apostrophes messing with the syntax highlighting of your
      favorite editor

diff --git a/php-pecl-apc.spec b/php-pecl-apc.spec
index f3b6940..89f828d 100644
--- a/php-pecl-apc.spec
+++ b/php-pecl-apc.spec
@@ -7,7 +7,7 @@
 Summary:       APC caches and optimizes PHP intermediate code
 Name:          php-pecl-apc
 Version:       3.1.9
-Release:       1%{?dist}
+Release:       2%{?dist}
 License:       PHP
 Group:         Development/Languages
 URL:           http://pecl.php.net/package/APC
@@ -77,6 +77,9 @@ pushd APC-%{version}
 %{__rm} -rf %{buildroot}
 %{__make} install INSTALL_ROOT=%{buildroot}
 
+mkdir -p %{buildroot}/%{_datadir}/%{name}
+cp -a apc.php %{buildroot}/%{_datadir}/%{name}/.
+
 # Fix the charset of NOTICE
 iconv -f iso-8859-1 -t utf8 NOTICE >NOTICE.utf8
 mv NOTICE.utf8 NOTICE
@@ -102,10 +105,10 @@ apc.shm_segments=1
 ; The size of each shared memory segment, with M/G suffixe
 apc.shm_size=64M
 ; A "hint" about the number of distinct source files that will be included or 
-; requested on your web server. Set to zero or omit if you're not sure;
+; requested on your web server. Set to zero or omit if you are not sure;
 apc.num_files_hint=1024
 ; Just like num_files_hint, a "hint" about the number of distinct user cache
-; variables to store.  Set to zero or omit if you're not sure;
+; variables to store.  Set to zero or omit if you are not sure;
 apc.user_entries_hint=4096
 ; The number of seconds a cache entry is allowed to idle in a slot in case this
 ; cache entry slot is needed by another entry.
@@ -133,7 +136,7 @@ apc.max_file_size=1M
 ; Whether to stat the main script file and the fullpath includes.
 apc.stat=1
 ; Vertification with ctime will avoid problems caused by programs such as svn or rsync by making 
-; sure inodes havn't changed since the last stat. APC will normally only check mtime.
+; sure inodes have not changed since the last stat. APC will normally only check mtime.
 apc.stat_ctime=0
 ; Whether to canonicalize paths in stat=0 mode or fall back to stat behaviour
 apc.canonicalize=0
@@ -193,6 +196,8 @@ fi
 %doc APC-%{version}/NOTICE        APC-%{version}/TODO      APC-%{version}/apc.php
 %doc APC-%{version}/INSTALL
 %config(noreplace) %{_sysconfdir}/php.d/apc.ini
+%dir %{_datadir}/%{name}
+%{_datadir}/%{name}/apc.php
 %{php_extdir}/apc.so
 %{pecl_xmldir}/%{name}.xml
 
@@ -201,6 +206,12 @@ fi
 
 
 %changelog
+* Thu Jul 21 2011 Jeroen van Meeuwen <kanarip at kanarip.com> - 3.1.9-2
+- Ship apc.php in a static location as well, so that it is easier to
+  refer to in webserver configuration files (monitoring...)
+- Fix the apostrophes messing with the syntax highlighting of your
+  favorite editor
+
 * Sun May 15 2011 Remi Collet <Fedora at FamilleCollet.com> - 3.1.9-1
 - update to 3.1.9 (bugfix, stable)
 


commit ab2639c23f74df04a39ebb5327a369846ce457d0
Author: remi <fedora at famillecollet.com>
Date:   Sun May 15 08:34:36 2011 +0200

    APC 3.1.9 (bugfix)

diff --git a/.gitignore b/.gitignore
index 77e8f96..797aee1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 *~
 /APC-3.1.8.tgz
+/APC-3.1.9.tgz
diff --git a/APC.patch b/APC.patch
deleted file mode 100644
index 5f90b9c..0000000
--- a/APC.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- APC-3.1.8/apc_main.c	2011-05-02 20:33:03.000000000 +0200
-+++ APC-3.1.8/apc_main.c	2011-05-14 11:28:38.432802232 +0200
-@@ -563,8 +563,6 @@
-             if (h->type != ZEND_HANDLE_FILENAME) {
-                 zend_llist_add_element(&CG(open_files), h); 
-             }
--
--            op_array->filename = filename;
-             return op_array;
-         }
-         if(APCG(report_autofilter)) {
diff --git a/php-pecl-apc.spec b/php-pecl-apc.spec
index 861c33c..f3b6940 100644
--- a/php-pecl-apc.spec
+++ b/php-pecl-apc.spec
@@ -1,21 +1,18 @@
 %{!?__pecl: %{expand: %%global __pecl %{_bindir}/pecl}}
-%global php_extdir %(php-config --extension-dir 2>/dev/null || echo %{_libdir}/php4)                     
+%global php_extdir %(%{_bindir}/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)
 %global pecl_name APC
 
 Summary:       APC caches and optimizes PHP intermediate code
 Name:          php-pecl-apc
-Version:       3.1.8
-Release:       2%{?dist}
+Version:       3.1.9
+Release:       1%{?dist}
 License:       PHP
 Group:         Development/Languages
 URL:           http://pecl.php.net/package/APC
 Source:        http://pecl.php.net/get/APC-%{version}.tgz
 
-# Fix for http://pecl.php.net/bugs/22687
-Patch0:        APC.patch
-
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root
 Conflicts:     php-mmcache php-eaccelerator
 BuildRequires: php-devel >= 5.1.0, httpd-devel, php-pear, pcre-devel
@@ -67,8 +64,6 @@ These are the files needed to compile programs using APC serializer.
 # Check than upstream version is correct, http://pecl.php.net/bugs/19590
 grep '"%{version}"' APC-%{version}/php_apc.h || exit 1
 
-%patch0 -p0 -b .orig
-
 
 %build
 cd APC-%{version}
@@ -169,7 +164,7 @@ EOF
 
 %check
 cd %{pecl_name}-%{version}
-TEST_PHP_EXECUTABLE=$(which php) php run-tests.php \
+TEST_PHP_EXECUTABLE=%{_bindir}/php %{_bindir}/php run-tests.php \
     -n -q -d extension_dir=modules \
     -d extension=apc.so
 
@@ -206,6 +201,9 @@ fi
 
 
 %changelog
+* Sun May 15 2011 Remi Collet <Fedora at FamilleCollet.com> - 3.1.9-1
+- update to 3.1.9 (bugfix, stable)
+
 * Sat May 14 2011 Remi Collet <Fedora at FamilleCollet.com> - 3.1.8-2
 - fix for http://pecl.php.net/bugs/22687
 
diff --git a/sources b/sources
index d0cfdd5..e104ac4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-bb1147933a61aa70ceffe53cc6f2920f  APC-3.1.8.tgz
+a2cf7fbf6f3a87f190d897a53260ddaa  APC-3.1.9.tgz


commit 7708524095ceaa1fa354f568253ece5fcf0e4d2f
Author: remi <fedora at famillecollet.com>
Date:   Sat May 14 11:43:31 2011 +0200

    fix for http://pecl.php.net/bugs/22687

diff --git a/APC.patch b/APC.patch
new file mode 100644
index 0000000..5f90b9c
--- /dev/null
+++ b/APC.patch
@@ -0,0 +1,11 @@
+--- APC-3.1.8/apc_main.c	2011-05-02 20:33:03.000000000 +0200
++++ APC-3.1.8/apc_main.c	2011-05-14 11:28:38.432802232 +0200
+@@ -563,8 +563,6 @@
+             if (h->type != ZEND_HANDLE_FILENAME) {
+                 zend_llist_add_element(&CG(open_files), h); 
+             }
+-
+-            op_array->filename = filename;
+             return op_array;
+         }
+         if(APCG(report_autofilter)) {
diff --git a/php-pecl-apc.spec b/php-pecl-apc.spec
index e75abf6..861c33c 100644
--- a/php-pecl-apc.spec
+++ b/php-pecl-apc.spec
@@ -7,12 +7,15 @@
 Summary:       APC caches and optimizes PHP intermediate code
 Name:          php-pecl-apc
 Version:       3.1.8
-Release:       1%{?dist}
+Release:       2%{?dist}
 License:       PHP
 Group:         Development/Languages
 URL:           http://pecl.php.net/package/APC
 Source:        http://pecl.php.net/get/APC-%{version}.tgz
 
+# Fix for http://pecl.php.net/bugs/22687
+Patch0:        APC.patch
+
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root
 Conflicts:     php-mmcache php-eaccelerator
 BuildRequires: php-devel >= 5.1.0, httpd-devel, php-pear, pcre-devel
@@ -64,6 +67,8 @@ These are the files needed to compile programs using APC serializer.
 # Check than upstream version is correct, http://pecl.php.net/bugs/19590
 grep '"%{version}"' APC-%{version}/php_apc.h || exit 1
 
+%patch0 -p0 -b .orig
+
 
 %build
 cd APC-%{version}
@@ -201,6 +206,9 @@ fi
 
 
 %changelog
+* Sat May 14 2011 Remi Collet <Fedora at FamilleCollet.com> - 3.1.8-2
+- fix for http://pecl.php.net/bugs/22687
+
 * Tue May  3 2011 Remi Collet <Fedora at FamilleCollet.com> - 3.1.8-1
 - update to 3.1.8 (bugfix, stable)
 


commit 1cdf6f26b7fefd2e3ff63dafcaa510471350924b
Author: remi <fedora at famillecollet.com>
Date:   Tue May 3 20:17:34 2011 +0200

    update to 3.1.8 (back to a stable version)

diff --git a/.gitignore b/.gitignore
index 7d65ed4..77e8f96 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,2 @@
-APC-3.1.3p1.tgz
-APC-3.1.4.tgz
-/APC-3.1.5.tgz
-/APC-3.1.6.tgz
-/APC-3.1.7.tgz
+*~
+/APC-3.1.8.tgz
diff --git a/php-pecl-apc.spec b/php-pecl-apc.spec
index 067d5e1..e75abf6 100644
--- a/php-pecl-apc.spec
+++ b/php-pecl-apc.spec
@@ -6,8 +6,8 @@
 
 Summary:       APC caches and optimizes PHP intermediate code
 Name:          php-pecl-apc
-Version:       3.1.7
-Release:       2%{?dist}
+Version:       3.1.8
+Release:       1%{?dist}
 License:       PHP
 Group:         Development/Languages
 URL:           http://pecl.php.net/package/APC
@@ -18,7 +18,7 @@ Conflicts:     php-mmcache php-eaccelerator
 BuildRequires: php-devel >= 5.1.0, httpd-devel, php-pear, pcre-devel
 Requires(post): %{__pecl}
 Requires(postun): %{__pecl}
-%if %{?php_zend_api}0
+%if 0%{?php_zend_api:1}
 # Require clean ABI/API versions if available (Fedora)
 Requires:      php(zend-abi) = %{php_zend_api}
 Requires:      php(api) = %{php_core_api}
@@ -51,8 +51,8 @@ intermediate code.
 %package devel
 Summary:       APC developer files (header)
 Group:         Development/Libraries
-Requires:      php-pecl-apc = %{version}-%{release}
-Requires:      php-devel
+Requires:      php-pecl-apc%{?_isa} = %{version}-%{release}
+Requires:      php-devel%{?_isa}
 
 %description devel
 These are the files needed to compile programs using APC serializer.
@@ -201,6 +201,9 @@ fi
 
 
 %changelog
+* Tue May  3 2011 Remi Collet <Fedora at FamilleCollet.com> - 3.1.8-1
+- update to 3.1.8 (bugfix, stable)
+
 * Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.1.7-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
diff --git a/sources b/sources
index 7390c09..d0cfdd5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-94239866e5d1b90e02675e988a5cbad4  APC-3.1.7.tgz
+bb1147933a61aa70ceffe53cc6f2920f  APC-3.1.8.tgz


commit 71ebd9a7be5b3d05b2521a789247c98858758421
Author: Dennis Gilmore <dennis at ausil.us>
Date:   Wed Feb 9 07:32:06 2011 -0600

    - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild

diff --git a/php-pecl-apc.spec b/php-pecl-apc.spec
index cb87962..067d5e1 100644
--- a/php-pecl-apc.spec
+++ b/php-pecl-apc.spec
@@ -7,7 +7,7 @@
 Summary:       APC caches and optimizes PHP intermediate code
 Name:          php-pecl-apc
 Version:       3.1.7
-Release:       1%{?dist}
+Release:       2%{?dist}
 License:       PHP
 Group:         Development/Languages
 URL:           http://pecl.php.net/package/APC
@@ -201,6 +201,9 @@ fi
 
 
 %changelog
+* Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.1.7-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
 * Wed Jan 12 2011 Remi Collet <Fedora at FamilleCollet.com> - 3.1.7-1
 - update to 3.1.7 (bugfix)
 - add devel subpackage (for serializer)


commit 409060403097afd11a9b99c23461d15cbad1112b
Author: remi <fedora at famillecollet.com>
Date:   Wed Jan 12 17:00:41 2011 +0100

    update to 3.1.7

diff --git a/.gitignore b/.gitignore
index a5d467a..7d65ed4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ APC-3.1.3p1.tgz
 APC-3.1.4.tgz
 /APC-3.1.5.tgz
 /APC-3.1.6.tgz
+/APC-3.1.7.tgz
diff --git a/php-pecl-apc.spec b/php-pecl-apc.spec
index e0ec444..cb87962 100644
--- a/php-pecl-apc.spec
+++ b/php-pecl-apc.spec
@@ -6,7 +6,7 @@
 
 Summary:       APC caches and optimizes PHP intermediate code
 Name:          php-pecl-apc
-Version:       3.1.6
+Version:       3.1.7
 Release:       1%{?dist}
 License:       PHP
 Group:         Development/Languages
@@ -48,6 +48,16 @@ APC is a free, open, and robust framework for caching and optimizing PHP
 intermediate code.
 
 
+%package devel
+Summary:       APC developer files (header)
+Group:         Development/Libraries
+Requires:      php-pecl-apc = %{version}-%{release}
+Requires:      php-devel
+
+%description devel
+These are the files needed to compile programs using APC serializer.
+
+
 %prep
 %setup -q -c 
 
@@ -156,7 +166,7 @@ EOF
 cd %{pecl_name}-%{version}
 TEST_PHP_EXECUTABLE=$(which php) php run-tests.php \
     -n -q -d extension_dir=modules \
-    -d extension=apc.so \
+    -d extension=apc.so
 
 
 %if 0%{?pecl_install:1}
@@ -186,8 +196,15 @@ fi
 %{php_extdir}/apc.so
 %{pecl_xmldir}/%{name}.xml
 
+%files devel
+%{_includedir}/php/ext/apc
+
 
 %changelog
+* Wed Jan 12 2011 Remi Collet <Fedora at FamilleCollet.com> - 3.1.7-1
+- update to 3.1.7 (bugfix)
+- add devel subpackage (for serializer)
+
 * Tue Nov 30 2010 Remi Collet <Fedora at FamilleCollet.com> - 3.1.6-1
 - update to 3.1.6 (bugfix)
 
diff --git a/sources b/sources
index 2873e7c..7390c09 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-624b8030254f897face30789d64e6b7e  APC-3.1.6.tgz
+94239866e5d1b90e02675e988a5cbad4  APC-3.1.7.tgz


commit dc2b25735b8ccf098ad6e5c865ea044086158e4f
Author: remi <fedora at famillecollet.com>
Date:   Tue Nov 30 17:57:59 2010 +0100

    update to 3.1.6 (bugfix)

diff --git a/.gitignore b/.gitignore
index 7d97a10..a5d467a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 APC-3.1.3p1.tgz
 APC-3.1.4.tgz
 /APC-3.1.5.tgz
+/APC-3.1.6.tgz
diff --git a/php-pecl-apc.spec b/php-pecl-apc.spec
index ea44b8d..e0ec444 100644
--- a/php-pecl-apc.spec
+++ b/php-pecl-apc.spec
@@ -6,12 +6,13 @@
 
 Summary:       APC caches and optimizes PHP intermediate code
 Name:          php-pecl-apc
-Version:       3.1.5
-Release:       2%{?dist}
+Version:       3.1.6
+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 >= 5.1.0, httpd-devel, php-pear, pcre-devel
@@ -50,8 +51,8 @@ intermediate code.
 %prep
 %setup -q -c 
 
-# workaround to http://pecl.php.net/bugs/19590
-%{__sed} -i -e '/PHP_APC_VERSION/s/%{version}-dev/%{version}/' APC-%{version}/php_apc.h
+# Check than upstream version is correct, http://pecl.php.net/bugs/19590
+grep '"%{version}"' APC-%{version}/php_apc.h || exit 1
 
 
 %build
@@ -187,6 +188,9 @@ fi
 
 
 %changelog
+* Tue Nov 30 2010 Remi Collet <Fedora at FamilleCollet.com> - 3.1.6-1
+- update to 3.1.6 (bugfix)
+
 * Wed Nov 03 2010 Remi Collet <Fedora at FamilleCollet.com> - 3.1.5-2
 - fix reported version, see http://pecl.php.net/bugs/19590
 
diff --git a/sources b/sources
index 80aafdb..2873e7c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-63fdc8cf578aa912be6642c68219a666  APC-3.1.5.tgz
+624b8030254f897face30789d64e6b7e  APC-3.1.6.tgz


commit eb40f735513df74c0601a551d15aab5fef3ca6d5
Author: remi <fedora at famillecollet.com>
Date:   Wed Nov 3 18:36:34 2010 +0100

    fix reported version, see http://pecl.php.net/bugs/19590

diff --git a/php-pecl-apc.spec b/php-pecl-apc.spec
index 1857d90..ea44b8d 100644
--- a/php-pecl-apc.spec
+++ b/php-pecl-apc.spec
@@ -7,7 +7,7 @@
 Summary:       APC caches and optimizes PHP intermediate code
 Name:          php-pecl-apc
 Version:       3.1.5
-Release:       1%{?dist}
+Release:       2%{?dist}
 License:       PHP
 Group:         Development/Languages
 URL:           http://pecl.php.net/package/APC
@@ -50,6 +50,9 @@ intermediate code.
 %prep
 %setup -q -c 
 
+# workaround to http://pecl.php.net/bugs/19590
+%{__sed} -i -e '/PHP_APC_VERSION/s/%{version}-dev/%{version}/' APC-%{version}/php_apc.h
+
 
 %build
 cd APC-%{version}
@@ -184,7 +187,10 @@ fi
 
 
 %changelog
-* Sun Nov 03 2010 Remi Collet <Fedora at FamilleCollet.com> - 3.1.5-1
+* Wed Nov 03 2010 Remi Collet <Fedora at FamilleCollet.com> - 3.1.5-2
+- fix reported version, see http://pecl.php.net/bugs/19590
+
+* Wed Nov 03 2010 Remi Collet <Fedora at FamilleCollet.com> - 3.1.5-1
 - update to 3.1.5 (bugfix)
 
 * Sat Oct 23 2010 Remi Collet <Fedora at FamilleCollet.com> - 3.1.4-3


commit 393b8e20ed26b1e5cd019817462fda6355ff70a9
Author: remi <fedora at famillecollet.com>
Date:   Wed Nov 3 15:30:19 2010 +0100

    update to 3.1.5 (bugfix)

diff --git a/.gitignore b/.gitignore
index 8173614..7d97a10 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 APC-3.1.3p1.tgz
 APC-3.1.4.tgz
+/APC-3.1.5.tgz
diff --git a/php-pecl-apc.spec b/php-pecl-apc.spec
index 6e8ae62..1857d90 100644
--- a/php-pecl-apc.spec
+++ b/php-pecl-apc.spec
@@ -6,8 +6,8 @@
 
 Summary:       APC caches and optimizes PHP intermediate code
 Name:          php-pecl-apc
-Version:       3.1.4
-Release:       3%{?dist}
+Version:       3.1.5
+Release:       1%{?dist}
 License:       PHP
 Group:         Development/Languages
 URL:           http://pecl.php.net/package/APC
@@ -136,7 +136,7 @@ apc.rfc1867_freq=0
 apc.rfc1867_ttl=3600
 ; Optimize include_once and require_once calls and avoid the expensive system calls used.
 apc.include_once_override=0
-apc.lazy_classes=00
+apc.lazy_classes=0
 apc.lazy_functions=0
 ; Enables APC handling of signals, such as SIGSEGV, that write core files when signaled. 
 ; APC will attempt to unmap the shared memory segment in order to exclude it from the core file
@@ -184,6 +184,9 @@ fi
 
 
 %changelog
+* Sun Nov 03 2010 Remi Collet <Fedora at FamilleCollet.com> - 3.1.5-1
+- update to 3.1.5 (bugfix)
+
 * Sat Oct 23 2010 Remi Collet <Fedora at FamilleCollet.com> - 3.1.4-3
 - add filter_provides to avoid private-shared-object-provides apc.so
 
diff --git a/sources b/sources
index 9309245..80aafdb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1f7a58f850e795b0958a3f99ae8c2cc4  APC-3.1.4.tgz
+63fdc8cf578aa912be6642c68219a666  APC-3.1.5.tgz


commit de2abc8f417bddbef6db9446c656f68716c24148
Author: remi <fedora at famillecollet.com>
Date:   Sat Oct 23 16:30:12 2010 +0200

    add filter_provides to avoid private-shared-object-provides apc.so

diff --git a/php-pecl-apc.spec b/php-pecl-apc.spec
index d7a50b7..6e8ae62 100644
--- a/php-pecl-apc.spec
+++ b/php-pecl-apc.spec
@@ -7,7 +7,7 @@
 Summary:       APC caches and optimizes PHP intermediate code
 Name:          php-pecl-apc
 Version:       3.1.4
-Release:       2%{?dist}
+Release:       3%{?dist}
 License:       PHP
 Group:         Development/Languages
 URL:           http://pecl.php.net/package/APC
@@ -35,6 +35,13 @@ Provides:      php-pecl(%{pecl_name}) = %{version}
 Requires(post): %{__pecl}
 Requires(postun): %{__pecl}
 
+
+%{?filter_setup:
+%filter_provides_in %{php_extdir}/.*\.so$
+%filter_setup
+}
+
+
 %description
 APC is a free, open, and robust framework for caching and optimizing PHP
 intermediate code.
@@ -177,6 +184,9 @@ fi
 
 
 %changelog
+* Sat Oct 23 2010 Remi Collet <Fedora at FamilleCollet.com> - 3.1.4-3
+- add filter_provides to avoid private-shared-object-provides apc.so
+
 * Sun Aug 08 2010 Remi Collet <Fedora at FamilleCollet.com> - 3.1.4-2
 - fix default value for apc.shm_size (need M suffixes)
 


commit 7d35572ec04a62cd9ea94fe36c1ee24cb5405da1
Author: remi <fedora at famillecollet.com>
Date:   Sun Aug 8 07:54:43 2010 +0200

    bump release

diff --git a/php-pecl-apc.spec b/php-pecl-apc.spec
index f02c6f2..d7a50b7 100644
--- a/php-pecl-apc.spec
+++ b/php-pecl-apc.spec
@@ -7,7 +7,7 @@
 Summary:       APC caches and optimizes PHP intermediate code
 Name:          php-pecl-apc
 Version:       3.1.4
-Release:       1%{?dist}
+Release:       2%{?dist}
 License:       PHP
 Group:         Development/Languages
 URL:           http://pecl.php.net/package/APC


commit b9a79e67a39e67e7a78636745c31f81721fb9401
Author: remi <fedora at famillecollet.com>
Date:   Sun Aug 8 07:49:59 2010 +0200

    fix default config

diff --git a/php-pecl-apc.spec b/php-pecl-apc.spec
index 2219d2c..f02c6f2 100644
--- a/php-pecl-apc.spec
+++ b/php-pecl-apc.spec
@@ -78,8 +78,8 @@ extension = apc.so
 apc.enabled=1
 ; The number of shared memory segments to allocate for the compiler cache. 
 apc.shm_segments=1
-; The size of each shared memory segment in MB.
-apc.shm_size=64
+; The size of each shared memory segment, with M/G suffixe
+apc.shm_size=64M
 ; A "hint" about the number of distinct source files that will be included or 
 ; requested on your web server. Set to zero or omit if you're not sure;
 apc.num_files_hint=1024
@@ -177,6 +177,9 @@ fi
 
 
 %changelog
+* Sun Aug 08 2010 Remi Collet <Fedora at FamilleCollet.com> - 3.1.4-2
+- fix default value for apc.shm_size (need M suffixes)
+
 * Thu Aug 05 2010 Remi Collet <Fedora at FamilleCollet.com> - 3.1.4-1
 - update to Version 3.1.4 (beta) - API 3.1.0 (beta)
 


commit 1c87ed08662fa54661d05eae3fe4b279cbe90649
Author: remi <fedora at famillecollet.com>
Date:   Thu Aug 5 19:37:55 2010 +0200

    Update to 3.1.4

diff --git a/.gitignore b/.gitignore
index cb620cc..8173614 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 APC-3.1.3p1.tgz
+APC-3.1.4.tgz
diff --git a/php-pecl-apc.spec b/php-pecl-apc.spec
index bddf998..2219d2c 100644
--- a/php-pecl-apc.spec
+++ b/php-pecl-apc.spec
@@ -1,12 +1,12 @@
 %{!?__pecl: %{expand: %%global __pecl %{_bindir}/pecl}}
-%define php_extdir %(php-config --extension-dir 2>/dev/null || echo %{_libdir}/php4)                     
+%global 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
+%global pecl_name APC
 
 Summary:       APC caches and optimizes PHP intermediate code
 Name:          php-pecl-apc
-Version:       3.1.3p1
+Version:       3.1.4
 Release:       1%{?dist}
 License:       PHP
 Group:         Development/Languages
@@ -72,6 +72,7 @@ popd
 extension = apc.so
 
 ; Options for the APC module version >= 3.1.3
+; See http://www.php.net/manual/en/apc.configuration.php
 
 ; This can be set to 0 to disable APC. 
 apc.enabled=1
@@ -130,9 +131,12 @@ apc.rfc1867_ttl=3600
 apc.include_once_override=0
 apc.lazy_classes=00
 apc.lazy_functions=0
-; not documented
+; Enables APC handling of signals, such as SIGSEGV, that write core files when signaled. 
+; APC will attempt to unmap the shared memory segment in order to exclude it from the core file
 apc.coredump_unmap=0
+; Records a md5 hash of files. 
 apc.file_md5=0
+; not documented
 apc.preload_path
 EOF
 
@@ -142,7 +146,6 @@ cd %{pecl_name}-%{version}
 TEST_PHP_EXECUTABLE=$(which php) php run-tests.php \
     -n -q -d extension_dir=modules \
     -d extension=apc.so \
-|| true  # 1 test fails http://pecl.php.net/bugs/bug.php?id=16793
 
 
 %if 0%{?pecl_install:1}
@@ -174,6 +177,9 @@ fi
 
 
 %changelog
+* Thu Aug 05 2010 Remi Collet <Fedora at FamilleCollet.com> - 3.1.4-1
+- update to Version 3.1.4 (beta) - API 3.1.0 (beta)
+
 * Fri Aug 14 2009 Remi Collet <Fedora at FamilleCollet.com> - 3.1.3p1-1
 - update to 3.1.3 patch1 (beta, for PHP 5.3 support)
 - add test suite (disabled for http://pecl.php.net/bugs/bug.php?id=16793)
diff --git a/sources b/sources
index 0d10f39..9309245 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-941cf59c3f8042c1d6961b7afb1002b9  APC-3.1.3p1.tgz
+1f7a58f850e795b0958a3f99ae8c2cc4  APC-3.1.4.tgz




More information about the packaging-commits mailing list