From 1b17475ed4300d050cc87334898908f444881af5 Mon Sep 17 00:00:00 2001 From: Dhaval Giani Date: Fri, 27 Feb 2009 20:38:54 +0000 Subject: libcgroup: Update specfile for v0.33 and bump up the version From: Ivana Varekova OK, here goes 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 [varekova@redhat.com] Incorporate pam module instalation to the spec file - file part change add dependency [balbir@linux.vnet.ibm.com] 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 Signed-off-by: Balbir Singh Signed-off-by: Dhaval Giani git-svn-id: https://libcg.svn.sourceforge.net/svnroot/libcg/trunk@355 4f4bb910-9a46-0410-90c8-c897d4f1cd53 --- Makefile.in | 4 ++++ configure | 18 +++++++++--------- configure.in | 2 +- libcgroup.spec.in | 10 ++++++++++ 4 files changed, 24 insertions(+), 10 deletions(-) diff --git a/Makefile.in b/Makefile.in index f5e6a6d..cfd633d 100644 --- a/Makefile.in +++ b/Makefile.in @@ -94,6 +94,10 @@ uninstall: libcgroup.so rm -f $(DESTDIR)$(bindir)/cgrulesengd rm -f $(DESTDIR)$(mandir)/man5/cgconfig.conf.5 rm -f $(DESTDIR)$(mandir)/man8/cgrulesengd.8 + 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: diff --git a/configure b/configure index 2ae9b58..568bc17 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.63 for control groups library and utilities 0.32.2. +# Generated by GNU Autoconf 2.63 for control groups library and utilities 0.33. # # Report bugs to . # @@ -596,8 +596,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='control groups library and utilities' PACKAGE_TARNAME='control-groups-library-and-utilities' -PACKAGE_VERSION='0.32.2' -PACKAGE_STRING='control groups library and utilities 0.32.2' +PACKAGE_VERSION='0.33' +PACKAGE_STRING='control groups library and utilities 0.33' PACKAGE_BUGREPORT='http://sourceforge.net/tracker/?group_id=218421&atid=1043649' ac_unique_file="wrapper.c" @@ -1265,7 +1265,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures control groups library and utilities 0.32.2 to adapt to many kinds of systems. +\`configure' configures control groups library and utilities 0.33 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1327,7 +1327,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of control groups library and utilities 0.32.2:";; + short | recursive ) echo "Configuration of control groups library and utilities 0.33:";; esac cat <<\_ACEOF @@ -1420,7 +1420,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -control groups library and utilities configure 0.32.2 +control groups library and utilities configure 0.33 generated by GNU Autoconf 2.63 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1434,7 +1434,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by control groups library and utilities $as_me 0.32.2, which was +It was created by control groups library and utilities $as_me 0.33, which was generated by GNU Autoconf 2.63. Invocation command line was $ $0 $@ @@ -6689,7 +6689,7 @@ exec 6>&1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by control groups library and utilities $as_me 0.32.2, which was +This file was extended by control groups library and utilities $as_me 0.33, which was generated by GNU Autoconf 2.63. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -6748,7 +6748,7 @@ Report bugs to ." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -control groups library and utilities config.status 0.32.2 +control groups library and utilities config.status 0.33 configured by $0, generated by GNU Autoconf 2.63, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff --git a/configure.in b/configure.in index 48c51e8..328807c 100644 --- a/configure.in +++ b/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]) diff --git a/libcgroup.spec.in b/libcgroup.spec.in index 5fac72c..5a65d6b 100644 --- a/libcgroup.spec.in +++ b/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 @@ -45,6 +46,9 @@ mkdir -p $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 +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 @@ -75,8 +79,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 @@ -88,6 +96,8 @@ fi %changelog +* Tue Feb 24 2009 Balbir Singh 0.33-1 +- Update to 0.33, spec file changes to add Makefiles and pam_cgroup module * Fri Oct 10 2008 Dhaval Giani 0.32-1 - Update to latest upstream * Thu Sep 11 2008 Dhaval Giani 0.31-1 -- cgit