Change the name from cgroup -> libcgroup

Signed-off-by: Balbir Singh <balbir@linux.vnet.ibm.com>
git-svn-id: https://libcg.svn.sourceforge.net/svnroot/libcg/tags/v0.1b@62 4f4bb910-9a46-0410-90c8-c897d4f1cd53

diff --git a/Makefile b/Makefile
index b75533e008978c43c10cb00de675beeff2ae817a..951a7fd60c40cdaf4eb78b5514392a0852115353 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -20,7 +20,7 @@ LEX=flex
 bindir=${exec_prefix}/bin
 libdir=${exec_prefix}/lib
 includedir=${prefix}/include
-prefix=/usr/local
+prefix=/usr
 exec_prefix=${prefix}
 INSTALL=install
 INSTALL_DATA=install -m 644
@@ -40,7 +40,7 @@ lex.yy.c: lex.l
        $(LEX) lex.l
 
 libcgroup.so: api.c libcgroup.h
-       $(CXX) $(CFLAGS) -shared -fPIC -o $@ api.c
+       $(CXX) $(CFLAGS) -shared -fPIC -Wl,--soname,$@.$(VERSION) -o $@ api.c
        ln -sf $@ $@.$(VERSION)
 
 install: libcgroup.so
@@ -56,4 +56,5 @@ uninstall: libcgroup.so
        rm -f $(DESTDIR)$(libdir)/libcgroup-$(PACKAGE_VERSION).so
 
 clean:
-       \rm -f y.tab.c y.tab.h lex.yy.c y.output cgconfig libcgroup.so
+       \rm -f y.tab.c y.tab.h lex.yy.c y.output cgconfig libcgroup.so \
+       libcgroup.so.$(VERSION)

diff --git a/Makefile.in b/Makefile.in
index c2d524f90182288c5c4cb8854192d5d1f1c7de6a..b610417f26931719d91aedfb6068e3ced9028adc 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -40,7 +40,7 @@ lex.yy.c: lex.l
        $(LEX) lex.l
 
 libcgroup.so: api.c libcgroup.h
-       $(CXX) $(CFLAGS) -shared -fPIC -o $@ api.c
+       $(CXX) $(CFLAGS) -shared -fPIC -Wl,--soname,$@.$(VERSION) -o $@ api.c
        ln -sf $@ $@.$(VERSION)
 
 install: libcgroup.so
@@ -56,4 +56,5 @@ uninstall: libcgroup.so
        rm -f $(DESTDIR)$(libdir)/libcgroup-$(PACKAGE_VERSION).so
 
 clean:
-       \rm -f y.tab.c y.tab.h lex.yy.c y.output cgconfig libcgroup.so
+       \rm -f y.tab.c y.tab.h lex.yy.c y.output cgconfig libcgroup.so \
+       libcgroup.so.$(VERSION)

diff --git a/configure b/configure
index 907c8da0c741f0cf2eb4348e1c59f5dbf940e211..4504a6505004f0ff180399511eed906048758927 100755 (executable)
--- a/configure
+++ b/configure
@@ -7052,6 +7052,40 @@ echo "$as_me: $ac_file is unchanged" >&6;}
     cat "$ac_result"
   fi
   rm -f "$tmp/out12"
+# Compute $ac_file's index in $config_headers.
+_am_arg=$ac_file
+_am_stamp_count=1
+for _am_header in $config_headers :; do
+  case $_am_header in
+    $_am_arg | $_am_arg:* )
+      break ;;
+    * )
+      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
+  esac
+done
+echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" ||
+$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+        X"$_am_arg" : 'X\(//\)[^/]' \| \
+        X"$_am_arg" : 'X\(//\)$' \| \
+        X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null ||
+echo X"$_am_arg" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+           s//\1/
+           q
+         }
+         /^X\(\/\/\)[^/].*/{
+           s//\1/
+           q
+         }
+         /^X\(\/\/\)$/{
+           s//\1/
+           q
+         }
+         /^X\(\/\).*/{
+           s//\1/
+           q
+         }
+         s/.*/./; q'`/stamp-h$_am_stamp_count
  ;;
 
 

