Index: SPECS/libcgroup.spec
===================================================================
--- SPECS/libcgroup.spec	(revision 575083)
+++ SPECS/libcgroup.spec	(working copy)
@@ -1,19 +1,22 @@
 %define	major	1
 %define	mname	cgroup
+%define name	lib%{mname}
+%define version	0.36.2
+%define release %mkrel 1
 %define	libname	%mklibname %{mname} %{major}
 %define	devname	%mklibname %{mname} -d
 
-Name:		libcgroup
+Name:		%{name}
 Summary:	Tools and libraries to control and monitor control groups
 Group:		System/Base
-Version:	0.35
-Release:	%mkrel 1
-License:	LGPLv2+
+Version:	%{version}
+Release:	%{release}
+License:	LGPLv2
 URL:		http://libcg.sourceforge.net/
-Source0:	http://downloads.sourceforge.net/libcg/%{name}-v%{version}.tar.bz2
+Source0:	http://downloads.sourceforge.net/libcg/%{name}/v%{version}/%{name}-%{version}.tar.bz2
 Source1:	libcgroup-README.Mandriva
 Patch0:		libcgroup-fedora-config.patch
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-%{release}-buildroot
+BuildRoot:	%{_tmppath}/%{name}-%{version}
 BuildRequires:	pam-devel
 BuildRequires:	byacc
 BuildRequires:	flex
@@ -36,7 +39,7 @@
 
 %package	pam
 Summary:	A Pluggable Authentication Module for libcgroup
-Group:		System Environment/Base
+Group:		System/Libraries
 Requires:	%{libname} = %{version}-%{release}
 
 %description	pam
@@ -71,37 +74,38 @@
 %patch0 -p1 -b .config
 cp %{SOURCE1} README.Mandriva
 
-autoreconf -i
-
 %build
-%configure	--bindir=/bin \
+%configure2_5x	--bindir=/bin \
 		--sbindir=/sbin \
-		--libdir=/%{_lib}
+		--libdir=/%{_lib} \
+		--enable-initscript-install
 %make
 
 %install
 rm -rf %{buildroot}
 %makeinstall_std
 
-mkdir -p %{buildroot}%{_initrddir}
-mv %{buildroot}%{_sysconfdir}/init.d/* %{buildroot}%{_initrddir}
-
 # install config files
 install -m644 samples/cgred.conf -D %{buildroot}%{_sysconfdir}/sysconfig/cgred.conf
 install -m644 samples/cgconfig.conf -D %{buildroot}%{_sysconfdir}/cgconfig.conf
 install -m644 samples/cgrules.conf -D %{buildroot}%{_sysconfdir}/cgrules.conf
 
 # sanitize pam module, we need only pam_cgroup.so in the right directory
-mkdir -p %{buildroot}/%{_lib}/security
-mv -f %{buildroot}/%{_lib}/pam_cgroup.so.*.*.* %{buildroot}/%{_lib}/security/pam_cgroup.so
-rm -f %{buildroot}/%{_lib}/pam_cgroup*
+rm -f %{buildroot}/%{_lib}/security/pam_cgroup.so
+mv -f %{buildroot}/%{_lib}/security/pam_cgroup.so.*.*.* %{buildroot}/%{_lib}/security/pam_cgroup.so
+rm -f %{buildroot}/%{_lib}/security/pam_cgroup.so.*
+rm -f %{buildroot}/%{_lib}/security/pam_cgroup.la
 
 # move the devel stuff to /usr
 mkdir -p %{buildroot}%{_libdir}
-mv -f %{buildroot}/%{_lib}/libcgroup.la %{buildroot}%{_libdir}
-rm -f %{buildroot}/%{_lib}/libcgroup.so
-ln -sf ../../%{_lib}/libcgroup.so.%{major} %{buildroot}%{_libdir}/libcgroup.so
+mv -f %{buildroot}/%{_lib}/lib%{mname}.la %{buildroot}%{_libdir}
+rm -f %{buildroot}/%{_lib}/lib%{mname}.so
+ln -sf ../../%{_lib}/lib%{mname}.so.%{major} %{buildroot}%{_libdir}/lib%{mname}.so
 
+# pkgconfig file as well
+mkdir -p %{buildroot}%{_libdir}/pkgconfig
+mv -f %{buildroot}/%{_lib}/pkgconfig/%{name}.pc %{buildroot}%{_libdir}/pkgconfig
+
 # pre-create /cgroup directory
 mkdir -p %{buildroot}/cgroup
 
@@ -145,11 +149,13 @@
 %files -n %{libname}
 %defattr(-,root,root)
 /%{_lib}/lib%{mname}.so.%{major}
-/%{_lib}/lib%{mname}.so.%{major}.%{version}
+/%{_lib}/lib%{mname}.so.%{major}.*
 
 %files -n %{devname}
 %defattr(-,root,root)
 %{_includedir}/libcgroup.h
+%{_includedir}/libcgroup
+%{_libdir}/pkgconfig/%{name}.pc
 %{_libdir}/lib%{mname}.so
 %{_libdir}/lib%{mname}.la