Split tools part from libcgroup package

Resolves: #628622
This commit is contained in:
Jan Safranek 2011-05-25 13:03:22 +02:00
parent 93199737d6
commit 73e4df3125

View File

@ -2,10 +2,10 @@
%define soversion_major 1 %define soversion_major 1
Name: libcgroup Name: libcgroup
Summary: Tools and libraries to control and monitor control groups Summary: Library to control and monitor control groups
Group: Development/Libraries Group: Development/Libraries
Version: 0.37.1 Version: 0.37.1
Release: 2%{?dist} Release: 3%{?dist}
License: LGPLv2+ License: LGPLv2+
URL: http://libcg.sourceforge.net/ URL: http://libcg.sourceforge.net/
Source0: http://downloads.sourceforge.net/libcg/%{name}-%{version}.tar.bz2 Source0: http://downloads.sourceforge.net/libcg/%{name}-%{version}.tar.bz2
@ -13,7 +13,7 @@ Source1: README.Fedora
Patch1: fedora-config.patch Patch1: fedora-config.patch
Patch2: fedora-fix-initscripts.patch Patch2: fedora-fix-initscripts.patch
Patch3: libcgroup-0.36.2-systemd.patch Patch3: libcgroup-0.36.2-systemd.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: pam-devel BuildRequires: pam-devel
BuildRequires: byacc BuildRequires: byacc
BuildRequires: flex BuildRequires: flex
@ -23,13 +23,22 @@ Requires(post): chkconfig, /sbin/service
Requires(preun): /sbin/chkconfig Requires(preun): /sbin/chkconfig
%description %description
Control groups infrastructure. The tools and library help manipulate, control, Control groups infrastructure. The library helps manipulate, control,
administrate and monitor control groups and the associated controllers. administrate and monitor control groups and the associated controllers.
%package tools
Summary: Command-line utility programs, services and daemons for libcgroup
Group: System Environment/Base
Requires: %{name}%{?_isa} = %{version}-%{release}
%description tools
This package contains command-line programs, services and a daemon for
manipulating control groups using the libcgroup library.
%package pam %package pam
Summary: A Pluggable Authentication Module for libcgroup Summary: A Pluggable Authentication Module for libcgroup
Group: System Environment/Base Group: System Environment/Base
Requires: libcgroup = %{version}-%{release} Requires: %{name}%{?_isa} = %{version}-%{release}
%description pam %description pam
Linux-PAM module, which allows administrators to classify the user's login Linux-PAM module, which allows administrators to classify the user's login
@ -38,7 +47,7 @@ processes to pre-configured control group.
%package devel %package devel
Summary: Development libraries to develop applications that utilize control groups Summary: Development libraries to develop applications that utilize control groups
Group: Development/Libraries Group: Development/Libraries
Requires: libcgroup = %{version}-%{release} Requires: %{name}%{?_isa} = %{version}-%{release}
%description devel %description devel
It provides API to create/delete and modify cgroup nodes. It will also in the It provides API to create/delete and modify cgroup nodes. It will also in the
@ -90,15 +99,18 @@ cp %SOURCE1 .
%clean %clean
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
%pre %post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%pre tools
getent group cgred >/dev/null || groupadd -r cgred getent group cgred >/dev/null || groupadd -r cgred
%post %post tools
/sbin/ldconfig
/sbin/chkconfig --add cgred /sbin/chkconfig --add cgred
/sbin/chkconfig --add cgconfig /sbin/chkconfig --add cgconfig
%preun %preun tools
if [ $1 = 0 ]; then if [ $1 = 0 ]; then
/sbin/service cgred stop > /dev/null 2>&1 || : /sbin/service cgred stop > /dev/null 2>&1 || :
/sbin/service cgconfig stop > /dev/null 2>&1 || : /sbin/service cgconfig stop > /dev/null 2>&1 || :
@ -106,17 +118,21 @@ if [ $1 = 0 ]; then
/sbin/chkconfig --del cgred /sbin/chkconfig --del cgred
fi fi
%postun -p /sbin/ldconfig
%files %files
%defattr(-,root,root,-) %defattr(-,root,root,-)
/%{_lib}/libcgroup.so.*
%doc COPYING INSTALL README.Fedora
%attr(0755,root,root) %ghost %dir /cgroup
%files tools
%defattr(-,root,root,-)
%doc README_daemon
%config(noreplace) %{_sysconfdir}/sysconfig/cgred.conf %config(noreplace) %{_sysconfdir}/sysconfig/cgred.conf
%config(noreplace) %{_sysconfdir}/sysconfig/cgconfig %config(noreplace) %{_sysconfdir}/sysconfig/cgconfig
%config(noreplace) %{_sysconfdir}/cgconfig.conf %config(noreplace) %{_sysconfdir}/cgconfig.conf
%config(noreplace) %{_sysconfdir}/cgrules.conf %config(noreplace) %{_sysconfdir}/cgrules.conf
%config(noreplace) %{_sysconfdir}/cgsnapshot_blacklist.conf %config(noreplace) %{_sysconfdir}/cgsnapshot_blacklist.conf
/%{_lib}/libcgroup.so.*
%attr(2755, root, cgred) /bin/cgexec
/bin/cgclassify /bin/cgclassify
/bin/cgcreate /bin/cgcreate
/bin/cgget /bin/cgget
@ -128,13 +144,12 @@ fi
/sbin/cgrulesengd /sbin/cgrulesengd
/sbin/cgclear /sbin/cgclear
/bin/cgsnapshot /bin/cgsnapshot
%attr(2755, root, cgred) /bin/cgexec
%attr(0644, root, root) %{_mandir}/man1/* %attr(0644, root, root) %{_mandir}/man1/*
%attr(0644, root, root) %{_mandir}/man5/* %attr(0644, root, root) %{_mandir}/man5/*
%attr(0644, root, root) %{_mandir}/man8/* %attr(0644, root, root) %{_mandir}/man8/*
%attr(0755,root,root) %{_initrddir}/cgconfig %attr(0755,root,root) %{_initrddir}/cgconfig
%attr(0755,root,root) %{_initrddir}/cgred %attr(0755,root,root) %{_initrddir}/cgred
%doc COPYING INSTALL README_daemon README.Fedora
%attr(0755,root,root) %ghost %dir /cgroup
%files pam %files pam
%defattr(-,root,root,-) %defattr(-,root,root,-)
@ -147,9 +162,12 @@ fi
%{_includedir}/libcgroup/*.h %{_includedir}/libcgroup/*.h
%{_libdir}/libcgroup.* %{_libdir}/libcgroup.*
/%{_libdir}/pkgconfig/libcgroup.pc /%{_libdir}/pkgconfig/libcgroup.pc
%doc COPYING INSTALL %doc COPYING INSTALL
%changelog %changelog
* Wed May 25 2011 Ivana Hutarova Varekova <varekova@redhat.com> 0.37.1-3
- split tools part from libcgroup package
* Fri Apr 8 2011 Jan Safranek <jsafrane@redhat.com> 0.37.1-2 * Fri Apr 8 2011 Jan Safranek <jsafrane@redhat.com> 0.37.1-2
- Remove /cgroup directory, groups are created in /sys/fs/cgroup - Remove /cgroup directory, groups are created in /sys/fs/cgroup
(#694687) (#694687)