- added pam patch: use -avoid-version instead of messing with pam module renaming

Changed files:
    libcgroup-pam.patch -> 1.1
    libcgroup.spec -> 1.16

diff --git a/libcgroup-pam.patch b/libcgroup-pam.patch
new file mode 100644 (file)
index 0000000..d74c79d
--- /dev/null
+++ b/libcgroup-pam.patch
@@ -0,0 +1,11 @@
+--- libcgroup-0.37/src/pam/Makefile.am.orig    2010-10-20 15:59:13.000000000 +0200
++++ libcgroup-0.37/src/pam/Makefile.am 2011-02-08 21:38:12.020693065 +0100
+@@ -4,7 +4,7 @@
+ 
+ pamlib_LTLIBRARIES = pam_cgroup.la
+ pam_cgroup_la_SOURCES = pam_cgroup.c
+-pam_cgroup_la_LDFLAGS = -module
++pam_cgroup_la_LDFLAGS = -module -avoid-version
+ pam_cgroup_la_LIBADD = $(top_builddir)/src/.libs/libcgroup.la -lpam
+ 
+ endif

diff --git a/libcgroup.spec b/libcgroup.spec
index c6489067ea83f30ccec4f55d0532764c4456ac1b..600f515b86cf729443cdcf76141666f024a2049d 100644 (file)
--- a/libcgroup.spec
+++ b/libcgroup.spec
@@ -9,6 +9,7 @@ Source0:        http://downloads.sourceforge.net/libcg/%{name}-%{version}.tar.bz2
 # Source0-md5: beecca8770155afa62981076e96d4c9c
 Source1:       cgconfig.init
 Source2:       cgred.init
+Patch0:                %{name}-pam.patch
 URL:           http://libcg.sourceforge.net/
 BuildRequires: bison
 BuildRequires: flex
@@ -65,6 +66,7 @@ Moduł PAM dla libcgroup.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %configure \
@@ -88,12 +90,11 @@ cp -a samples/cgred.conf $RPM_BUILD_ROOT/etc/sysconfig/cgred.conf
 cp -a samples/cgconfig.sysconfig $RPM_BUILD_ROOT/etc/sysconfig/cgconfig
 cp -a samples/cg{config,rules,snapshot_blacklist}.conf $RPM_BUILD_ROOT%{_sysconfdir}
 
-mv -f $RPM_BUILD_ROOT/%{_lib}/security/pam_cgroup.so{.*.*.*,}
 mv $RPM_BUILD_ROOT%{_libdir}/libcgroup.so.* $RPM_BUILD_ROOT/%{_lib}
 ln -snf ../../%{_lib}/$(basename $RPM_BUILD_ROOT/%{_lib}/libcgroup.so.*.*.*) $RPM_BUILD_ROOT%{_libdir}/libcgroup.so
 
-%{__rm} $RPM_BUILD_ROOT/%{_lib}/security/pam_cgroup.so.*
-%{__rm} $RPM_BUILD_ROOT{/%{_lib}/security,%{_libdir}}/*.la
+%{__rm} $RPM_BUILD_ROOT/%{_lib}/security/pam_cgroup.la
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la
 
 %clean
 rm -rf $RPM_BUILD_ROOT