- use exec_prefix

Changed files:
    libcgroup.spec -> 1.4

diff --git a/libcgroup.spec b/libcgroup.spec
index 4910a8ea74e608a2d62c2135e88d37c794a8c995..e80ab6c57ad74002e238a0708947d00948ad97ad 100644 (file)
--- a/libcgroup.spec
+++ b/libcgroup.spec
@@ -1,3 +1,11 @@
+# TODO
+# - pldize initscripts
+# warning: Installed (but unpackaged) file(s) found:
+#   /bin/cgcreate
+#   /bin/cgset
+#   /sbin/cgclear
+#   /usr/share/man/man1/cgcreate.1.gz
+#   /usr/share/man/man1/cgset.1.gz
 Summary:       Tools and libraries to control and monitor control groups
 Name:          libcgroup
 Version:       0.34
@@ -15,6 +23,9 @@ Requires(preun):      /sbin/chkconfig
 Requires:      rc-scripts
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%define                _exec_prefix    /
+%define                _libdir                 %{_prefix}/%{_lib}
+
 %description
 Control groups infrastructure. The tools and library help manipulate,
 control, administrate and monitor control groups and the associated
@@ -34,11 +45,7 @@ groups and provide scripts to manage that configuration.
 %setup -q
 
 %build
-%configure \
-       --bindir=/bin \
-       --sbindir=/sbin \
-       --libdir=/%{_lib} \
-
+%configure
 %{__make}
 
 %install
@@ -59,13 +66,12 @@ cp samples/cgrules.conf $RPM_BUILD_ROOT%{_sysconfdir}/cgrules.conf
 
 # sanitize pam module, we need only pam_cgroup.so in the right directory
 install -d $RPM_BUILD_ROOT/%{_lib}/security
-mv -f $RPM_BUILD_ROOT/%{_lib}/pam_cgroup.so.*.*.* $RPM_BUILD_ROOT/%{_lib}/security/pam_cgroup.so
-rm -f $RPM_BUILD_ROOT/%{_lib}/pam_cgroup*
+mv -f $RPM_BUILD_ROOT%{_libdir}/pam_cgroup.so.*.*.* $RPM_BUILD_ROOT/%{_lib}/security/pam_cgroup.so
+rm -f $RPM_BUILD_ROOT%{_libdir}/pam_cgroup*
 
-# move the devel stuff to %{_prefix}
-install -d $RPM_BUILD_ROOT%{_libdir}
-mv -f $RPM_BUILD_ROOT/%{_lib}/libcgroup.la $RPM_BUILD_ROOT%{_libdir}
-rm -f $RPM_BUILD_ROOT/%{_lib}/libcgroup.so
+# move library to /%{_lib}
+install -d $RPM_BUILD_ROOT/%{_lib}
+mv $RPM_BUILD_ROOT%{_libdir}/libcgroup.so.* $RPM_BUILD_ROOT/%{_lib}
 ln -snf ../../%{_lib}/$(basename $RPM_BUILD_ROOT/%{_lib}/libcgroup.so.*.*.*) $RPM_BUILD_ROOT%{_libdir}/libcgroup.so
 
 %clean