- cleanup unpackaged files

Changed files:
    openldap.spec -> 1.341

diff --git a/openldap.spec b/openldap.spec
index 4667afc61f5d720212475e2e43f38f3f80a15978..cf7e5d7ab3c875eac08f39d7460257067b58b937 100644 (file)
--- a/openldap.spec
+++ b/openldap.spec
@@ -4,12 +4,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
@@ -1174,7 +1168,8 @@ install -d $RPM_BUILD_ROOT{/etc/{sysconfig,rc.d/init.d},/var/lib/openldap-data}
 # 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
 
@@ -1195,8 +1190,6 @@ cd %{name}-%{version}
 %{__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} \
@@ -1204,6 +1197,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/openldap/*.a
 
 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
 
@@ -1214,7 +1210,7 @@ install %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/ldap.conf
 
 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