php-phpseclib-*: 0.3.7

2 files changed, 20 insertions, 29 deletions

diff --git a/Crypt_RSA-role.patch b/Crypt_RSA-role.patch
index feab1fe..bb51634 100644
--- a/Crypt_RSA-role.patch
+++ b/Crypt_RSA-role.patch
@@ -1,7 +1,7 @@
-diff -up ./Crypt_RSA-0.3.6/RSA.php.orig ./Crypt_RSA-0.3.6/RSA.php
---- ./Crypt_RSA-0.3.6/RSA.php.orig	2014-02-26 17:57:48.055385477 +0100
-+++ ./Crypt_RSA-0.3.6/RSA.php	2014-02-26 17:59:38.974772761 +0100
-@@ -170,7 +170,7 @@ define('CRYPT_RSA_MODE_OPENSSL', 2);
+diff -up Crypt_RSA-0.3.7/RSA.php.role Crypt_RSA-0.3.7/RSA.php
+--- Crypt_RSA-0.3.7/RSA.php.role	2014-07-07 17:19:19.711010692 +0200
++++ Crypt_RSA-0.3.7/RSA.php	2014-07-07 17:19:19.712010697 +0200
+@@ -178,7 +178,7 @@ define('CRYPT_RSA_MODE_OPENSSL', 2);
  /**
   * Default openSSL configuration file.
   */
@@ -10,7 +10,7 @@ diff -up ./Crypt_RSA-0.3.6/RSA.php.orig ./Crypt_RSA-0.3.6/RSA.php
  
  /**#@+
   * @access public
-@@ -464,7 +464,14 @@ class Crypt_RSA
+@@ -490,7 +490,14 @@ class Crypt_RSA
              include_once 'Math/BigInteger.php';
          }
  
@@ -26,19 +26,3 @@ diff -up ./Crypt_RSA-0.3.6/RSA.php.orig ./Crypt_RSA-0.3.6/RSA.php
  
          if ( !defined('CRYPT_RSA_MODE') ) {
              // Math/BigInteger's openssl requirements are a little less stringent than Crypt/RSA's. in particular,
-diff -up ./package.xml.orig ./package.xml
---- ./package.xml.orig	2014-02-26 17:59:38.974772761 +0100
-+++ ./package.xml	2014-02-26 18:00:08.020874166 +0100
-@@ -23,8 +23,10 @@
-  <notes>0.3.6 release</notes>
-  <contents>
-   <dir name="/">
--    <file baseinstalldir="Crypt" name="RSA.php" role="php" md5sum="158051c445d140e7b4486487307a8f11"/>
--    <file baseinstalldir="" name="openssl.cnf" role="php" md5sum="0f1015cb8894127a94a05afa7cc23760"/>
-+    <file baseinstalldir="Crypt" name="RSA.php" role="php">
-+       <tasks:replace from="@cfg_dir@" to="cfg_dir" type="pear-config" />
-+    </file>
-+    <file name="openssl.cnf" role="cfg" md5sum="0f1015cb8894127a94a05afa7cc23760"/>
-   </dir>
-  </contents>
-  <dependencies>
diff --git a/php-phpseclib-crypt-rsa.spec b/php-phpseclib-crypt-rsa.spec
index b7623ad..b5466cf 100644
--- a/php-phpseclib-crypt-rsa.spec
+++ b/php-phpseclib-crypt-rsa.spec
@@ -2,7 +2,7 @@
 %global pear_name Crypt_RSA
 
 Name:           php-phpseclib-crypt-rsa
-Version:        0.3.6
+Version:        0.3.7
 Release:        1%{?dist}
 Summary:        Pure-PHP PKCS#1 (v2.1) compliant implementation of RSA
 
@@ -17,33 +17,37 @@ Patch0:         %{pear_name}-role.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  php-pear(PEAR)
+BuildRequires:  php-channel(phpseclib.sourceforge.net)
 
 Requires(post): %{__pear}
 Requires(postun): %{__pear}
 Requires:       php-pear(PEAR)
+Requires:       php-channel(phpseclib.sourceforge.net)
 Requires:       php-pear(phpseclib.sourceforge.net/Math_BigInteger) >= 0.3.0
 Requires:       php-pear(phpseclib.sourceforge.net/Crypt_Random) >= 0.3.0
 Requires:       php-pear(phpseclib.sourceforge.net/Crypt_Hash) >= 0.3.0
-Requires:       php-pear(PEAR) >= 1.4.0
-Provides:       php-pear(phpseclib.sourceforge.net/Crypt_RSA) = %{version}
-BuildRequires:  php-channel(phpseclib.sourceforge.net)
-Requires:       php-channel(phpseclib.sourceforge.net)
 # phpcompatinfo, generated from 0.3.5
 Requires:       php-date
 Requires:       php-pcre
 Requires:       php-xml
 
+Provides:       php-pear(phpseclib.sourceforge.net/Crypt_RSA) = %{version}
+
+
 %description
 Pure-PHP PKCS#1 (v2.1) compliant implementation of RSA. Optionally uses
 openssl.
 
 %prep
 %setup -q -c
-sed -e 's/\r//' -i %{pear_name}-%{version}/*php
-%patch0 -p0
-mv package.xml %{pear_name}-%{version}/%{name}.xml
 
 cd %{pear_name}-%{version}
+sed -e 's/\r//' -i RSA.php
+%patch0 -p1 -b .role
+sed -e '/RSA.php/s/md5sum="[^"]*"//' \
+    ../package.xml >%{name}.xml
+touch -r ../package.xml %{name}.xml
+
 
 %build
 cd %{pear_name}-%{version}
@@ -87,6 +91,9 @@ fi
 
 
 %changelog
+* Mon Jul 07 2014 Remi Collet <remi@fedoraproject.org> - 0.3.7-1
+- Update to 0.3.7
+
 * Wed Feb 26 2014 Remi Collet <remi@fedoraproject.org> - 0.3.6-1
 - Update to 0.3.6