Update to 0.36.2, fixing packaging the libraries Resolves: #605434
This commit is contained in:
parent
75b7c4c78f
commit
b59fc7b2b9
@ -1 +1 @@
|
||||
libcgroup-0.36.1.tar.bz2
|
||||
libcgroup-0.36.2.tar.bz2
|
||||
|
@ -1,9 +1,10 @@
|
||||
%define soversion 1.0.36
|
||||
%define soversion_major 1
|
||||
|
||||
Name: libcgroup
|
||||
Summary: Tools and libraries to control and monitor control groups
|
||||
Group: Development/Libraries
|
||||
Version: 0.36.1
|
||||
Version: 0.36.2
|
||||
Release: 1%{?dist}
|
||||
License: LGPLv2+
|
||||
URL: http://libcg.sourceforge.net/
|
||||
@ -47,7 +48,7 @@ provide scripts to manage that configuration.
|
||||
%patch1 -p1 -b .config
|
||||
|
||||
%build
|
||||
%configure --bindir=/bin --sbindir=/sbin --libdir=/%{_lib}
|
||||
%configure --bindir=/bin --sbindir=/sbin --libdir=%{_libdir} --enable-initscript-install --enable-pam-module-dir=/%{_lib}/security
|
||||
|
||||
make %{?_smp_mflags}
|
||||
|
||||
@ -63,20 +64,17 @@ cp samples/cgconfig.sysconfig $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/cgconfig
|
||||
cp samples/cgconfig.conf $RPM_BUILD_ROOT/%{_sysconfdir}/cgconfig.conf
|
||||
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*
|
||||
# sanitize pam module, we need only pam_cgroup.so
|
||||
mv -f $RPM_BUILD_ROOT/%{_lib}/security/pam_cgroup.so.*.*.* $RPM_BUILD_ROOT/%{_lib}/security/pam_cgroup.so
|
||||
rm -f $RPM_BUILD_ROOT/%{_lib}/security/pam_cgroup.la $RPM_BUILD_ROOT/%{_lib}/security/pam_cgroup.so.*
|
||||
|
||||
# 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
|
||||
# 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
|
||||
|
||||
# pre-create /cgroup directory
|
||||
mkdir $RPM_BUILD_ROOT/cgroup
|
||||
@ -105,8 +103,8 @@ fi
|
||||
|
||||
%files
|
||||
%defattr(-,root,root,-)
|
||||
%config(noreplace) %{_sysconfdir}/sysconfig/cgconfig
|
||||
%config(noreplace) %{_sysconfdir}/sysconfig/cgred.conf
|
||||
%config(noreplace) %{_sysconfdir}/sysconfig/cgconfig
|
||||
%config(noreplace) %{_sysconfdir}/cgconfig.conf
|
||||
%config(noreplace) %{_sysconfdir}/cgrules.conf
|
||||
/%{_lib}/libcgroup.so.*
|
||||
@ -142,6 +140,9 @@ fi
|
||||
%doc COPYING INSTALL
|
||||
|
||||
%changelog
|
||||
* Tue Jun 22 2010 Jan Safranek <jsafrane@redhat.com> 0.36.2-1
|
||||
- Update to 0.36.2, fixing packaging the libraries (#605434)
|
||||
|
||||
* Fri May 21 2010 Jan Safranek <jsafrane@redhat.com> 0.36-1
|
||||
- Update to 0.36.1
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user