diff --git a/libcgroup.spec.in b/libcgroup.spec.in
index 02b125ad30ee052ee8df3a2be5b9e6968608063e..214b881897cd976933bb433c13ac81ddaee7f90c 100644 (file)
--- a/libcgroup.spec.in
+++ b/libcgroup.spec.in
@@ -1,37 +1,33 @@
-Name: cgroup
+Name: libcgroup
 Summary: A collection of tools and libraries to control and monitor control groups the associated controllers
 Group: Development/Libraries
 Version: @PACKAGE_VERSION@
 Release:        1%{?dist}
-License: LGPL
+License: LGPLv2+
 URL: http://libcg.sourceforge.net/%{name}-%{version}.tar.bz2
-Source0: cgroup-@PACKAGE_VERSION@.tar.bz2
+Source0: libcgroup-@PACKAGE_VERSION@.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: byacc
 BuildRequires: flex
 BuildRequires: coreutils
 
 %description
-
 Control groups infrastructure. The tools and library help manipulate, control,
 administrate and monitor control groups and the associated controllers.
 
-%package lib
-Summary: Development libraries to handle control group applications
+%package devel
+Summary: Development libraries to develop applications that utilize control groups
 Group: Development/Libraries
+Requires: libcgroup >= 0.1b
 
-%description lib
+%description devel
 The libcgroup-devel package contains the libraries to run control group
 applications. 
 
-%package lib-devel
-Summary: Development libraries to develop applications that utilize control groups
-Group: Development/Libraries
-
-%description lib-devel
+%description devel
 It provides API to create/delete and modify cgroup nodes. It will also in the
-future allow creation of persistent configuration for control groups and provide
-scripts to manage that configuration.
+future allow creation of persistent configuration for control groups and
+provide scripts to manage that configuration.
 
 %prep
 %setup -q 
@@ -49,13 +45,13 @@ rm -rf $RPM_BUILD_ROOT
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files lib
+%files 
 %defattr(-,root,root,-)
 %{_libdir}/libcgroup-%{version}.so
 %{_libdir}/libcgroup.so.*
 %doc COPYING INSTALL
 
-%files lib-devel
+%files devel
 %defattr(-,root,root,-)
 %{_includedir}/libcgroup.h
 %{_libdir}/libcgroup.so
@@ -63,7 +59,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-*Tue May 20 2008 Dhaval Giani <dhaval@linux.vnet.ibm.com> 0.1-1
--The first version of libcg
+* Mon May 26 2008 Balbir Singh <balbir@linux.vnet.ibm.com> 0.1b-1
+- Add a generatable spec file
 * Tue May 20 2008 Balbir Singh <balbir@linux.vnet.ibm.com> 0.1-1
 - Get the spec file to work
+* Tue May 20 2008 Dhaval Giani <dhaval@linux.vnet.ibm.com> 0.01-1
+- The first version of libcg

diff --git a/mktarball.in b/mktarball.in
index eeabe19b8927b2b7e74f1ebc2a45d2b8e1245271..2170a12a4af410db8c5e3f837bc8d6065f3fa4cc 100755 (executable)
--- a/mktarball.in
+++ b/mktarball.in
@@ -21,16 +21,16 @@ fi
 
 if [[ $issvn -eq 1 ]]
 then
-       svn export --force http://libcg.svn.sf.net/svnroot/libcg/tags/v$package_version  /tmp/cgroup-$package_version
+       svn export --force http://libcg.svn.sf.net/svnroot/libcg/tags/v$package_version  /tmp/libcgroup-$package_version
        if [[ $? -ne 0 ]]
        then
                echo "Tag v$package_version  missing"
        fi
 else
-       cp -a . /tmp/cgroup-$package_version
+       cp -a . /tmp/libcgroup-$package_version
 fi
 
 pushd /tmp 2>&1 > /dev/null
-tar jcf $srcd/cgroup-$package_version.tar.bz2  cgroup-$package_version
+tar jcf $srcd/libcgroup-$package_version.tar.bz2  libcgroup-$package_version
 popd 2>&1 > /dev/null