- up to 8.3.7 rc2 (supports 2.6.32)

Changed files:
    drbd-Makefile.patch -> 1.6
    drbd-parallel-install.patch -> 1.2
    drbd-swab.patch -> 1.2
    drbd.spec -> 1.130

diff --git a/drbd-Makefile.patch b/drbd-Makefile.patch
deleted file mode 100644 (file)
index 2799e51..0000000
--- a/drbd-Makefile.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- drbd-8.0.0/user/Makefile.orig      2007-01-16 21:07:58.000000000 +0100
-+++ drbd-8.0.0/user/Makefile   2007-01-29 17:08:57.844752000 +0100
-@@ -21,7 +21,7 @@
- 
- CC = gcc
- OPTFLAGS = -O1
--CFLAGS = $(OPTFLAGS) -c -W -Wall -I../drbd
-+CFLAGS = $(OPTFLAGS) -W -Wall -I../drbd
- 
- drbdadm-obj = drbdadm_scanner.o drbdadm_parser.o drbdadm_main.o \
-             drbdadm_adjust.o drbdtool_common.o drbdadm_usage_cnt.o \
-@@ -43,7 +43,7 @@
-       cp $^ $@
- 
- drbdadm: $(drbdadm-obj)
--      $(CC) -o $@ $^
-+      $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
- 
- drbdadm_scanner.c: drbdadm_scanner.fl drbdadm_parser.h
-       flex -s -odrbdadm_scanner.c drbdadm_scanner.fl
-@@ -54,10 +54,10 @@
- # for debug:  flex -d -s -odrbdadm_scanner.c drbdadm_scanner.fl
- 
- drbdsetup: $(drbdsetup-obj)
--      $(CC) -o $@ $^
-+      $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
- 
- drbdmeta: $(drbdmeta-obj)
--      $(CC) -o $@ $^
-+      $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
- 
- clean:
-       rm -f drbdadm_scanner.c drbdmeta_scanner.c

diff --git a/drbd-parallel-install.patch b/drbd-parallel-install.patch
deleted file mode 100644 (file)
index ed19339..0000000
--- a/drbd-parallel-install.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- drbd-8.3.2/scripts/Makefile~       2009-06-25 12:21:54.000000000 +0200
-+++ drbd-8.3.2/scripts/Makefile        2009-08-15 13:42:56.765765927 +0200
-@@ -135,7 +135,7 @@
- # e.g. if you build in some changeroot without access to the package database,
- # or without udev installed.
- # 
--install-udev-rules:
-+install-udev-rules: install-most
-       disable=.disabled ; \
-       v=$$(udevadm version 2>/dev/null) || \
-       v=$$(rpm -q --qf '%{VERSION}' udev 2>/dev/null) || \

diff --git a/drbd-swab.patch b/drbd-swab.patch
deleted file mode 100644 (file)
index 55f9532..0000000
--- a/drbd-swab.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- drbd-8.3.2/drbd/drbd_main.c~       2009-06-25 15:13:04.000000000 +0200
-+++ drbd-8.3.2/drbd/drbd_main.c        2009-08-15 13:09:23.195950819 +0200
-@@ -43,7 +43,8 @@
- #include <linux/random.h>
- #include <linux/reboot.h>
- #include <linux/notifier.h>
--#ifdef HAVE_LINUX_BYTEORDER_SWABB_H
-+#include <linux/version.h>
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29)
- #include <linux/byteorder/swabb.h>
- #else
- #include <linux/swab.h>

diff --git a/drbd.spec b/drbd.spec
index a125d6f617d27fa73d041c5f4bac46fbf744af80..03c7abda88fcc3ec12e6b70955f6b57f41fcc548 100644 (file)
--- a/drbd.spec
+++ b/drbd.spec
@@ -26,17 +26,17 @@
 %undefine      with_userspace
 %endif
 
-%define                rel     11
+%define                rel     1
 %define                pname   drbd
 Summary:       drbd is a block device designed to build high availibility clusters
 Summary(pl.UTF-8):     drbd jest urządzeniem blokowym dla klastrów o wysokiej niezawodności
 Name:          %{pname}%{_alt_kernel}
-Version:       8.3.5
-Release:       %{rel}
+Version:       8.3.7
+Release:       0.rc2.%{rel}
 License:       GPL
 Group:         Base/Kernel
-Source0:       http://oss.linbit.com/drbd/8.3/%{pname}-%{version}.tar.gz
-# Source0-md5: 2a27a6924146ccd61e11e3a973707069
+Source0:       http://oss.linbit.com/drbd/8.3/%{pname}-%{version}rc2.tar.gz
+# Source0-md5: 642b857575d87f598c63775f48e34777
 Patch0:                %{pname}-Makefile.patch
 Patch1:                %{pname}-swab.patch
 Patch2:                %{pname}-parallel-install.patch
@@ -130,12 +130,13 @@ udev rules for drbd kernel module.
 Reguły udev dla modułu jądra Linuksa dla drbd.
 
 %prep
-%setup -q -n %{pname}-%{version}
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
+%setup -q -n %{pname}-%{version}rc2
+#%patch0 -p1
+#%patch1 -p1
+#%patch2 -p1
 
 %build
+%configure
 %if %{with userspace}
 %{__make} tools \
        KVER=dummy \
@@ -164,7 +165,8 @@ install -d $RPM_BUILD_ROOT{/sbin,%{_mandir}/man{5,8},%{_sysconfdir}} \
 %if %{with userspace}
 %{__make} install -C scripts \
        DRBD_ENABLE_UDEV=1 \
-       PREFIX=$RPM_BUILD_ROOT
+       DESTDIR=$RPM_BUILD_ROOT
+
 install scripts/drbd $RPM_BUILD_ROOT/etc/rc.d/init.d
 rm -rf $RPM_BUILD_ROOT/etc/init.d
 install user/{drbdadm,drbdmeta,drbdsetup} $RPM_BUILD_ROOT/sbin