From 24ab0821ee1bf644e08aeff6c0ea7429249412be Mon Sep 17 00:00:00 2001 From: Balbir Singh Date: Wed, 15 Oct 2008 04:20:29 +0000 Subject: Merge several bug-fixes and cleanups. No version bump yet, since this is an ongoing exercise (after more testing, I'll recommend one). Signed-off-by: Balbir Singh git-svn-id: https://libcg.svn.sourceforge.net/svnroot/libcg/trunk@216 4f4bb910-9a46-0410-90c8-c897d4f1cd53 --- libcgroup.spec.in | 36 +++++++++++++++++++++++++++++++++--- 1 file changed, 33 insertions(+), 3 deletions(-) (limited to 'libcgroup.spec.in') diff --git a/libcgroup.spec.in b/libcgroup.spec.in index 93ad868..177c7c0 100644 --- a/libcgroup.spec.in +++ b/libcgroup.spec.in @@ -10,6 +10,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: byacc BuildRequires: flex BuildRequires: coreutils +Requires(post): chkconfig, /sbin/service %description Control groups infrastructure. The tools and library help manipulate, control, @@ -36,11 +37,27 @@ make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install +mkdir -p $RPM_BUILD_ROOT/%{_initrddir} +cp scripts/init.d/cgconfig $RPM_BUILD_ROOT/%{_initrddir}/cgconfig +cp scripts/init.d/cgred $RPM_BUILD_ROOT/%{_initrddir}/cgred + %clean rm -rf $RPM_BUILD_ROOT -%post -p /sbin/ldconfig +%post +/sbin/ldconfig +# +# Do this later if required +# +#/sbin/chkconfig --add cgred +#/sbin/chkconfig --add cgconfig + +%preun +/sbin/service cgred stop > /dev/null 2>&1 || : +/sbin/service cgconfig stop > /dev/null 2>&1 || : +/sbin/chkconfig --del cgconfig +/sbin/chkconfig --del cgred %postun -p /sbin/ldconfig @@ -48,16 +65,29 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root,-) %{_libdir}/libcgroup-%{version}.so %{_libdir}/libcgroup.so.* -%doc COPYING INSTALL +%{_bindir}/cgexec +%{_bindir}/cgclassify +%{_sbindir}/cgconfigparser +%{_bindir}/cgrulesengd +%attr(0755,root,root) %{_initrddir}/cgconfig +%attr(0755,root,root) %{_initrddir}/cgred + +%doc COPYING INSTALL README_daemon %files devel %defattr(-,root,root,-) %{_includedir}/libcgroup.h %{_libdir}/libcgroup.so -%doc COPYING INSTALL +%doc COPYING INSTALL %changelog +* Fri Oct 10 2008 Dhaval Giani 0.32-1 +- Update to latest upstream +* Thu Sep 11 2008 Dhaval Giani 0.31-1 +- Update to latest upstream +* Sat Aug 2 2008 Dhaval Giani 0.1c-3 +- Change release to fix broken upgrade path * Wed Jun 11 2008 Dhaval Giani 0.1c-1 - Update to latest upstream version * Tue Jun 3 2008 Balbir Singh 0.1b-3 -- cgit