- rel 2

[packages/libcgroup.git] / libcgroup.spec

diff --git a/libcgroup.spec b/libcgroup.spec
index 600f515b86cf729443cdcf76141666f024a2049d..7412ceca142f5a95857a5a32292a5e6cd7bba0c9 100644 (file)
--- a/libcgroup.spec
+++ b/libcgroup.spec
@@ -1,24 +1,33 @@
 Summary:       Tools and library to control and monitor control groups
 Summary(pl.UTF-8):     Narzędzia i biblioteka do kontrolowania i monitorowania grup kontroli
 Name:          libcgroup
-Version:       0.37
+Version:       0.37.1
 Release:       2
 License:       LGPL v2+
 Group:         Libraries
 Source0:       http://downloads.sourceforge.net/libcg/%{name}-%{version}.tar.bz2
-# Source0-md5: beecca8770155afa62981076e96d4c9c
+# Source0-md5: 24a41b18de112e8d085bb1f7d9e82af7
 Source1:       cgconfig.init
 Source2:       cgred.init
 Patch0:                %{name}-pam.patch
+Patch1:                %{name}-group-write.patch
+Patch2:                %{name}-conf.patch
 URL:           http://libcg.sourceforge.net/
+BuildRequires: autoconf
+BuildRequires: automake
 BuildRequires: bison
 BuildRequires: flex
 BuildRequires: libstdc++-devel
+BuildRequires: libtool
 BuildRequires: pam-devel
 Requires(post):        /sbin/ldconfig
 Requires(post,preun):  /sbin/chkconfig
+Requires(postun):      /usr/sbin/groupdel
+Requires(pre): /usr/bin/getgid
+Requires(pre): /usr/sbin/groupadd
 Requires:      procps
 Requires:      rc-scripts
+Provides:      group(cgred)
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _exec_prefix    %{nil}
@@ -31,8 +40,8 @@ controllers.
 
 %description -l pl.UTF-8
 Ten pakiet stanowi infrastrukturę grup kontroli (cgroups). Narzędzia i
-biblioteka pomagają modyfikować, sterować, administrować i
-modyfikować grupy kontroli i powiązane z nimi kontrolery.
+biblioteka pomagają modyfikować, sterować, administrować i modyfikować
+grupy kontroli i powiązane z nimi kontrolery.
 
 %package devel
 Summary:       Header files for cgroup library
@@ -67,8 +76,14 @@ Moduł PAM dla libcgroup.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
+%patch2 -p1
 
 %build
+%{__libtoolize}
+%{__aclocal}
+%{__autoconf}
+%{__automake}
 %configure \
        --disable-silent-rules \
        --enable-initscript-install \
@@ -99,13 +114,19 @@ ln -snf ../../%{_lib}/$(basename $RPM_BUILD_ROOT/%{_lib}/libcgroup.so.*.*.*) $RP
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-#%%pre
-#getent group cgred >/dev/null || groupadd cgred
+%pre
+%groupadd -g 261 -r -f cgred
 
 %post
 /sbin/ldconfig
 /sbin/chkconfig --add cgred
 /sbin/chkconfig --add cgconfig
+if [ ! -f /var/lock/subsys/cgconfig ]; then
+       echo 'Run "/sbin/service cgconfig start" to setup cgroup rules.'
+fi
+if [ ! -f /var/lock/subsys/cgred ]; then
+       echo 'Run "/sbin/service cgred start" to start control group rules daemon.'
+fi
 
 %preun
 if [ $1 = 0 ]; then
@@ -115,23 +136,34 @@ if [ $1 = 0 ]; then
        /sbin/chkconfig --del cgred
 fi
 
-%postun -p /sbin/ldconfig
+%postun
+/sbin/ldconfig
+if [ "$1" = "0" ]; then
+       %groupremove cgred
+fi
 
 %files
 %defattr(644,root,root,755)
 %doc README README_daemon
-%attr(754,root,root) /etc/rc.d/init.d/cg*
-%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/cg*
+%attr(754,root,root) /etc/rc.d/init.d/cgconfig
+%attr(754,root,root) /etc/rc.d/init.d/cgred
+%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/cgconfig
+%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/cgred.conf
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/cg*.conf
-
-%attr(755,root,root) /bin/cg*
-%attr(755,root,root) /bin/lscgroup
-%attr(755,root,root) /bin/lssubsys
-%attr(755,root,root) /sbin/cg*
-
 %attr(755,root,root) /%{_lib}/libcgroup.so.*.*.*
 %attr(755,root,root) %ghost /%{_lib}/libcgroup.so.1
-
+%attr(755,root,root) /bin/cgclassify
+%attr(755,root,root) /bin/cgcreate
+%attr(755,root,root) /bin/cgdelete
+%attr(755,root,root) /bin/cgexec
+%attr(755,root,root) /bin/cgget
+%attr(755,root,root) /bin/cgset
+%attr(755,root,root) /bin/cgsnapshot
+%attr(755,root,root) /bin/lscgroup
+%attr(755,root,root) /bin/lssubsys
+%attr(755,root,root) /sbin/cgclear
+%attr(755,root,root) /sbin/cgconfigparser
+%attr(755,root,root) /sbin/cgrulesengd
 %{_mandir}/man1/ls*.1*
 %{_mandir}/man1/cg*.1*
 %{_mandir}/man5/cg*.5*