Hi, Everyone, This patch Originally from Ivana and with changes I've made, get the spec file working again (rpmlint warnings need some care and ownership).
The new version will be 0.33 and will have new man pages and newer API and many more bug fixes Description ----------- Incorporate pam module instalation to the spec file - file part change add dependency [[email protected]] Bumped up the version, getting ready for a new release. Updated makefile to install new man pages and to move the pam module to the correct place at the time of installation. Signed-off-by: Ivana Varekova <[email protected]> Signed-off-by: Balbir Singh <[email protected]> --- libcgroup.spec.in | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) Index: trunk/libcgroup.spec.in =================================================================== --- trunk.orig/libcgroup.spec.in +++ trunk/libcgroup.spec.in @@ -7,6 +7,7 @@ License: LGPLv2+ URL: http://libcg.sourceforge.net/ Source0: http://downloads.sourceforge.net/libcg/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRequires: pam-devel BuildRequires: byacc BuildRequires: flex BuildRequires: coreutils @@ -46,6 +47,9 @@ mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/ 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 +mkdir -p $RPM_BUILD_ROOT/%{_lib}/security/ +mv $RPM_BUILD_ROOT/%{_libdir}/security/pam_cgroup.so \ + $RPM_BUILD_ROOT/%{_lib}/security/pam_cgroup.so %clean rm -rf $RPM_BUILD_ROOT @@ -76,8 +80,12 @@ fi %{_bindir}/cgclassify %{_sbindir}/cgconfigparser %{_bindir}/cgrulesengd +%attr(0644, root, root) %{_mandir}/man1/* +%attr(0644, root, root) %{_mandir}/man5/* +%attr(0644, root, root) %{_mandir}/man8/* %attr(0755,root,root) %{_initrddir}/cgconfig %attr(0755,root,root) %{_initrddir}/cgred +%attr(0755,root,root) /%{_lib}/security/pam_cgroup.so %doc COPYING INSTALL README_daemon @@ -89,6 +97,8 @@ fi %changelog +* Tue Feb 24 2009 Balbir Singh <[email protected]> 0.33-1 +- Update to 0.33, spec file changes to add Makefiles and pam_cgroup module * Fri Oct 10 2008 Dhaval Giani <[email protected]> 0.32-1 - Update to latest upstream * Thu Sep 11 2008 Dhaval Giani <[email protected]> 0.31-1 Index: trunk/Makefile.in =================================================================== --- trunk.orig/Makefile.in +++ trunk/Makefile.in @@ -75,7 +75,14 @@ install: $(TARGETS) $(INSTALL) -D cgexec $(DESTDIR)$(bindir)/cgexec $(INSTALL) -D cgclassify $(DESTDIR)$(bindir)/cgclassify $(INSTALL) -D cgrulesengd $(DESTDIR)$(bindir)/cgrulesengd - $(INSTALL) -D doc/man/cgconfig.conf.5 $(DESTDIR)$(mandir)/man5/cgconfig.conf.5 + $(INSTALL) -D doc/man/cgconfig.conf.5 \ + $(DESTDIR)$(mandir)/man5/cgconfig.conf.5 + $(INSTALL) -D doc/man/cgclassify.1 $(DESTDIR)$(mandir)/man1/cgclassify.1 + $(INSTALL) -D doc/man/cgconfigparser.8 \ + $(DESTDIR)$(mandir)/man8/cgconfigparser.8 + $(INSTALL) -D doc/man/cgexec.1 $(DESTDIR)$(mandir)/man1/cgexec.1 + $(INSTALL) -D doc/man/cgrules.conf.5 \ + $(DESTDIR)$(mandir)/man5/cgrules.conf.5 $(INSTALL) -D pam_cgroup.so $(DESTDIR)$(libdir)/security/pam_cgroup.so uninstall: libcgroup.so @@ -88,6 +95,10 @@ uninstall: libcgroup.so rm -f $(DESTDIR)$(bindir)/cgclassify rm -f $(DESTDIR)$(bindir)/cgrulesengd rm -f $(DESTDIR)$(mandir)/man5/cgconfig.conf.5 + rm -f $(DESTDIR)$(mandir)/man5/cgrules.conf.5 + rm -f $(DESTDIR)$(mandir)/man1/cgexec.1 + rm -f $(DESTDIR)$(mandir)/man1/cgclassify.1 + rm -f $(DESTDIR)$(mandir)/man8/cgconfigparser.8 rm -f $(DESTDIR)$(libdir)/security/pam_cgroup.so clean: Index: trunk/configure.in =================================================================== --- trunk.orig/configure.in +++ trunk/configure.in @@ -13,7 +13,7 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. # AC_PREREQ(2.61) -AC_INIT([control groups library and utilities], 0.32.2, +AC_INIT([control groups library and utilities], 0.33, [http://sourceforge.net/tracker/?group_id=218421&atid=1043649]) AC_CONFIG_SRCDIR([wrapper.c]) AC_CONFIG_HEADER([config.h]) -- Balbir ------------------------------------------------------------------------------ Open Source Business Conference (OSBC), March 24-25, 2009, San Francisco, CA -OSBC tackles the biggest issue in open source: Open Sourcing the Enterprise -Strategies to boost innovation and cut costs with open source participation -Receive a $600 discount off the registration fee with the source code: SFAD http://p.sf.net/sfu/XcvMzF8H _______________________________________________ Libcg-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/libcg-devel
