packages: openldap/openldap.spec - cleanup unpackaged files

[qboosh]

Author: qboosh                       Date: Wed Sep  8 07:06:49 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- cleanup unpackaged files

---- Files affected:
packages/openldap:
   openldap.spec (1.340 -> 1.341) 

---- Diffs:

================================================================
Index: packages/openldap/openldap.spec
diff -u packages/openldap/openldap.spec:1.340 packages/openldap/openldap.spec:1.341
--- packages/openldap/openldap.spec:1.340	Mon Jul 12 12:30:02 2010
+++ packages/openldap/openldap.spec	Wed Sep  8 09:06:43 2010
@@ -5,12 +5,6 @@
 # - trigger for removed ldbm backend
 # - trigger for removed overlays (denyop,lastmod)
 # - ldap.conf.5 describes /etc/openldap/ldap.conf not /etc/ldap.conf, rename to ldaprc.5 ?
-# - unpackaged:
-#   /usr/lib64/evolution-openldap/lib/liblber.la
-#   /usr/lib64/evolution-openldap/lib/libldap.la
-#   /usr/lib64/evolution-openldap/lib/libldap_r.la
-#   /usr/lib64/openldap/nssov.a
-#   /usr/share/man/man5/slapd-ndb.5.gz
 #
 # Conditional build:
 %bcond_without	exchange	# hacked version of library for Evolution Exchange support
@@ -1175,7 +1169,8 @@
 # Install evolution hack first and remove everything but devel stuff
 %{__make} -C evo-%{name}-%{version} install \
 	DESTDIR=$RPM_BUILD_ROOT
-rm -rf $RPM_BUILD_ROOT{%{_sysconfdir}/openldap,%{_bindir},%{_mandir}}/*
+%{__rm} -r $RPM_BUILD_ROOT{%{_sysconfdir}/openldap,%{_bindir},%{_mandir}}/*
+%{__rm} $RPM_BUILD_ROOT%{evolution_exchange_libdir}/*.la
 install %{SOURCE100} $RPM_BUILD_ROOT%{evolution_exchange_prefix}/README.evolution
 %endif
 
@@ -1196,8 +1191,6 @@
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-rm -f $RPM_BUILD_ROOT%{_libdir}/openldap/*.a
-
 %{__make} -C contrib/slapd-modules/nssov install \
 	moduledir=%{_libdir}/openldap \
 	schemadir=%{schemadir} \
@@ -1205,6 +1198,9 @@
 
 install contrib/slapd-modules/nssov/slapo-nssov.5 $RPM_BUILD_ROOT%{_mandir}/man5
 
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/openldap/*.a
+%{!?with_ndb:%{__rm} $RPM_BUILD_ROOT%{_mandir}/man5/slapd-ndb.5}
+
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/ldap
 install %{SOURCE3} $RPM_BUILD_ROOT/etc/sysconfig/ldap
 
@@ -1215,7 +1211,7 @@
 
 echo "localhost" > $RPM_BUILD_ROOT%{_sysconfdir}/openldap/ldapserver
 
-rm -f $RPM_BUILD_ROOT%{_sysconfdir}/openldap/{*.{default,example},schema/README}
+%{__rm} $RPM_BUILD_ROOT%{_sysconfdir}/openldap/{*.{default,example},schema/README}
 
 # Standard schemas should not be changed by users
 mv -f $RPM_BUILD_ROOT%{_sysconfdir}/openldap/schema/* $RPM_BUILD_ROOT%{_datadir}/openldap/schema
@@ -1861,6 +1857,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.341  2010/09/08 07:06:43  qboosh
+- cleanup unpackaged files
+
 Revision 1.340  2010/07/12 10:30:02  glen
 - up to 2.4.23
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/openldap/openldap.spec?r1=1.340&r2=1.341&f=u