rpms/libcgroup/devel 03-fedora-adjust-initscript-priority.patch, NONE, 1.1 libcgroup.spec, 1.10, 1.11

[Dhaval Giani]

Author: dhavalgiani

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

Modified Files:
	libcgroup.spec 
Added Files:
	03-fedora-adjust-initscript-priority.patch 
Log Message:
* Mon Mar 09 2009 Dhaval Giani <dhaval at linux.vnet.ibm.com> 0.33-2
- Change the cgconfig script to start earlier
- Move the binaries to /bin and /sbin



03-fedora-adjust-initscript-priority.patch:

--- NEW FILE 03-fedora-adjust-initscript-priority.patch ---
libcgroup: Start the config earlier

From: Jan Safranek <jsafrane at redhat.com>

For Fedora, we want to start the cgconfig as soon as possible,
i.e. when /usr might not be mounted. We don't need syslog, time nor
$local_fs (see bug #309001).

diff -up libcgroup-0.33/scripts/init.d/cgconfig.orig libcgroup-0.33/scripts/init.d/cgconfig
--- libcgroup-0.33/scripts/init.d/cgconfig.orig	2009-03-08 20:46:12.000000000 +0100
+++ libcgroup-0.33/scripts/init.d/cgconfig	2009-03-08 20:45:01.000000000 +0100
@@ -14,15 +14,15 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 #
 # cgconfig Control Groups Configuration Startup
-# chkconfig: - 13 87
+# chkconfig: - 5 95
 # description: This script runs the cgconfigparser utility to parse and setup
 #              the control group filesystem. It uses /etc/cgconfig.conf
 #              and parses the configuration specified in there.
 
 ### BEGIN INIT INFO
 # Provides:             cgconfig
-# Required-Start:       $local_fs $syslog $time
-# Required-Stop:        $local_fs $syslog
+# Required-Start:
+# Required-Stop:
 # Should-Start:
 # Should-Stop:
 # Short-Description:    start and stop the WLM configuration


Index: libcgroup.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libcgroup/devel/libcgroup.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- libcgroup.spec	2 Mar 2009 11:32:59 -0000	1.10
+++ libcgroup.spec	9 Mar 2009 12:30:29 -0000	1.11
@@ -2,12 +2,13 @@
 Summary: Tools and libraries to control and monitor control groups
 Group: Development/Libraries
 Version: 0.33
-Release:        1%{?dist}
+Release: 2%{?dist}
 License: LGPLv2+
 URL: http://libcg.sourceforge.net/
 Source0: http://downloads.sourceforge.net/libcg/%{name}-%{version}.tar.bz2
 Patch0: http://downloads.sourceforge.net/libcg/01-fedora-fix-build.patch
 Patch1: http://downloads.sourceforge.net/libcg/02-fedora-fix-initscripts.patch
+Patch2: http://downloads.sourceforge.net/libcg/03-fedora-adjust-initscript-priority.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: byacc
 BuildRequires: flex
@@ -36,9 +37,11 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
-%configure
+%configure --bindir=/bin --sbindir=/sbin --libdir=/%{_lib}
+
 make %{?_smp_mflags}
 
 
@@ -52,9 +55,6 @@
 cp samples/cgred.conf $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/cgred.conf
 cp samples/cgconfig.conf $RPM_BUILD_ROOT/%{_sysconfdir}/cgconfig.conf
 cp samples/cgrules.conf $RPM_BUILD_ROOT/%{_sysconfdir}/cgrules.conf
-mkdir -p $RPM_BUILD_ROOT/%{_lib}/security/
-mv $RPM_BUILD_ROOT/%{_libdir}/security/pam_cgroup.so \
-	$RPM_BUILD_ROOT/%{_lib}/security/
 
 
 %clean
@@ -81,12 +81,12 @@
 %config(noreplace) %{_sysconfdir}/sysconfig/cgred.conf
 %config(noreplace) %{_sysconfdir}/cgconfig.conf
 %config(noreplace) %{_sysconfdir}/cgrules.conf
-%{_libdir}/libcgroup-%{version}.so
-%{_libdir}/libcgroup.so.*
-%{_bindir}/cgexec
-%{_bindir}/cgclassify
-%{_sbindir}/cgconfigparser
-%{_bindir}/cgrulesengd
+/%{_lib}/libcgroup-%{version}.so
+/%{_lib}/libcgroup.so.*
+/bin/cgexec
+/bin/cgclassify
+/sbin/cgconfigparser
+/bin/cgrulesengd
 %attr(0644, root, root) %{_mandir}/man1/*
 %attr(0644, root, root) %{_mandir}/man5/*
 %attr(0644, root, root) %{_mandir}/man8/*
@@ -99,11 +99,14 @@
 %files devel
 %defattr(-,root,root,-)
 %{_includedir}/libcgroup.h
-%{_libdir}/libcgroup.so
-%doc COPYING INSTALL 
+/%{_lib}/libcgroup.so
+%doc COPYING INSTALL
 
 
 %changelog
+* Mon Mar 09 2009 Dhaval Giani <dhaval at linux.vnet.ibm.com> 0.33-2
+- Change the cgconfig script to start earlier
+- Move the binaries to /bin and /sbin
 * Mon Mar 02 2009 Dhaval Giani <dhaval at linux.vnet.ibm.com> 0.33-1
 - Update to latest upstream
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.32.2-4