packages: libcgroup/libcgroup.spec, libcgroup/libcgroup-pam.patch (NEW) - a...

[qboosh]

Author: qboosh                       Date: Tue Feb  8 20:49:35 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- added pam patch: use -avoid-version instead of messing with pam module renaming

---- Files affected:
packages/libcgroup:
   libcgroup.spec (1.15 -> 1.16) , libcgroup-pam.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/libcgroup/libcgroup.spec
diff -u packages/libcgroup/libcgroup.spec:1.15 packages/libcgroup/libcgroup.spec:1.16
--- packages/libcgroup/libcgroup.spec:1.15	Tue Feb  8 21:41:00 2011
+++ packages/libcgroup/libcgroup.spec	Tue Feb  8 21:49:29 2011
@@ -10,6 +10,7 @@
 # Source0-md5:	beecca8770155afa62981076e96d4c9c
 Source1:	cgconfig.init
 Source2:	cgred.init
+Patch0:		%{name}-pam.patch
 URL:		http://libcg.sourceforge.net/
 BuildRequires:	bison
 BuildRequires:	flex
@@ -66,6 +67,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %configure \
@@ -89,12 +91,11 @@
 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
@@ -154,6 +155,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.16  2011/02/08 20:49:29  qboosh
+- added pam patch: use -avoid-version instead of messing with pam module renaming
+
 Revision 1.15  2011/02/08 20:41:00  qboosh
 - pl
 

================================================================
Index: packages/libcgroup/libcgroup-pam.patch
diff -u /dev/null packages/libcgroup/libcgroup-pam.patch:1.1
--- /dev/null	Tue Feb  8 21:49:35 2011
+++ packages/libcgroup/libcgroup-pam.patch	Tue Feb  8 21:49:29 2011
@@ -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
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libcgroup/libcgroup.spec?r1=1.15&r2=1.16&f=u