fix sparc64, fix license tag

This commit is contained in:
Tom Callaway 2008-02-29 18:45:25 +00:00
parent 5c622a8e2f
commit cff9517ed6
2 changed files with 20 additions and 2 deletions

View File

@ -1,11 +1,12 @@
Summary: Tools to manage multipath devices using device-mapper
Name: device-mapper-multipath
Version: 0.4.7
Release: 13%{?dist}
License: GPL
Release: 14%{?dist}
License: GPL+
Group: System Environment/Base
URL: http://christophe.varoqui.free.fr/
Source0: multipath-tools-0.4.7.head2.tgz
Patch0: multipath-tools-0.4.7.head2-sparc64fix.patch
Requires: kpartx = %{version}-%{release}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires(post): chkconfig
@ -32,6 +33,7 @@ kpartx manages partition creation and removal for device-mapper devices.
%prep
%setup -q -n multipath-tools-0.4.7.head2
%patch0 -p1 -b .sparc64
%build
make DESTDIR=$RPM_BUILD_ROOT
@ -79,6 +81,10 @@ fi
%{_mandir}/man8/kpartx.8.gz
%changelog
* Fri Feb 29 2008 Tom "spot" Callaway <tcallawa@redhat.com> - 0.4.7-14
- fix sparc64
- fix license tag
* Tue Feb 19 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 0.4.7-13
- Autorebuild for GCC 4.3

View File

@ -0,0 +1,12 @@
diff -up multipath-tools-0.4.7.head2/kpartx/lopart.c.BAD multipath-tools-0.4.7.head2/kpartx/lopart.c
--- multipath-tools-0.4.7.head2/kpartx/lopart.c.BAD 2008-02-29 13:35:19.000000000 -0500
+++ multipath-tools-0.4.7.head2/kpartx/lopart.c 2008-02-29 13:36:44.000000000 -0500
@@ -30,7 +30,7 @@
#if defined(__hppa__) || defined(__powerpc64__) || defined (__alpha__) \
|| defined (__x86_64__)
typedef unsigned long __kernel_old_dev_t;
-#elif defined(__powerpc__) || defined(__ia64__)
+#elif defined(__powerpc__) || defined(__ia64__) || (defined(__sparc__) && defined (__arch64__))
typedef unsigned int __kernel_old_dev_t;
#else
typedef unsigned short __kernel_old_dev_t;