[php-sabredav-Sabre_DAV] Fix to correcly patch and install the pear package.

Joseph Marrero jmarrero at fedoraproject.org
Wed May 1 23:09:39 UTC 2013


commit ad2c222c943bf8f439f137df027c1bb419563ece
Author: jmarrero <jmarrero at fedoraproject.org>
Date:   Wed May 1 19:08:06 2013 -0400

    Fix to correcly patch and install the pear package.

 php-sabredav-Sabre_DAV.spec |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)
---
diff --git a/php-sabredav-Sabre_DAV.spec b/php-sabredav-Sabre_DAV.spec
index 18b9708..5505469 100644
--- a/php-sabredav-Sabre_DAV.spec
+++ b/php-sabredav-Sabre_DAV.spec
@@ -4,7 +4,7 @@
 
 Name:           php-sabredav-Sabre_DAV
 Version:        1.6.5
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Sabre_DAV is a WebDAV framework for PHP
 
 License:        BSD
@@ -39,9 +39,8 @@ is meant to cover the entire standard.
 %prep
 %setup -q -c
 %patch1 -p0
-[ -f package2.xml ] || mv package.xml package2.xml
-mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml
-
+sed -e '/Plugin.php/s/md5sum.*name/name/' \
+  package.xml > %{pear_name}-%{version}/%{pear_name}.xml
 
 %build
 # Empty build section, most likely nothing required.
@@ -49,7 +48,7 @@ mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml
 
 %install
 cd %{pear_name}-%{version}
-%{__pear} install --nodeps --ignore-errors --packagingroot $RPM_BUILD_ROOT %{pear_name}.xml
+%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{pear_name}.xml
 
 # Clean up unnecessary files
 %if 0%{?rhel}
@@ -81,6 +80,8 @@ fi
 
 
 %changelog
+* Wed May 01 2013 Joseph Marrero <jmarrero at fedoraproject.org> - 1.6.5-5
+- Fix problem with checksum whitout braking the files installed 
 * Sun Apr 28 2013 Joseph Marrero <jmarrero at fedoraproject.org> - 1.6.5-4
 - added security patch that fixes bugs 951568 951569 951562
 - added --ignore-erros flag to pear install macro to accept the patch


More information about the scm-commits mailing list