- restored 0.7.x on AC-branch

- drbd-8.x moved to drbd8.spec:AC-branch

Changed files:
    drbd-Makefile.patch -> 1.2.2.1
    drbd.spec -> 1.90.4.25

diff --git a/drbd-Makefile.patch b/drbd-Makefile.patch
index 8f3fa2aca27566a8538b1419cc4a842c22bffc62..09764413b0c9665774dea0e10eb0ff8811e8d7e5 100644 (file)
--- a/drbd-Makefile.patch
+++ b/drbd-Makefile.patch
@@ -1,33 +1,29 @@
---- 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
-@@ -20,7 +20,7 @@
- KDIR := /lib/modules/$(shell uname -r)/build
+--- drbd-0.7.22.orig/user/Makefile     2004-10-28 12:44:25.000000000 +0000
++++ drbd-0.7.22.Makefile/user/Makefile 2006-11-23 23:22:42.000000000 +0000
+@@ -17,7 +17,7 @@
+ # the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ #
  
- CC = gcc
--CFLAGS = -g -O2 -c -W -Wall -I../drbd
+-CFLAGS = -c -Wall -I../drbd
 +CFLAGS = $(OPTCFLAGS) -Wall -I../drbd
- # for the netlink connector stuff <linux/connector.h>:
- drbdsetup: CFLAGS += -I$(KDIR)/include
- drbdsetup drbdmeta: CFLAGS += -fno-strict-aliasing
-@@ -43,7 +43,7 @@
-       cp $^ $@
+ CC = gcc
+ 
+ drbdadm-obj = drbdadm_scanner.o drbdadm_parser.o drbdadm_main.o \
+@@ -28,7 +28,7 @@
+ all: drbdsetup drbdadm
  
  drbdadm: $(drbdadm-obj)
--      $(CC) -o $@ $^
+-      $(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
+@@ -42,7 +42,7 @@
+       bison -d -o drbdadm_parser.c drbdadm_parser.y
  
  drbdsetup: $(drbdsetup-obj)
--      $(CC) -o $@ $^
-+      $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
- 
- drbdmeta: $(drbdmeta-obj)
--      $(CC) -o $@ $^
+-      $(CC) -o $@ $^ 
 +      $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
  
  clean:
-       rm -f drbdadm_scanner.c drbdmeta_scanner.c
+       rm -f drbdadm_scanner.c

diff --git a/drbd.spec b/drbd.spec
index d33e8178e923f2d2fc1b3f5fb164cd2b3b585822..91844ccfd1d8c7c6d716d481a1288573a1d8655e 100644 (file)
--- a/drbd.spec
+++ b/drbd.spec
@@ -27,12 +27,12 @@
 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.2.5
+Version:       0.7.25
 Release:       %{_rel}
 License:       GPL
 Group:         Base/Kernel
-Source0:       http://oss.linbit.com/drbd/8.2/%{pname}-%{version}.tar.gz
-# Source0-md5: f3297c1d032fd90cd0441285fef05bcb
+Source0:       http://oss.linbit.com/drbd/0.7/%{pname}-%{version}.tar.gz
+# Source0-md5: 9db298c97306d7d0fe6d0cdbdf695cf6
 Patch0:                %{pname}-Makefile.patch
 URL:           http://www.drbd.org/
 %if %{with userspace}
@@ -149,7 +149,7 @@ install -d $RPM_BUILD_ROOT{/sbin,%{_mandir}/man{5,8},%{_sysconfdir}} \
 %endif
 
 %if %{with userspace}
-install user/{drbdadm,drbdmeta,drbdsetup} $RPM_BUILD_ROOT/sbin
+install user/{drbdadm,drbdsetup} $RPM_BUILD_ROOT/sbin
 install scripts/drbd.conf $RPM_BUILD_ROOT%{_sysconfdir}
 install scripts/drbd $RPM_BUILD_ROOT/etc/rc.d/init.d
 
@@ -198,7 +198,6 @@ fi
 %defattr(644,root,root,755)
 %attr(755,root,root) /sbin/drbdadm
 %attr(2754,root,haclient) /sbin/drbdsetup
-%attr(2754,root,haclient) /sbin/drbdmeta
 %attr(754,root,root) /etc/rc.d/init.d/drbd
 %attr(755,root,root) %{_sysconfdir}/ha.d/resource.d/drbddisk
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/drbd.conf