From: Jan Safranek <jsafrane@redhat.com>
Date: Sun, 8 Mar 2009 21:43:59 +0000 (+0100)
Subject: Move binaries and libraries to /bin and /lib
X-Git-Tag: v0.34~78
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=483c354c286d892af643b564988a4c90808a262e;p=thirdparty%2Flibcgroup.git

Move binaries and libraries to /bin and /lib

Since cgconfig starts before nfs shares are mounted, it should not use
anything on /usr (it can be on nfs too). All the libcgroup libraries and
binaries should be therefore in /.

Signed-off-by: Jan Safranek <jsafrane@redhat.com>
Signed-off-by: Dhaval Giani <dhaval@linux.vnet.ibm.com>
---

diff --git a/libcgroup.spec.in b/libcgroup.spec.in
index 5a65d6ba..e3cc1149 100644
--- a/libcgroup.spec.in
+++ b/libcgroup.spec.in
@@ -32,7 +32,8 @@ provide scripts to manage that configuration.
 %setup -q
 
 %build
-%configure
+%configure --bindir=/bin --sbindir=/sbin --libdir=/%{_lib}
+
 make %{?_smp_mflags}
 
 
@@ -46,9 +47,6 @@ mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig
 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/pam_cgroup.so
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -73,12 +71,12 @@ fi
 %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/*
@@ -91,7 +89,7 @@ fi
 %files devel
 %defattr(-,root,root,-)
 %{_includedir}/libcgroup.h
-%{_libdir}/libcgroup.so
+/%{_lib}/libcgroup.so
 %doc COPYING INSTALL