summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Callaway <spot@fedoraproject.org>2008-02-29 18:45:25 +0000
committerTom Callaway <spot@fedoraproject.org>2008-02-29 18:45:25 +0000
commitcff9517ed648c43122217d81a0c79bbd9f45dd75 (patch)
treeee18af707e26ecdf6466382debbd34d53e6a5b3b
parent5c622a8e2f6a2765f722f2eb56bf01b2effe769a (diff)
downloaddevice-mapper-multipath-cff9517ed648c43122217d81a0c79bbd9f45dd75.tar.gz
device-mapper-multipath-cff9517ed648c43122217d81a0c79bbd9f45dd75.tar.xz
device-mapper-multipath-cff9517ed648c43122217d81a0c79bbd9f45dd75.zip
-rw-r--r--device-mapper-multipath.spec10
-rw-r--r--multipath-tools-0.4.7.head2-sparc64fix.patch12
2 files changed, 20 insertions, 2 deletions
diff --git a/device-mapper-multipath.spec b/device-mapper-multipath.spec
index 9f0e035..37d8d7b 100644
--- a/device-mapper-multipath.spec
+++ b/device-mapper-multipath.spec
@@ -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
diff --git a/multipath-tools-0.4.7.head2-sparc64fix.patch b/multipath-tools-0.4.7.head2-sparc64fix.patch
new file mode 100644
index 0000000..0366d55
--- /dev/null
+++ b/multipath-tools-0.4.7.head2-sparc64fix.patch
@@ -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;