- up to 1.4.1

Changed files:
    ocfs2-tools.spec -> 1.21

diff --git a/ocfs2-tools.spec b/ocfs2-tools.spec
index 1d63306be51a47c19f76da5ebc269c22608ac37e..d8596bf155c5f0b1ac3930fe7f1937322836ccfb 100644 (file)
--- a/ocfs2-tools.spec
+++ b/ocfs2-tools.spec
@@ -5,22 +5,28 @@
 Summary:       Tools for the OCFS2 filesystem
 Summary(pl.UTF-8):     Narzędzia dla systemu plików OCFS2
 Name:          ocfs2-tools
-Version:       1.2.7
-Release:       3
+Version:       1.4.1
+Release:       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: 8a501fcd5f236de0780905b7dcb5128f
+Source0:       http://oss.oracle.com/projects/ocfs2-tools/dist/files/source/v1.4/%{name}-%{version}.tar.gz
+# Source0-md5: 92f4f9f16c3f74307ad508f5e6a300a1
 Source1:       ocfs2.init
 Source2:       o2cb.init
 Source3:       o2cb.sysconfig
 Patch0:                %{name}-tinfo.patch
+Patch1:                %{name}-ac.patch
+Patch2:                %{name}-limits.patch
 URL:           http://oss.oracle.com/projects/ocfs2-tools/
 BuildRequires: autoconf
 BuildRequires: automake
+BuildRequires: cman-devel
 BuildRequires: device-mapper-devel
 BuildRequires: e2fsprogs-devel
-BuildRequires: glib2-devel
+BuildRequires: glib2-devel >= 2.2.3
+BuildRequires: libuuid-devel
+BuildRequires: ncurses-devel
+BuildRequires: openais-devel
 BuildRequires: pkgconfig
 %{?with_gtk2:BuildRequires:    python-devel}
 %{?with_gtk2:BuildRequires:    python-pygtk-gtk}
@@ -38,6 +44,17 @@ Tools and support files for creating and managing OCFS2 volumes.
 %description -l pl.UTF-8
 Narzędzia do tworzenia i zarządzania wolumenami OCFS2.
 
+%package devel
+Summary:       Header files and develpment documentation for ocfs2-tools
+Summary(pl.UTF-8):     Pliki nagłówkowe i dokumetacja do ocfs2-tools
+Group:         Development/Libraries
+
+%description devel
+Header files and develpment documentation for ocfs2-tools.
+
+%description -l pl.UTF-8
+Pliki nagłówkowe i dokumetacja do ocfs2-tools.
+
 %package gtk
 Summary:       GTK+ interface to OCFS2 Tools
 Summary(pl.UTF-8):     Interfejs GTK+ do narzędzi OCFS2
@@ -54,6 +71,8 @@ Interfejs GTK+ do narzędzi OCFS2.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p0
+%patch2 -p0
 
 %build
 %{__aclocal} -I .
@@ -62,7 +81,7 @@ Interfejs GTK+ do narzędzi OCFS2.
        --enable-dynamic-fsck=yes \
        --enable-dynamic-ctl=yes \
        %{?with_gtk2:--enable-ocfs2console=yes}
-%{__make}
+%{__make} -j1
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -71,7 +90,7 @@ 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 -D documentation/samples/cluster.conf $RPM_BUILD_ROOT%{_sysconfdir}/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
@@ -109,11 +128,17 @@ fi
 %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 %{_sysconfdir}/ocfs2
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ocfs2/cluster.conf
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/o2cb
 %dir /dlm
-%{_mandir}/man8/*
+%{_mandir}/man[78]/*
+
+%files devel
+%defattr(644,root,root,755)
+%{_includedir}/*
+%{_libdir}/lib*.a
+%{_pkgconfigdir}/*.pc
 
 %if %{with gtk2}
 %files gtk