Author: glen Date: Wed Aug 26 07:27:14 2009 GMT Module: packages Tag: HEAD ---- Log message: - pldize
---- Files affected: packages/libcgroup: libcgroup.spec (1.2 -> 1.3) ---- Diffs: ================================================================ Index: packages/libcgroup/libcgroup.spec diff -u packages/libcgroup/libcgroup.spec:1.2 packages/libcgroup/libcgroup.spec:1.3 --- packages/libcgroup/libcgroup.spec:1.2 Tue Aug 25 21:57:37 2009 +++ packages/libcgroup/libcgroup.spec Wed Aug 26 09:27:08 2009 @@ -1,19 +1,19 @@ # $Revision$, $Date$ -%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 @@ -24,7 +24,7 @@ %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 @@ -48,15 +48,15 @@ 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 @@ -64,10 +64,10 @@ 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 @@ -79,10 +79,10 @@ %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 @@ -90,27 +90,32 @@ %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 %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -118,6 +123,11 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.3 2009/08/26 07:27:08 glen +- pldize + Revision 1.2 2009/08/25 19:57:37 blues - adapterized +Revision 1.1 2009/08/25 19:52:58 blues +- raw from fedora ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libcgroup/libcgroup.spec?r1=1.2&r2=1.3&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
