- update Archive_Tar to 1.3.11

- drop php 5.5 patch merged upstream

.gitignore

@@ -1,4 +1,5 @@
-*~
+clog
+*spec~
 /Archive_Tar-1.3.7.tgz
 /Structures_Graph-1.0.4.tgz
 /XML_RPC-1.5.4.tgz
@@ -10,3 +11,4 @@
 /Archive_Tar-1.3.8.tgz
 /Archive_Tar-1.3.9.tgz
 /Archive_Tar-1.3.10.tgz
+/Archive_Tar-1.3.11.tgz

php-pear-1.9.4-php55.patch

@@ -1,25 +0,0 @@
---- Archive_Tar-1.3.10/Archive/Tar.php	2012-04-10 19:29:34.000000000 +0200
-+++ Archive_Tar-1.3.10/Archive/Tar.php	2012-12-11 16:41:40.884407997 +0100
-@@ -1343,11 +1343,17 @@
-         for ($i=156; $i<512; $i++)
-            $v_checksum+=ord(substr($v_binary_data,$i,1));
- 
--        $v_data = unpack("a100filename/a8mode/a8uid/a8gid/a12size/a12mtime/" .
--                         "a8checksum/a1typeflag/a100link/a6magic/a2version/" .
--                         "a32uname/a32gname/a8devmajor/a8devminor/a131prefix",
--                         $v_binary_data);
--                         
-+        if (version_compare(PHP_VERSION,"5.5.0-dev")<0) {
-+            $fmt = "a100filename/a8mode/a8uid/a8gid/a12size/a12mtime/" .
-+                   "a8checksum/a1typeflag/a100link/a6magic/a2version/" .
-+                   "a32uname/a32gname/a8devmajor/a8devminor/a131prefix";
-+        } else {
-+            $fmt = "Z100filename/Z8mode/Z8uid/Z8gid/Z12size/Z12mtime/" .
-+                   "Z8checksum/Z1typeflag/Z100link/Z6magic/Z2version/" .
-+                   "Z32uname/Z32gname/Z8devmajor/Z8devminor/Z131prefix";
-+        }
-+        $v_data = unpack($fmt, $v_binary_data);
-+
-         if (strlen($v_data["prefix"]) > 0) {
-             $v_data["filename"] = "$v_data[prefix]/$v_data[filename]";
-         }

php-pear.spec

@@ -2,7 +2,7 @@
 %global metadir %{_localstatedir}/lib/pear
 
 %global getoptver 1.3.1
-%global arctarver 1.3.10
+%global arctarver 1.3.11
 # https://pear.php.net/bugs/bug.php?id=19367
 # Structures_Graph 1.0.4 - incorrect FSF address
 %global structver 1.0.4
@@ -15,7 +15,7 @@
 Summary: PHP Extension and Application Repository framework
 Name: php-pear
 Version: 1.9.4
-Release: 14%{?dist}
+Release: 15%{?dist}
 Epoch: 1
 # PEAR, Archive_Tar, XML_Util are BSD
 # Console_Getopt is PHP
@@ -40,9 +40,6 @@ Source24: http://pear.php.net/get/XML_Util-%{xmlutil}.tgz
 Patch0: php-pear-1.9.4-restcache.patch
 # Relocate Metadata
 Patch1: php-pear-metadata.patch
-# Fix for new PHP 5.5 unpack format
-# http://pear.php.net/bugs/19746
-Patch2: php-pear-1.9.4-php55.patch
 
 BuildArch: noarch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -56,8 +53,8 @@ Provides: php-pear(Archive_Tar) = %{arctarver}
 Provides: php-pear(PEAR) = %{version}
 Provides: php-pear(Structures_Graph) = %{structver}
 Provides: php-pear(XML_Util) = %{xmlutil}
-Obsoletes: php-pear-XML-Util < %{xmlutil}-%{release}
-Provides:  php-pear-XML-Util = %{xmlutil}-%{release}
+Obsoletes: php-pear-XML-Util < %{xmlutil}
+Provides:  php-pear-XML-Util = %{xmlutil}
 
 Requires:  php-cli
 # phpci detected extension
@@ -99,11 +96,12 @@ cp %{SOURCE1} .
 
 # apply patches on used PEAR during install
 %patch1 -p0 -b .metadata
-%patch2 -p1 -b .php55
+
 
 %build
 # This is an empty build section.
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
 
@@ -162,7 +160,6 @@ pushd $RPM_BUILD_ROOT%{peardir}
   %__patch -s --no-backup --fuzz 0 -p0 < %{PATCH0}
  popd
   %__patch -s --no-backup --fuzz 0 -p0 < %{PATCH1}
-  %__patch -s --no-backup --fuzz 0 -p1 < %{PATCH2}
 popd
 
 # Why this file here ?
@@ -252,6 +249,10 @@ fi
 
 
 %changelog
+* Sat Feb  9 2013 Remi Collet <remi@fedoraproject.org> 1:1.9.4-15
+- update Archive_Tar to 1.3.11
+- drop php 5.5 patch merged upstream
+
 * Tue Dec 11 2012 Remi Collet <remi@fedoraproject.org> 1:1.9.4-14
 - add explicit requires on all needed extensions (phpci)
 - fix pecl launcher (need ini to be parsed for some

sources

@@ -1,6 +1,5 @@
-19db62b326a12388d5e23e8c4896d5b6  Archive_Tar-1.3.10.tgz
+ae0c95a03db7dbc723f7d50523029ce5  Archive_Tar-1.3.11.tgz
 310b39cf091b9a0abf398bead60f3f8d  Console_Getopt-1.3.1.tgz
 c52b09758e851235e6a93a2c1e1a8ee9  PEAR-1.9.4.tgz
 b99c5e9ac348a2e81515ba16deb7ded3  Structures_Graph-1.0.4.tgz
-02f9b1a27636527ddf6661e545799d45  XML_RPC-1.5.5.tgz
 b8d4efcdb11b308b179f7bb63043284f  XML_Util-1.2.1.tgz