From: Jan Safranek <jsafrane@redhat.com>
Date: Mon, 31 May 2010 15:15:08 +0000 (+0200)
Subject: Rework the way how the libraries are installed.
X-Git-Tag: v0.36.2~2^2~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a083ff5ceeed38a1853f8c808e535b6269472686;p=thirdparty%2Flibcgroup.git

Rework the way how the libraries are installed.

As pointed out by Kay Sievers on IRC, the pkgconfig file should point to
/usr/lib, where libcgroup.so symlink is located, not to /lib, where is the
real library libcgroup.so.1.0.36.

Therefore it's better to install libraries to /usr/lib, which generated
the right libcgroup.pc and then move all necessary libs to /lib.

Signed-off-by: Jan Safranek <jsafrane@redhat.com>
Signed-off-by: Dhaval Giani <dhaval.giani@gmail.com>
---

diff --git a/dist/libcgroup.spec.in b/dist/libcgroup.spec.in
index d0272dcc..99cc885b 100644
--- a/dist/libcgroup.spec.in
+++ b/dist/libcgroup.spec.in
@@ -1,4 +1,5 @@
 %define soversion @LIBRARY_VERSION_MAJOR@.@LIBRARY_VERSION_MINOR@.@LIBRARY_VERSION_RELEASE@
+%define soversion_major @LIBRARY_VERSION_MAJOR@
 
 Name: libcgroup
 Summary: Tools and libraries to control and monitor control groups
@@ -43,7 +44,7 @@ provide scripts to manage that configuration.
 %setup -q
 
 %build
-%configure --bindir=/bin --sbindir=/sbin --libdir=/%{_lib}
+%configure --bindir=/bin --sbindir=/sbin --libdir=%{_libdir}
 
 make %{?_smp_mflags}
 
@@ -61,19 +62,16 @@ cp samples/cgrules.conf $RPM_BUILD_ROOT/%{_sysconfdir}/cgrules.conf
 
 # sanitize pam module, we need only pam_cgroup.so in the right directory
 mkdir -p $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*
-
-# move the devel stuff to /usr
-mkdir -p $RPM_BUILD_ROOT/%{_libdir}
-mv -f $RPM_BUILD_ROOT/%{_lib}/libcgroup.la $RPM_BUILD_ROOT/%{_libdir}
-rm -f $RPM_BUILD_ROOT/%{_lib}/libcgroup.so
+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 libraries  to /
+mkdir -p $RPM_BUILD_ROOT/%{_lib}
+mv -f $RPM_BUILD_ROOT/%{_libdir}/libcgroup.so.%{soversion} $RPM_BUILD_ROOT/%{_lib}
+rm -f $RPM_BUILD_ROOT/%{_libdir}/libcgroup.so.%{soversion_major}
+ln -sf libcgroup.so.%{soversion} $RPM_BUILD_ROOT/%{_lib}/libcgroup.so.%{soversion_major}
 ln -sf ../../%{_lib}/libcgroup.so.%{soversion} $RPM_BUILD_ROOT/%{_libdir}/libcgroup.so
-
-# move the package config file to /usr/lib/pkgconfig
-mkdir -p $RPM_BUILD_ROOT/%{_libdir}/pkgconfig
-mv -f $RPM_BUILD_ROOT/%{_lib}/pkgconfig/libcgroup.pc $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/libcgroup.pc
-
+rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
 %clean
 rm -rf $RPM_BUILD_ROOT