From a904267039c79dcaa430cf8211e4b1f15a1d6d21 Mon Sep 17 00:00:00 2001
From: Dhaval Giani <dhavalgiani@fedoraproject.org>
Date: Thu, 23 Oct 2008 09:04:57 +0000
Subject: [PATCH] Updating to latest upstream

---
 .cvsignore     |  2 +-
 libcgroup.spec | 38 ++++++++++++++++++++++++++++++--------
 sources        |  2 +-
 3 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 8b6d4af..2f91bfb 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-libcgroup-0.31.tar.bz2
+libcgroup-0.32.1.tar.bz2
diff --git a/libcgroup.spec b/libcgroup.spec
index f8a9d1e..d884556 100644
--- a/libcgroup.spec
+++ b/libcgroup.spec
@@ -1,17 +1,19 @@
 Name: libcgroup
 Summary: Tools and libraries to control and monitor control groups
 Group: Development/Libraries
-Version: 0.31
+Version: 0.32.1
 Release:        1%{?dist}
 License: LGPLv2+
 URL: http://libcg.sourceforge.net/
 Source0: http://downloads.sourceforge.net/libcg/%{name}-%{version}.tar.bz2
-patch0: http://downloads.sourceforge.net/libcg/fix_overflow.patch
-patch1: http://downloads.sourceforge.net/libcg/fix_makefile_to_link_with_builddir.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: byacc
 BuildRequires: flex
 BuildRequires: coreutils
+Requires(post): chkconfig
+Requires(post): initscripts
+Requires(preun): initscripts
+Requires(preun): chkconfig
 
 %description
 Control groups infrastructure. The tools and library help manipulate, control,
@@ -29,8 +31,6 @@ provide scripts to manage that configuration.
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
 
 %build
 %configure
@@ -40,11 +40,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
 
@@ -55,16 +71,22 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/cgexec
 %{_bindir}/cgclassify
 %{_sbindir}/cgconfigparser
-%doc COPYING INSTALL
+%{_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
+* Thu Oct 23 2008 Dhaval Giani <dhaval@linux.vnet.ibm.com> 0.32.1-1
+- Update to latest upstream
 * Thu Sep 11 2008 Dhaval Giani <dhaval@linux-vnet.ibm.com> 0.31-1
 - Update to latest upstream
 * Sat Aug 2 2008 Dhaval Giani <dhaval@linux.vnet.ibm.com> 0.1c-3
diff --git a/sources b/sources
index 50cbfa6..e5911e9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-494cb429edd57b5233840cbe3fdcf6a7  libcgroup-0.31.tar.bz2
+11cd51147c779586b2b6329e0d07022b  libcgroup-0.32.1.tar.bz2