- updated to 6.1-pre21, use optflags

Changed files:
    gfs.spec -> 1.5

diff --git a/gfs.spec b/gfs.spec
index 9a35d0a75b163b8f564a7433cf018e1d46ad6abe..53f0d803df19a8a843fc15419942ad2345c117f1 100644 (file)
--- a/gfs.spec
+++ b/gfs.spec
@@ -1,13 +1,21 @@
 Summary:       Shared-disk cluster file system
 Summary(pl):   Klastrowy system plików na wspó³dzielonym dysku
 Name:          gfs
-%define        snap    20040625
-Version:       0.0.0.%{snap}.1
-Release:       1
-License:       GPL
+Version:       6.1
+%define        bver    pre21
+Release:       0.%{bver}.1
+License:       GPL v2
 Group:         Applications/System
-Source0:       %{name}.tar.gz
-# Source0-md5: 2e787a04f4b730b705bbd9d25dbdee72
+Source0:       http://people.redhat.com/cfeist/cluster/tgz/%{name}-%{version}-%{bver}.tar.gz
+# Source0-md5: 0b623c83354884e9da498e09130a3214
+# from gfs-kernel CVS
+Source1:       gfs_ondisk.h
+# NoSource1-md5: 772e1801249bff0478b844924c0fdc20 (rev. 1.7; doesn't compile with 1.8)
+Source2:       gfs_ioctl.h
+# NoSource2-md5: fad0a58f6f39499661704f0d5af3a8c0 (rev. 1.10)
+# from gfs-kernel/harness CVS
+Source3:       lm_interface.h
+# NoSource3-md5: 5b000a3b33af218e1b6b8a7d96b7e356 (rev. 1.7)
 URL:           http://sources.redhat.com/cluster/gfs/
 BuildRequires: iddev
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -36,12 +44,17 @@ systemie plik
 wszystkich innych maszynach w klastrze.
 
 %prep
-%setup -q -n %{name}
+%setup -q -n %{name}-%{version}-%{bver}
+
+install -d include/linux
+cp %{SOURCE1} %{SOURCE2} %{SOURCE3} include/linux
+
+%{__perl} -pi -e 's/-Wall/%{rpmcflags} -Wall/' make/defines.mk.input
+%{__perl} -pi -e 's/-O2 //' gfs_{mkfs,quota,tool}/Makefile
 
 %build
 ./configure \
        --incdir=%{_includedir} \
-       --kernel_src=%{_kernelsrcdir} \
        --libdir=%{_libdir} \
        --mandir=%{_mandir} \
        --prefix=%{_prefix} \
@@ -61,4 +74,5 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_sbindir}/*
+#%attr(754,root,root) /etc/rc.d/init.d/gfs
 %{_mandir}/man?/*