rpms/dmraid/F-10 dmraid-1.0.0.rc15-whitespace.patch, NONE, 1.1 dmraid.spec, 1.89, 1.90
Bill Nottingham
notting at fedoraproject.org
Wed Nov 19 01:58:48 UTC 2008
Author: notting
Update of /cvs/extras/rpms/dmraid/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7014
Modified Files:
dmraid.spec
Added Files:
dmraid-1.0.0.rc15-whitespace.patch
Log Message:
Re-add upstream whitespace removal patch (#468649, #470634)
Without it, isw is completely broken.
dmraid-1.0.0.rc15-whitespace.patch:
--- NEW FILE dmraid-1.0.0.rc15-whitespace.patch ---
===================================================================
RCS file: /cvs/dm/dmraid/lib/device/scsi.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- dmraid/lib/device/scsi.c 2008/09/19 14:31:11 1.3
+++ dmraid/lib/device/scsi.c 2008/10/31 12:22:35 1.4
@@ -110,7 +110,7 @@
}
ret = ret &&
- (di->serial = dbg_strdup((char *) &response[p->start + 1]));
+ (di->serial = dbg_strdup(remove_white_space (lc, (char *) &response[p->start + 1], serial_len)));
}
dbg_free(response);
Index: dmraid.spec
===================================================================
RCS file: /cvs/extras/rpms/dmraid/F-10/dmraid.spec,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- dmraid.spec 25 Sep 2008 14:17:12 -0000 1.89
+++ dmraid.spec 19 Nov 2008 01:58:18 -0000 1.90
@@ -1,10 +1,11 @@
Summary: Device-mapper RAID tool and library
Name: dmraid
Version: 1.0.0.rc15
-Release: 1%{?dist}
+Release: 2%{?dist}
License: GPLv2+
Group: System Environment/Base
URL: http://people.redhat.com/heinzm/sw/dmraid
+Patch0: dmraid-1.0.0.rc15-whitespace.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: device-mapper-devel, libselinux-devel, libsepol-devel
Requires: kpartx
@@ -40,6 +41,8 @@
%prep
%setup -q -n dmraid/%{version}
+pwd
+%patch0 -p1
%build
%configure --prefix=${RPM_BUILD_ROOT}/usr --sbindir=${RPM_BUILD_ROOT}/sbin --libdir=${RPM_BUILD_ROOT}/%{_libdir} --mandir=${RPM_BUILD_ROOT}/%{_mandir} --includedir=${RPM_BUILD_ROOT}/%{_includedir} --enable-debug --enable-libselinux --enable-libsepol --disable-static_link
@@ -85,6 +88,9 @@
%attr(755,root,root) %{_libdir}/libdmraid.so.*
%changelog
+* Tue Nov 18 2008 Bill Nottingham <notting at redhat.com> - 1.0.0.rc15-2
+- Re-add upstream whitespace removal patch (#468649, #470634)
+
* Thu Sep 25 2008 Heinz Mauelshagen <heinzm at redhat.com> - 1.0.0.rc15-1
- Update to version 1.0.0.rc15
More information about the fedora-extras-commits
mailing list