From 76058a6327b9dc9adddefa1fbef23012da0cf182 Mon Sep 17 00:00:00 2001
From: Jan Šafránek <jsafrane@fedoraproject.org>
Date: Oct 19 2009 11:26:25 +0000
Subject: Change the default configuration to mount everything to /cgroup - libvirtd

    needs the controllers mounted somewhere.

---

diff --git a/libcgroup.spec b/libcgroup.spec
index 0f02f1c..94ca4a9 100644
--- a/libcgroup.spec
+++ b/libcgroup.spec
@@ -4,12 +4,13 @@ Name: libcgroup
 Summary: Tools and libraries to control and monitor control groups
 Group: Development/Libraries
 Version: 0.34
-Release:        2%{?dist}
+Release: 3%{?dist}
 License: LGPLv2+
 URL: http://libcg.sourceforge.net/
 Source0: http://downloads.sourceforge.net/libcg/%{name}-%{version}.tar.bz2
 Patch0: fedora-fix-initscripts.patch
 Patch1: fedora-workaround-for-sysdefault.patch
+Patch2: fedora-config.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: pam-devel
 BuildRequires: byacc
@@ -36,6 +37,7 @@ provide scripts to manage that configuration.
 %setup -q
 %patch0 -p1 -b .fedora
 %patch1 -p1 -b .sysdefault
+%patch2 -p1 -b .config
 %build
 %configure --bindir=/bin --sbindir=/sbin --libdir=/%{_lib}
 
@@ -68,6 +70,9 @@ mv -f $RPM_BUILD_ROOT/%{_lib}/libcgroup.la $RPM_BUILD_ROOT/%{_libdir}
 rm -f $RPM_BUILD_ROOT/%{_lib}/libcgroup.so
 ln -sf ../../%{_lib}/libcgroup.so.%{soversion} $RPM_BUILD_ROOT/%{_libdir}/libcgroup.so
 
+# pre-create /cgroup directory
+mkdir $RPM_BUILD_ROOT/cgroup
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -105,8 +110,8 @@ fi
 %attr(0755,root,root) %{_initrddir}/cgconfig
 %attr(0755,root,root) %{_initrddir}/cgred
 %attr(0755,root,root) /%{_lib}/security/pam_cgroup.so
-
 %doc COPYING INSTALL README_daemon
+%attr(0755,root,root) %dir /cgroup
 
 %files devel
 %defattr(-,root,root,-)
@@ -116,6 +121,9 @@ fi
 
 
 %changelog
+* Mon Oct 19 2009 Jan Safranek <jsafrane@redhat.com> 0.34-3
+- Change the default configuration to mount everything to /cgroup
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.34-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild