rpms/dbmail/FC-5 dbmail.logrotate,1.2,1.3 dbmail.spec,1.12,1.13

[Bernard Johnson (bjohnson)]

Author: bjohnson

Update of /cvs/pkgs/rpms/dbmail/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15393/FC-5

Modified Files:
	dbmail.logrotate dbmail.spec 
Log Message:
filter provides of private libraries (bz#245326)
remove ld.so configuration
minor update to logrotate script



Index: dbmail.logrotate
===================================================================
RCS file: /cvs/pkgs/rpms/dbmail/FC-5/dbmail.logrotate,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- dbmail.logrotate	5 Jun 2007 15:44:54 -0000	1.2
+++ dbmail.logrotate	23 Jun 2007 09:29:30 -0000	1.3
@@ -9,6 +9,6 @@
     notifempty
     create 0600 root root
     postrotate
-       for pid in `ls /var/run/dbmail*\.pid`; do kill -HUP `cat $pid` &> /dev/null; done
+       for pid in `ls /var/run/dbmail-*\.pid`; do kill -HUP `cat $pid` &> /dev/null; done
     endscript
 }


Index: dbmail.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dbmail/FC-5/dbmail.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- dbmail.spec	20 Jun 2007 17:10:34 -0000	1.12
+++ dbmail.spec	23 Jun 2007 09:29:30 -0000	1.13
@@ -11,7 +11,7 @@
 
 Name:           dbmail
 Version:        2.2.5
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        The DBMail mail storage system
 
 Group:          System Environment/Daemons
@@ -82,6 +82,24 @@
        -e 's/\(^EFFECTIVE_USER\W*=\)\(.*$\)/\1 dbmail/'                       \
        -e 's/\(^EFFECTIVE_GROUP\W*=\)\(.*$\)/\1 dbmail/' dbmail.conf
 
+# Filter out provides of private libraries
+cat << \EOF > %{name}-provides
+#!/bin/sh
+%{__find_provides} $* |\
+  sed -e '/libauth_ldap\.so/d'  \
+      -e '/libauth_sql\.so/d'   \
+      -e '/libdbmail\.so/d'     \
+      -e '/libsort_sieve\.so/d' \
+      -e '/libsqlite\.so/d'     \
+      -e '/libsqlite\.so/d'     \
+      -e '/libmysql\.so/d'      \
+      -e '/libpgsql\.so/d'
+EOF
+
+%define _use_internal_dependency_generator 0
+%define __find_provides %{_builddir}/%{name}-%{version}/%{name}-provides
+chmod +x %{__find_provides}
+
 %build
 %configure --disable-rpath \
            --disable-static \
@@ -102,7 +120,6 @@
 mkdir -p $RPM_BUILD_ROOT/%{_initrddir}
 mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/cron.daily
 mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/logrotate.d
-mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/ld.so.conf.d
 mkdir -p $RPM_BUILD_ROOT/%{_localstatedir}/lib/dbmail
 install -p -m 755 %SOURCE1 $RPM_BUILD_ROOT/%{_initrddir}
 install -p -m 755 %SOURCE2 $RPM_BUILD_ROOT/%{_initrddir}
@@ -118,10 +135,6 @@
 find $RPM_BUILD_ROOT -name \*\.la -print | xargs rm -f
 rm -f $RPM_BUILD_ROOT/%{_libdir}/dbmail/libdbmail.so
 
-# create dynamic linker/loader configuration file
-echo "%{_libdir}/dbmail" > \
-     $RPM_BUILD_ROOT/%{_sysconfdir}/ld.so.conf.d/dbmail-`uname -i`.conf
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -172,7 +185,6 @@
 %{_initrddir}/dbmail-*
 %{_sysconfdir}/cron.daily/dbmail
 %config(noreplace) %{_sysconfdir}/logrotate.d/dbmail
-%config(noreplace) %{_sysconfdir}/ld.so.conf.d/dbmail-*.conf
 %if ! 0%{?without_sqlite}
 %doc sql/sqlite/*
 %{_libdir}/dbmail/libsqlite*
@@ -219,8 +231,12 @@
 %{_libdir}/dbmail/libpgsql*
 
 %changelog
+* Sat Jun 23 2007 Bernard Johnson <bjohnson at symetrix.com> 2.2.5-4
+- kill ld.so config
+- filter private libraries from provides (bz#245326)
+
 * Wed Jun 20 2007 Bernard Johnson <bjohnson at symetrix.com> 2.2.5-3
-- assign uid from package user registry
+- assign uid from package user registry (bz#244611)
 
 * Tue Jun 05 2007 Bernard Johnson <bjohnson at symetrix.com> 2.2.5-2
 - fix %%setup directory