diff options
| author | Adam Tkac <atkac@fedoraproject.org> | 2007-02-05 12:40:39 +0000 |
|---|---|---|
| committer | Adam Tkac <atkac@fedoraproject.org> | 2007-02-05 12:40:39 +0000 |
| commit | 4b00b73ed69ee7951e67683d2986d135eda26810 (patch) | |
| tree | ac70a545d0e4f3bcb5cbad97f0179dac118eb551 | |
| parent | f0fdb4c9ed031b612fe7cb4fd5b6bc86e6e5fd3a (diff) | |
fixed conflict between bind-sdb & ldap
| -rw-r--r-- | bind.spec | 10 |
1 files changed, 7 insertions, 3 deletions
@@ -17,7 +17,7 @@ Summary: The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) serv Name: bind License: BSD-like Version: 9.3.4 -Release: 3%{?dist} +Release: 4%{?dist} Epoch: 31 Url: http://www.isc.org/products/BIND/ Buildroot: %{_tmppath}/%{name}-root @@ -434,7 +434,7 @@ for f in my.internal.zone.db slaves/my.slave.internal.zone.db slaves/my.ddns.int echo '@ in soa localhost. root 1 3H 15M 1W 1D ns localhost.' > sample/var/named/$f; done -/usr/bin/tail -n '+'`/bin/egrep -n '\\$Id: bind.spec,v 1.159 2007/02/01 16:09:51 atkac Exp $/+1/' | bc` bin/rndc/rndc.conf | sed '/Sample rndc configuration file./{p;i\ +/usr/bin/tail -n '+'`/bin/egrep -n '\\$Id: bind.spec,v 1.160 2007/02/05 12:40:39 atkac Exp $/+1/' | bc` bin/rndc/rndc.conf | sed '/Sample rndc configuration file./{p;i\ *\ * NOTE: you only need to create this file if it is to\ * differ from the following default contents: @@ -601,7 +601,7 @@ chmod 0755 ${RPM_BUILD_ROOT}%{_libdir}/lib*so.* %{_sbindir}/ldap2zone %{_sbindir}/zonetodb %defattr(0644,root,root,0755) -%config /etc/openldap/schema/dnszone.schema +%config(noreplace) /etc/openldap/schema/dnszone.schema %defattr(0644,root,named,0755) %{_mandir}/man1/zone2ldap.1* %doc contrib/sdb/ldap/README.ldap contrib/sdb/ldap/INSTALL.ldap contrib/sdb/pgsql/README.sdb_pgsql @@ -744,6 +744,10 @@ rm -rf ${RPM_BUILD_ROOT} :; %changelog +* Mon Feb 05 2007 Adam Tkac <atkac@redhat.com> 31:9.3.4-4.fc7 +- fixed conflict between bind-sdb and ldap +- removed duplicated bind directory in bind-libs + * Thu Feb 01 2007 Adam Tkac <atkac@redhat.com> 31:9.3.4-3.fc7 - fixed building without libbind - fixed post section (selinux commands is now in if-endif statement) |