SPECS: pure-ftpd.spec - defattr for openldap-schema-pure-ftpd subp...

[shadzik]

Author: shadzik                      Date: Sat Feb 17 00:35:38 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- defattr for openldap-schema-pure-ftpd subpackage
- no need to install the file when --with ldap bcond is active (the file is always present)

---- Files affected:
SPECS:
   pure-ftpd.spec (1.155 -> 1.156) 

---- Diffs:

================================================================
Index: SPECS/pure-ftpd.spec
diff -u SPECS/pure-ftpd.spec:1.155 SPECS/pure-ftpd.spec:1.156
--- SPECS/pure-ftpd.spec:1.155	Sat Feb 17 01:28:12 2007
+++ SPECS/pure-ftpd.spec	Sat Feb 17 01:35:33 2007
@@ -159,11 +159,11 @@
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}
 
 %{?with_ldap:install pureftpd-ldap.conf $RPM_BUILD_ROOT%{_sysconfdir}/pureftpd-ldap.conf}
-%{?with_ldap:install pureftpd.schema $RPM_BUILD_ROOT%{_datadir}/openldap/schema/pureftpd.schema}
 %{?with_mysql:install pureftpd-mysql.conf $RPM_BUILD_ROOT%{_sysconfdir}/pureftpd-mysql.conf}
 %{?with_pgsql:install pureftpd-pgsql.conf $RPM_BUILD_ROOT%{_sysconfdir}/pureftpd-pgsql.conf}
 install configuration-file/pure-ftpd.conf $RPM_BUILD_ROOT%{_sysconfdir}/pureftpd.conf
 %{!?with_extra:install configuration-file/pure-config.pl $RPM_BUILD_ROOT%{_sbindir}}
+install pureftpd.schema $RPM_BUILD_ROOT%{_datadir}/openldap/schema/pureftpd.schema
 touch $RPM_BUILD_ROOT/etc/security/blacklist.ftp
 
 ln -s vhosts $RPM_BUILD_ROOT%{_sysconfdir}/pure-ftpd
@@ -212,7 +212,7 @@
 %lang(ru) %{_mandir}/ru/man5/ftpusers*
 
 %files -n openldap-schema-pure-ftpd
-%{_datadir}/openldap/schema/pureftpd.schema
+%defattr(644,root,root,755) %{_datadir}/openldap/schema/pureftpd.schema
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -220,6 +220,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.156  2007/02/17 00:35:33  shadzik
+- defattr for openldap-schema-pure-ftpd subpackage
+- no need to install the file when --with ldap bcond is active (the file is always present)
+
 Revision 1.155  2007/02/17 00:28:12  shadzik
 - add openldap-schema-pure-ftpd subpackage containing Pure-FTPd LDAP schema
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/pure-ftpd.spec?r1=1.155&r2=1.156&f=u