SPECS: kernel-cluster-cman.spec, kernel-cluster-dlm.spec - up to 1...

[zbyniu]

Author: zbyniu                       Date: Sun Nov  6 20:59:16 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- up to 1.01.00

---- Files affected:
SPECS:
   kernel-cluster-cman.spec (1.8 -> 1.9) , kernel-cluster-dlm.spec (1.8 -> 1.9) 

---- Diffs:

================================================================
Index: SPECS/kernel-cluster-cman.spec
diff -u SPECS/kernel-cluster-cman.spec:1.8 SPECS/kernel-cluster-cman.spec:1.9
--- SPECS/kernel-cluster-cman.spec:1.8	Thu Sep 15 20:25:05 2005
+++ SPECS/kernel-cluster-cman.spec	Sun Nov  6 21:59:08 2005
@@ -1,28 +1,26 @@
 # $Revision$, $Date$
 #
 # Condtional build:
-%bcond_without	kernel          # don't build kernel modules
+%bcond_without	kernel		# don't build kernel modules
 %bcond_without	dist_kernel	# without distribution kernel
 %bcond_without	smp		# without smp packages
 %bcond_with	verbose		# verbose build (V=1)
 #
-%define	snap	20050729
-%define _rel	0.%{snap}.1
+%define _rel	0.3
 Summary:	General-purpose symmetric cluster manager
 Summary(pl):	Zarządca klastrów symetrycznych ogólnego przeznaczenia
 Name:		kernel-cluster-cman
-Version:	0.1
+Version:	1.01.00
 Release:	%{_rel}@%{_kernel_ver_str}
 Epoch:		0
 License:	GPL v2
 Group:		Base/Kernel
-# taken from STABLE branch
-Source0:	cluster-cman-%{snap}.tar.gz
-# Source0-md5:	885d98f949ed83496661de741786bc2e
+Source0:	ftp://sources.redhat.com/pub/cluster/releases/cluster-%{version}.tar.gz
+# Source0-md5:	e98551b02ee8ed46ae0ab8fca193d751
 URL:		http://sources.redhat.com/cluster/cman/
 BuildRequires:	perl-base
 %if %{with kernel}
-%{?with_dist_kernel:BuildRequires:	kernel-module-build >= 2.6.7}
+%{?with_dist_kernel:BuildRequires:	kernel-module-build >= 2.6.12}
 %endif
 %{?with_dist_kernel:%requires_releq_kernel_up}
 Requires(post,postun):	/sbin/depmod
@@ -94,9 +92,10 @@
 nagłówkowe.
 
 %prep
-%setup -q -n cluster-cman-%{snap}
+%setup -q -n cluster-%{version}
 
 %build
+cd cman-kernel
 ./configure \
 	--kernel_src=%{_kernelsrcdir}
 %if %{with kernel}
@@ -135,8 +134,8 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 
+cd cman-kernel/src
 %if %{with kernel}
-cd src
 install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}{,smp}/kernel/cluster
 install cman-%{?with_dist_kernel:up}%{!?with_dist_kernel:nondist}.ko \
 	$RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/kernel/cluster/cman.ko
@@ -147,7 +146,7 @@
 %endif
 
 install -d $RPM_BUILD_ROOT%{_includedir}/cluster
-install src/dlm.h src/dlm_device.h $RPM_BUILD_ROOT%{_includedir}/cluster
+install *.h $RPM_BUILD_ROOT%{_includedir}/cluster
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -186,6 +185,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.9  2005/11/06 20:59:08  zbyniu
+- up to 1.01.00
+
 Revision 1.8  2005/09/15 18:25:05  sparky
 - prepared for kernel >= 2.6.13: link Module.symvers
 

================================================================
Index: SPECS/kernel-cluster-dlm.spec
diff -u SPECS/kernel-cluster-dlm.spec:1.8 SPECS/kernel-cluster-dlm.spec:1.9
--- SPECS/kernel-cluster-dlm.spec:1.8	Thu Sep 15 20:25:05 2005
+++ SPECS/kernel-cluster-dlm.spec	Sun Nov  6 21:59:08 2005
@@ -1,24 +1,22 @@
 # $Revision$, $Date$
 #
 # Condtional build:
-%bcond_without	kernel          # don't build kernel modules
+%bcond_without	kernel		# don't build kernel modules
 %bcond_without	dist_kernel	# without distribution kernel
 %bcond_without	smp		# without smp packages
 %bcond_with	verbose		# verbose build (V=1)
 #
-%define	snap	20050729
-%define _rel	0.%{snap}.1
+%define _rel	0.3
 Summary:	General-purpose distributed lock manager
 Summary(pl):	Zarządca rozproszonych blokad ogólnego przeznaczenia
 Name:		kernel-cluster-dlm
-Version:	0.1
+Version:	1.01.00
 Release:	%{_rel}@%{_kernel_ver_str}
 Epoch:		0
 License:	GPL v2
 Group:		Base/Kernel
-# taken from STABLE branch
-Source0:	cluster-dlm-%{snap}.tar.gz
-# Source0-md5:	5bcd0f3efe690dde0bbd78fbef4486f7
+Source0:	ftp://sources.redhat.com/pub/cluster/releases/cluster-%{version}.tar.gz
+# Source0-md5:	e98551b02ee8ed46ae0ab8fca193d751
 URL:		http://sources.redhat.com/cluster/dlm/
 BuildRequires:	kernel-cluster-cman-devel
 %if %{with kernel}
@@ -77,9 +75,10 @@
 nagłówkowe.
 
 %prep
-%setup -q -n cluster-dlm-%{snap}
+%setup -q -n cluster-%{version}
 
 %build
+cd dlm-kernel
 ./configure \
 	--kernel_src=%{_kernelsrcdir}
 %if %{with kernel}
@@ -121,8 +120,8 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 
+cd dlm-kernel/src
 %if %{with kernel}
-cd src
 install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}{,smp}/kernel/cluster
 install dlm-%{?with_dist_kernel:up}%{!?with_dist_kernel:nondist}.ko \
 	$RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/kernel/cluster/dlm.ko
@@ -133,7 +132,7 @@
 %endif
 
 install -d $RPM_BUILD_ROOT%{_includedir}/cluster
-install src/dlm.h src/dlm_device.h $RPM_BUILD_ROOT%{_includedir}/cluster
+install dlm.h dlm_device.h $RPM_BUILD_ROOT%{_includedir}/cluster
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -172,6 +171,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.9  2005/11/06 20:59:08  zbyniu
+- up to 1.01.00
+
 Revision 1.8  2005/09/15 18:25:05  sparky
 - prepared for kernel >= 2.6.13: link Module.symvers
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/kernel-cluster-cman.spec?r1=1.8&r2=1.9&f=u
    http://cvs.pld-linux.org/SPECS/kernel-cluster-dlm.spec?r1=1.8&r2=1.9&f=u