SPECS: ocfs2-tools.spec - o2cb.sysconfig added; BRs revisited; pro...

[zbyniu]

Author: zbyniu                       Date: Sat Mar 31 09:29:04 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- o2cb.sysconfig added; BRs revisited; proper %service; more files

---- Files affected:
SPECS:
   ocfs2-tools.spec (1.11 -> 1.12) 

---- Diffs:

================================================================
Index: SPECS/ocfs2-tools.spec
diff -u SPECS/ocfs2-tools.spec:1.11 SPECS/ocfs2-tools.spec:1.12
--- SPECS/ocfs2-tools.spec:1.11	Tue Feb 13 08:16:50 2007
+++ SPECS/ocfs2-tools.spec	Sat Mar 31 11:28:59 2007
@@ -3,26 +3,27 @@
 Summary(pl.UTF-8):	Narzędzia dla systemu plików OCFS2
 Name:		ocfs2-tools
 Version:	1.2.2
-Release:	2
+Release:	2.1
 License:	GPL v2
 Group:		Applications/System
 Source0:	http://oss.oracle.com/projects/ocfs2-tools/dist/files/source/v1.2/%{name}-%{version}.tar.gz
 # Source0-md5:	ac6357bf9c53c53ad8e60f50820955b9
 Source1:	ocfs2.init
 Source2:	o2cb.init
+Source3:	o2cb.sysconfig
 Patch0:		%{name}-tinfo.patch
 URL:		http://oss.oracle.com/projects/ocfs2-tools/
 BuildRequires:	autoconf
 BuildRequires:	automake
+BuildRequires:	device-mapper-devel
 BuildRequires:	e2fsprogs-devel
 BuildRequires:	glib2-devel
-BuildRequires:	libcom_err-devel
-BuildRequires:	libuuid-devel
 BuildRequires:	pkgconfig
 BuildRequires:	python-devel
+BuildRequires:	python-pygtk-gobject
 BuildRequires:	readline-devel
 BuildRequires:	rpmbuild(macros) >= 1.268
-BuildRequires:	scons
+#BuildRequires:	scons
 Requires(post):	/sbin/ldconfig
 Requires(post,preun):	/sbin/chkconfig
 Requires:	rc-scripts
@@ -62,16 +63,20 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/etc/rc.d/init.d
+install -d $RPM_BUILD_ROOT/etc/{rc.d/init.d,sysconfig}
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
+install -D documentation/samples/cluster.conf $RPM_BUILD_ROOT/etc/ocfs2/cluster.conf
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/ocfs2
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/o2cb
+install %{SOURCE3} $RPM_BUILD_ROOT/etc/sysconfig/o2cb
+install -d $RPM_BUILD_ROOT/dlm
 
 %py_ocomp $RPM_BUILD_ROOT%{py_sitedir}
 %py_comp $RPM_BUILD_ROOT%{py_sitedir}
+rm $RPM_BUILD_ROOT%{py_sitedir}/ocfs2interface/*.py
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -79,15 +84,15 @@
 %post
 /sbin/ldconfig
 /sbin/chkconfig --add o2cb
-/sbin/chkconfig --add %{name}
+/sbin/chkconfig --add ocfs2
 %service o2cb restart
-%service %{name} restart
+%service ocfs2 restart
 
 %preun
 if [ "$1" = "0" ]; then
-	%service -q %{name} stop
+	%service -q ocfs2 stop
 	%service -q o2cb stop
-	/sbin/chkconfig --del %{name}
+	/sbin/chkconfig --del ocfs2
 	/sbin/chkconfig --del o2cb
 fi
 
@@ -95,9 +100,13 @@
 
 %files
 %defattr(644,root,root,755)
+%doc documentation/*.txt
 %attr(754,root,root) /etc/rc.d/init.d/o2cb
 %attr(754,root,root) /etc/rc.d/init.d/ocfs2
 %attr(755,root,root) /sbin/*
+%dir /etc/ocfs2
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/ocfs2/cluster.conf
+%dir /dlm
 %{_mandir}/man8/*
 
 %files gtk
@@ -113,6 +122,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.12  2007/03/31 09:28:59  zbyniu
+- o2cb.sysconfig added; BRs revisited; proper %service; more files
+
 Revision 1.11  2007/02/13 07:16:50  glen
 - tabs in preamble
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/ocfs2-tools.spec?r1=1.11&r2=1.12&f=u