rpms/libcgroup/devel libcgroup.spec,1.15,1.16

[Jan Šafránek]

Author: jsafrane

Update of /cvs/pkgs/rpms/libcgroup/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25147

Modified Files:
	libcgroup.spec 
Log Message:
Change the default configuration to mount everything to /cgroup - libvirtd needs the controllers mounted somewhere.


Index: libcgroup.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libcgroup/devel/libcgroup.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- libcgroup.spec	25 Jul 2009 05:26:05 -0000	1.15
+++ libcgroup.spec	19 Oct 2009 11:26:25 -0000	1.16
@@ -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 configura
 %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.
 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 at redhat.com> 0.34-3
+- Change the default configuration to mount everything to /cgroup
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.34-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild