- pldize

Changed files:
    libcgroup.spec -> 1.3

diff --git a/libcgroup.spec b/libcgroup.spec
index 7a56194f2e379ffba973c7cdbb0ac2623ffb7ed8..4910a8ea74e608a2d62c2135e88d37c794a8c995 100644 (file)
--- a/libcgroup.spec
+++ b/libcgroup.spec
@@ -1,18 +1,18 @@
-%define soversion 1.0.34
-
 Summary:       Tools and libraries to control and monitor control groups
 Name:          libcgroup
 Version:       0.34
 Release:       1
-License:       LGPLv2+
+License:       LGPL v2+
 Group:         Development/Libraries
 Source0:       http://dl.sourceforge.net/libcg/%{name}-%{version}.tar.bz2
 # Source0-md5: 681c751d1a1ea78615094007d39db6cb
 URL:           http://libcg.sourceforge.net/
 BuildRequires: flex
 BuildRequires: pam-devel
-Requires(post):        chkconfig, /sbin/service
+Requires(post):        /sbin/chkconfig
+Requires(post):        /sbin/ldconfig
 Requires(preun):       /sbin/chkconfig
+Requires:      rc-scripts
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -23,7 +23,7 @@ controllers.
 %package devel
 Summary:       Development libraries to develop applications that utilize control groups
 Group:         Development/Libraries
-Requires:      libcgroup = %{version}-%{release}
+Requires:      %{name} = %{version}-%{release}
 
 %description devel
 It provides API to create/delete and modify cgroup nodes. It will also
@@ -47,15 +47,15 @@ rm -rf $RPM_BUILD_ROOT
        DESTDIR=$RPM_BUILD_ROOT
 
 # install init scripts
-install -d $RPM_BUILD_ROOT/%{_initrddir}
-cp scripts/init.d/cgconfig $RPM_BUILD_ROOT/%{_initrddir}/cgconfig
-cp scripts/init.d/cgred $RPM_BUILD_ROOT/%{_initrddir}/cgred
+install -d $RPM_BUILD_ROOT/etc/rc.d/init.d
+cp scripts/init.d/cgconfig $RPM_BUILD_ROOT/etc/rc.d/init.d/cgconfig
+cp scripts/init.d/cgred $RPM_BUILD_ROOT/etc/rc.d/init.d/cgred
 
 # install config files
-install -d $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
+install -d $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
 
 # sanitize pam module, we need only pam_cgroup.so in the right directory
 install -d $RPM_BUILD_ROOT/%{_lib}/security
@@ -63,10 +63,10 @@ mv -f $RPM_BUILD_ROOT/%{_lib}/pam_cgroup.so.*.*.* $RPM_BUILD_ROOT/%{_lib}/securi
 rm -f $RPM_BUILD_ROOT/%{_lib}/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}
+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
-ln -sf ../../%{_lib}/libcgroup.so.%{soversion} $RPM_BUILD_ROOT/%{_libdir}/libcgroup.so
+ln -snf ../../%{_lib}/$(basename $RPM_BUILD_ROOT/%{_lib}/libcgroup.so.*.*.*) $RPM_BUILD_ROOT%{_libdir}/libcgroup.so
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -78,10 +78,10 @@ rm -rf $RPM_BUILD_ROOT
 
 %preun
 if [ $1 = 0 ]; then
-    %service cgred stop > /dev/null 2>&1 || :
-    %service cgconfig stop > /dev/null 2>&1 || :
-    /sbin/chkconfig --del cgconfig
-    /sbin/chkconfig --del cgred
+       %service cgred stop
+       %service cgconfig stop
+       /sbin/chkconfig --del cgconfig
+       /sbin/chkconfig --del cgred
 fi
 
 %postun -p /sbin/ldconfig
@@ -89,23 +89,29 @@ fi
 %files
 %defattr(644,root,root,755)
 %doc INSTALL README_daemon
-%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/cgred.conf
 %config(noreplace) %{_sysconfdir}/cgconfig.conf
 %config(noreplace) %{_sysconfdir}/cgrules.conf
-%attr(755,root,root) /%{_lib}/libcgroup.so.*
-/bin/cgexec
-/bin/cgclassify
-/sbin/cgconfigparser
-/sbin/cgrulesengd
-%attr(644, root, root) %{_mandir}/man1/*
-%attr(644, root, root) %{_mandir}/man5/*
-%attr(644, root, root) %{_mandir}/man8/*
-%attr(755,root,root) %{_initrddir}/cgconfig
-%attr(755,root,root) %{_initrddir}/cgred
+%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/cgred.conf
+%attr(754,root,root) /etc/rc.d/init.d/cgconfig
+%attr(754,root,root) /etc/rc.d/init.d/cgred
+%attr(755,root,root) /%{_lib}/libcgroup.so.*.*.*
+%attr(755,root,root) %ghost /%{_lib}/libcgroup.so.1
 %attr(755,root,root) /%{_lib}/security/pam_cgroup.so
+%attr(755,root,root) /bin/cgexec
+%attr(755,root,root) /bin/cgclassify
+%attr(755,root,root) /sbin/cgconfigparser
+%attr(755,root,root) /sbin/cgrulesengd
+%{_mandir}/man1/cgclassify.1*
+%{_mandir}/man1/cgexec.1*
+%{_mandir}/man5/cgconfig.conf.5*
+%{_mandir}/man5/cgred.conf.5*
+%{_mandir}/man5/cgrules.conf.5*
+%{_mandir}/man8/cgconfigparser.8*
+%{_mandir}/man8/cgrulesengd.8*
 
 %files devel
 %defattr(644,root,root,755)
-%{_includedir}/libcgroup.h
-%{_libdir}/libcgroup.*
 %doc INSTALL
+%{_includedir}/libcgroup.h
+%{_libdir}/libcgroup.la
+%{_libdir}/libcgroup.so