- remove obsolete buildrequire

[packages/ocfs2-tools.git] / ocfs2-tools.spec

diff --git a/ocfs2-tools.spec b/ocfs2-tools.spec
index 6c459d6e46b0764a22ea80c59380c405e28d1e74..1808c87f77385e8330b5a33561b5b17d161b9277 100644 (file)
--- a/ocfs2-tools.spec
+++ b/ocfs2-tools.spec
@@ -1,31 +1,41 @@
 Summary:       Tools for the OCFS2 filesystem
-Summary(pl):   Narzêdzia dla systemu plików OCFS2
+Summary(pl.UTF-8):     Narzędzia dla systemu plików OCFS2
 Name:          ocfs2-tools
-Version:       1.1.2
-Release:       1
+Version:       1.2.3
+Release:       0.1
 License:       GPL v2
 Group:         Applications/System
-Source0:       http://oss.oracle.com/projects/ocfs2-tools/dist/files/source/v1.1/%{name}-%{version}.tar.gz
-# Source0-md5: f2412153cf33db29e10549c855c43e35
+Source0:       http://oss.oracle.com/projects/ocfs2-tools/dist/files/source/v1.2/%{name}-%{version}.tar.gz
+# Source0-md5: 3b778750e7d0c94317a71ee889433ef1
+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: readline-devel
+BuildRequires: rpmbuild(macros) >= 1.268
+#BuildRequires:        scons
+Requires(post):        /sbin/ldconfig
+Requires(post,preun):  /sbin/chkconfig
+Requires:      rc-scripts
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 Tools and support files for creating and managing OCFS2 volumes.
 
-%description -l pl
-Narzêdzia do tworzenia i zarz±dzania wolumenami OCFS2.
+%description -l pl.UTF-8
+Narzędzia do tworzenia i zarządzania wolumenami OCFS2.
 
 %package gtk
 Summary:       GTK+ interface to OCFS2 Tools
-Summary(pl):   Interfejs GTK+ do narzêdzi OCFS2
+Summary(pl.UTF-8):     Interfejs GTK+ do narzędzi OCFS2
 Group:         X11/Applications
 Requires:      %{name} = %{version}-%{release}
 Requires:      python-pygtk-gtk
@@ -33,13 +43,16 @@ Requires:   python-pygtk-gtk
 %description gtk
 GTK+ interface to OCFS2 Tools.
 
-%description gtk -l pl
-Interfejs GTK+ do narzêdzi OCFS2.
+%description gtk -l pl.UTF-8
+Interfejs GTK+ do narzędzi OCFS2.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
+%{__aclocal} -I .
+%{__autoconf}
 %configure \
        --enable-dynamic-fsck=yes \
        --enable-dynamic-ctl=yes \
@@ -48,22 +61,50 @@ Interfejs GTK+ do narz
 
 %install
 rm -rf $RPM_BUILD_ROOT
+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
 
-%post  -p /sbin/ldconfig
+%post
+/sbin/ldconfig
+/sbin/chkconfig --add o2cb
+/sbin/chkconfig --add ocfs2
+%service o2cb restart
+%service ocfs2 restart
+
+%preun
+if [ "$1" = "0" ]; then
+       %service -q ocfs2 stop
+       %service -q o2cb stop
+       /sbin/chkconfig --del ocfs2
+       /sbin/chkconfig --del o2cb
+fi
+
 %postun -p /sbin/ldconfig
 
 %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