Author: glen Date: Wed Dec 26 12:38:01 2007 GMT
Module: SPECS Tag: AC-branch
---- Log message:
- updated to 8.2.1 from HEAD
---- Files affected:
SPECS:
drbd.spec (1.90.4.20 -> 1.90.4.21)
---- Diffs:
================================================================
Index: SPECS/drbd.spec
diff -u SPECS/drbd.spec:1.90.4.20 SPECS/drbd.spec:1.90.4.21
--- SPECS/drbd.spec:1.90.4.20 Wed Dec 26 12:52:08 2007
+++ SPECS/drbd.spec Wed Dec 26 13:37:55 2007
@@ -23,30 +23,25 @@
%undefine with_userspace
%endif
-%define _rel 57
+%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: 0.7.24
+Version: 8.2.1
Release: %{_rel}
License: GPL
Group: Base/Kernel
-Source0: http://oss.linbit.com/drbd/0.7/%{pname}-%{version}.tar.gz
-# Source0-md5: b2c7335514a355b874a634dc12b22522
+Source0: http://oss.linbit.com/drbd/8.2/%{pname}-%{version}.tar.gz
+# Source0-md5: 345c1056b2033184a7935c1bb79cc57e
Patch0: %{pname}-Makefile.patch
-# based on http://members.home.nl/maarten/drbd-0.7.22-2.6.19.patch but
compliant
-# with older kernels
-Patch1: %{pname}-0.7.22-2.6.19-friendly.patch
URL: http://www.drbd.org/
%if %{with userspace}
BuildRequires: bison
BuildRequires: flex
%endif
%{?with_dist_kernel:BuildRequires: kernel%{_alt_kernel}-module-build}
-%if %{with kernel}
-BuildRequires: rpmbuild(macros) >= 1.330
-%endif
+BuildRequires: rpmbuild(macros) >= 1.379
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -72,7 +67,11 @@
Summary(pt_BR.UTF-8): Utilitários para gerenciar dispositivos DRBD
Group: Applications/System
Requires(post,preun): /sbin/chkconfig
+Requires(pre): /usr/bin/getgid
+Requires(pre): /usr/sbin/groupadd
+Requires(postun): /usr/sbin/groupdel
Requires: rc-scripts
+Provides: group(haclient)
Conflicts: drbdsetup24
%description -n drbdsetup
@@ -138,7 +137,7 @@
sed -i -e 's#$(CONFIG_BLK_DEV_DRBD)#m#g' Makefile-2.6
ln -sf Makefile-2.6 Makefile
# kernel module(s)
-%build_kernel_modules -m drbd EXTRA_CFLAGS="-DNO_MORE_DEV_FS"
+%build_kernel_modules -m drbd
%endif
%install
@@ -147,11 +146,11 @@
$RPM_BUILD_ROOT{/etc/rc.d/init.d,/etc/ha.d/resource.d}
%if %{with kernel}
-%install_kernel_modules -m drbd/drbd -d misc
+%install_kernel_modules -m drbd/drbd -d block
%endif
%if %{with userspace}
-install user/{drbdadm,drbdsetup} $RPM_BUILD_ROOT/sbin
+install user/{drbdadm,drbdmeta,drbdsetup} $RPM_BUILD_ROOT/sbin
install scripts/drbd.conf $RPM_BUILD_ROOT%{_sysconfdir}
install scripts/drbd $RPM_BUILD_ROOT/etc/rc.d/init.d
@@ -176,6 +175,9 @@
%postun -n kernel%{_alt_kernel}-smp-block-drbd
%depmod %{_kernel_ver}smp
+%pre -n drbdsetup
+%groupadd -g 60 haclient
+
%post -n drbdsetup
/sbin/chkconfig --add drbd
%service drbd restart
@@ -186,10 +188,18 @@
/sbin/chkconfig --del drbd
fi
+%postun -n drbdsetup
+if [ "$1" = "0" ]; then
+ %groupremove haclient
+fi
+
+
%if %{with userspace}
%files -n drbdsetup
%defattr(644,root,root,755)
-%attr(755,root,root) /sbin/*
+%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
@@ -201,14 +211,14 @@
%files -n kernel%{_alt_kernel}-block-drbd
%defattr(644,root,root,755)
%doc ChangeLog README
-/lib/modules/%{_kernel_ver}/misc/drbd.ko*
+/lib/modules/%{_kernel_ver}/block/drbd.ko*
%endif
%if %{with smp} && %{with dist_kernel}
%files -n kernel%{_alt_kernel}-smp-block-drbd
%defattr(644,root,root,755)
%doc ChangeLog README
-/lib/modules/%{_kernel_ver}smp/misc/drbd.ko*
+/lib/modules/%{_kernel_ver}smp/block/drbd.ko*
%endif
%endif
@@ -218,6 +228,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.90.4.21 2007-12-26 12:37:55 glen
+- updated to 8.2.1 from HEAD
+
Revision 1.90.4.20 2007-12-26 11:52:08 glen
- convert to utf8
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/drbd.spec?r1=1.90.4.20&r2=1.90.4.21&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
