php-xcache: 3.2.0-rc1

2 files changed, 32 insertions, 150 deletions

diff --git a/REFLECTION b/REFLECTION
index 444dee7..fcf0fa1 100644
--- a/REFLECTION
+++ b/REFLECTION
@@ -1,4 +1,4 @@
-Extension [ <persistent> extension #143 XCache version 4.0.0-dev ] {
+Extension [ <persistent> extension #155 XCache version 3.2.0-rc1 ] {
 
   - Dependencies {
     Dependency [ standard (Required) ]
@@ -219,69 +219,28 @@ Extension [ <persistent> extension #143 XCache version 4.0.0-dev ] {
     Constant [ integer XC_OPSPEC_ASSIGN ] { 24 }
     Constant [ integer XC_OPSPEC_FETCHTYPE ] { 25 }
     Constant [ integer XC_SIZEOF_TEMP_VARIABLE ] { 32 }
-    Constant [ string XCACHE_VERSION ] { 4.0.0-dev }
+    Constant [ string XCACHE_VERSION ] { 3.2.0-rc1 }
     Constant [ string XCACHE_MODULES ] { cacher optimizer coverager }
   }
 
   - Functions {
+    Function [ <internal:XCache> function xcache_coredump ] {
+    }
     Function [ <internal:XCache> function xcache_get_special_value ] {
-
-      - Parameters [1] {
-        Parameter #0 [ <required> $value ]
-      }
     }
     Function [ <internal:XCache> function xcache_get_type ] {
-
-      - Parameters [1] {
-        Parameter #0 [ <required> $value ]
-      }
     }
     Function [ <internal:XCache> function xcache_get_op_type ] {
-
-      - Parameters [1] {
-        Parameter #0 [ <required> $op_type ]
-      }
     }
     Function [ <internal:XCache> function xcache_get_data_type ] {
-
-      - Parameters [1] {
-        Parameter #0 [ <required> $type ]
-      }
     }
     Function [ <internal:XCache> function xcache_get_opcode ] {
-
-      - Parameters [1] {
-        Parameter #0 [ <required> $opcode ]
-      }
     }
     Function [ <internal:XCache> function xcache_get_opcode_spec ] {
-
-      - Parameters [1] {
-        Parameter #0 [ <required> $opcode ]
-      }
-    }
-    Function [ <internal:XCache> function xcache_coredump ] {
-
-      - Parameters [0] {
-      }
     }
     Function [ <internal:XCache> function xcache_is_autoglobal ] {
-
-      - Parameters [1] {
-        Parameter #0 [ <required> $name ]
-      }
     }
     Function [ <internal:XCache> function xcache_get_refcount ] {
-
-      - Parameters [1] {
-        Parameter #0 [ <required> &$variable ]
-      }
-    }
-    Function [ <internal:XCache> function xcache_get_cowcount ] {
-
-      - Parameters [1] {
-        Parameter #0 [ <required> $variable ]
-      }
     }
     Function [ <internal:XCache> function xcache_get_isref ] {
 
@@ -292,7 +251,7 @@ Extension [ <persistent> extension #143 XCache version 4.0.0-dev ] {
   }
 }
 
-Extension [ <persistent> extension #168 XCache Cacher version 4.0.0-dev ] {
+Extension [ <persistent> extension #181 XCache Cacher version 3.2.0-rc1 ] {
 
   - INI {
     Entry [ xcache.shm_scheme <SYSTEM> ]
@@ -305,7 +264,7 @@ Extension [ <persistent> extension #168 XCache Cacher version 4.0.0-dev ] {
       Current = ''
     }
     Entry [ xcache.admin.enable_auth <SYSTEM> ]
-      Current = '1'
+      Current = ''
     }
     Entry [ xcache.size <SYSTEM> ]
       Current = '60M'
@@ -367,103 +326,37 @@ Extension [ <persistent> extension #168 XCache Cacher version 4.0.0-dev ] {
 
   - Functions {
     Function [ <internal:XCache Cacher> function xcache_count ] {
-
-      - Parameters [1] {
-        Parameter #0 [ <required> $type ]
-      }
     }
     Function [ <internal:XCache Cacher> function xcache_info ] {
-
-      - Parameters [2] {
-        Parameter #0 [ <required> $type ]
-        Parameter #1 [ <required> $id ]
-      }
     }
     Function [ <internal:XCache Cacher> function xcache_list ] {
-
-      - Parameters [2] {
-        Parameter #0 [ <required> $type ]
-        Parameter #1 [ <required> $id ]
-      }
     }
     Function [ <internal:XCache Cacher> function xcache_clear_cache ] {
-
-      - Parameters [2] {
-        Parameter #0 [ <required> $type ]
-        Parameter #1 [ <optional> $id ]
-      }
     }
     Function [ <internal:XCache Cacher> function xcache_enable_cache ] {
-
-      - Parameters [3] {
-        Parameter #0 [ <required> $type ]
-        Parameter #1 [ <optional> $id ]
-        Parameter #2 [ <optional> $enable ]
-      }
     }
     Function [ <internal:XCache Cacher> function xcache_admin_namespace ] {
-
-      - Parameters [0] {
-      }
     }
     Function [ <internal:XCache Cacher> function xcache_set_namespace ] {
-
-      - Parameters [1] {
-        Parameter #0 [ <required> $namespace ]
-      }
     }
     Function [ <internal:XCache Cacher> function xcache_get ] {
-
-      - Parameters [1] {
-        Parameter #0 [ <required> $name ]
-      }
     }
     Function [ <internal:XCache Cacher> function xcache_set ] {
-
-      - Parameters [3] {
-        Parameter #0 [ <required> $name ]
-        Parameter #1 [ <required> $value ]
-        Parameter #2 [ <optional> $ttl ]
-      }
     }
     Function [ <internal:XCache Cacher> function xcache_isset ] {
-
-      - Parameters [1] {
-        Parameter #0 [ <required> $name ]
-      }
     }
     Function [ <internal:XCache Cacher> function xcache_unset ] {
-
-      - Parameters [1] {
-        Parameter #0 [ <required> $name ]
-      }
     }
     Function [ <internal:XCache Cacher> function xcache_unset_by_prefix ] {
-
-      - Parameters [1] {
-        Parameter #0 [ <required> $prefix ]
-      }
     }
     Function [ <internal:XCache Cacher> function xcache_inc ] {
-
-      - Parameters [3] {
-        Parameter #0 [ <required> $prefix ]
-        Parameter #1 [ <optional> $value ]
-        Parameter #2 [ <optional> $ttl ]
-      }
     }
     Function [ <internal:XCache Cacher> function xcache_dec ] {
-
-      - Parameters [3] {
-        Parameter #0 [ <required> $prefix ]
-        Parameter #1 [ <optional> $value ]
-        Parameter #2 [ <optional> $ttl ]
-      }
     }
   }
 }
 
-Extension [ <persistent> extension #169 XCache Coverager version 4.0.0-dev ] {
+Extension [ <persistent> extension #182 XCache Coverager version 3.2.0-rc1 ] {
 
   - INI {
     Entry [ xcache.coverager <PERDIR,SYSTEM> ]
@@ -479,33 +372,17 @@ Extension [ <persistent> extension #169 XCache Coverager version 4.0.0-dev ] {
 
   - Functions {
     Function [ <internal:XCache Coverager> function xcache_coverager_decode ] {
-
-      - Parameters [1] {
-        Parameter #0 [ <required> $data ]
-      }
     }
     Function [ <internal:XCache Coverager> function xcache_coverager_start ] {
-
-      - Parameters [1] {
-        Parameter #0 [ <optional> $clean ]
-      }
     }
     Function [ <internal:XCache Coverager> function xcache_coverager_stop ] {
-
-      - Parameters [1] {
-        Parameter #0 [ <optional> $clean ]
-      }
     }
     Function [ <internal:XCache Coverager> function xcache_coverager_get ] {
-
-      - Parameters [1] {
-        Parameter #0 [ <optional> $clean ]
-      }
     }
   }
 }
 
-Extension [ <persistent> extension #167 XCache Optimizer version 4.0.0-dev ] {
+Extension [ <persistent> extension #180 XCache Optimizer version 3.2.0-rc1 ] {
 
   - INI {
     Entry [ xcache.optimizer <ALL> ]
diff --git a/php-xcache-dev.spec b/php-xcache-dev.spec
index 4fd4a2f..997542a 100644
--- a/php-xcache-dev.spec
+++ b/php-xcache-dev.spec
@@ -16,7 +16,8 @@
 %{!?__php:       %global __php            %{_bindir}/php}
 
 %global ext_name     xcache
-%global svnrev       1496
+#global svnrev       1496
+%global prever       rc1
 %global with_zts     0%{?__ztsphp:1}
 
 %if "%{php_version}" < "5.6"
@@ -27,18 +28,19 @@
 
 Summary:       Fast, stable PHP opcode cacher
 Name:          %{?scl_prefix}php-xcache
-Version:       4.0.0
-Release:       0.2.svn%{svnrev}%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}
+Epoch:         1
+Version:       3.2.0
+Release:       0.1.%{prever}%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}
 License:       BSD
 Group:         Development/Languages
 URL:           http://xcache.lighttpd.net/
 
 %if 0%{?svnrev}
-# svn co -r 1496 svn://svn.lighttpd.net/xcache/trunk xcache-4.0.0
+# svn export -r 1496 svn://svn.lighttpd.net/xcache/branches/3.2 xcache-3.2
 # tar czf xcache-svn1496.tgz xcache-4.0.0
 Source0:       xcache-svn%{svnrev}.tgz
 %else
-Source0:       http://xcache.lighttpd.net/pub/Releases/%{version}/%{ext_name}-%{version}.tar.gz
+Source0:       http://xcache.lighttpd.net/pub/Releases/%{version}%{?prever:-%{prever}}/%{ext_name}-%{version}%{?prever:-%{prever}}.tar.gz
 %endif
 Source1:       xcache-httpd.conf
 
@@ -56,17 +58,17 @@ Requires:      %{?scl_prefix}php(api) = %{php_core_api}
 
 %if "%{?vendor}" == "Remi Collet" && 0%{!?scl:1}
 # Other third party repo stuff
-Obsoletes: php53-xcache
-Obsoletes: php53u-xcache
-Obsoletes: php54-xcache
-Obsoletes: php54w-xcache
+Obsoletes: php53-xcache  <= %{epoch}:%{version}
+Obsoletes: php53u-xcache <= %{epoch}:%{version}
+Obsoletes: php54-xcache  <= %{epoch}:%{version}
+Obsoletes: php54w-xcache <= %{epoch}:%{version}
 %if "%{php_version}" > "5.5"
-Obsoletes: php55u-xcache
-Obsoletes: php55w-xcache
+Obsoletes: php55u-xcache <= %{epoch}:%{version}
+Obsoletes: php55w-xcache <= %{epoch}:%{version}
 %endif
 %if "%{php_version}" > "5.6"
-Obsoletes: php56u-xcache
-Obsoletes: php56w-xcache
+Obsoletes: php56u-xcache <= %{epoch}:%{version}
+Obsoletes: php56w-xcache <= %{epoch}:%{version}
 %endif
 %endif
 
@@ -94,7 +96,7 @@ Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSIO
 Summary:       XCache Administration
 Group:         Development/Languages
 Requires:      %{?scl_prefix}mod_php
-Requires:      %{name} = %{version}-%{release}
+Requires:      %{name} = %{epoch}:%{version}-%{release}
 %if 0%{?fedora} >= 12 || 0%{?rhel} >= 6
 BuildArch:     noarch
 %endif
@@ -117,7 +119,7 @@ This requires to configure, in XCache configuration file (xcache.ini):
 %setup -q -c 
 
 # rename source folder
-mv %{ext_name}-%{version} nts
+mv %{version}%{?prever:-%{prever}} nts
 
 %if 0%{?scl:1}
 sed -e 's:%{_root_datadir}:%{_datadir}:' \
@@ -135,8 +137,8 @@ cd nts
 
 # Sanity check, really often broken
 extver=$(sed -n '/define XCACHE_VERSION/{s/.* "//;s/".*$//;p}' xcache.h)
-if test "x${extver}" != "x%{version}%{?svnrev:-dev}"; then
-   : Error: Upstream extension version is ${extver}, expecting %{version}%{?svnrev:-dev}.
+if test "x${extver}" != "x%{version}%{?svnrev:-dev}%{?prever:-%{prever}}"; then
+   : Error: Upstream extension version is ${extver}, expecting %{version}%{?svnrev:-dev}%{?prever:-%{prever}}.
    exit 1
 fi
 cd ..
@@ -215,7 +217,7 @@ cd nts
 TEST_PHP_EXECUTABLE=%{__php} \
 NO_INTERACTION=1 \
 REPORT_EXIT_STATUS=1 \
-%{__php} run-tests.php -n -c xcache-test.ini tests
+%{__php} -n run-tests.php -n -c xcache-test.ini tests
 
 %if %{with_zts}
 cd ../zts
@@ -227,7 +229,7 @@ cd ../zts
 TEST_PHP_EXECUTABLE=%{__ztsphp} \
 NO_INTERACTION=1 \
 REPORT_EXIT_STATUS=1 \
-%{__ztsphp} run-tests.php -n -c xcache-test.ini tests
+%{__ztsphp} -n run-tests.php -n -c xcache-test.ini tests
 %endif
 
 
@@ -255,6 +257,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Sep  9 2014 Remi Collet <remi@fedoraproject.org> - 1:3.2.0-0.1.rc1
+- Update to 3.2.0-rc1
+
 * Mon Aug 25 2014 Remi Collet <rcollet@redhat.com> - 4.0.0-0.2.svn1496
 - improve SCL build