summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdam Tkac <atkac@fedoraproject.org>2007-12-27 15:13:52 +0000
committerAdam Tkac <atkac@fedoraproject.org>2007-12-27 15:13:52 +0000
commitcef6d70d992802bb68e3d720553bd21ed9a7778f (patch)
tree347672d68224dac3fba8f283f91e6d56349ffe19
parent85e5be7453c07f29f96867ac66e23765700f1ded (diff)
- removed dependency on policycoreutils and libselinux (#426515)
-rw-r--r--bind.spec13
1 files changed, 2 insertions, 11 deletions
diff --git a/bind.spec b/bind.spec
index b2e9e31..d703dbb 100644
--- a/bind.spec
+++ b/bind.spec
@@ -11,7 +11,6 @@
%{?!WITH_DBUS: %define WITH_DBUS 0} # + dynamic forwarder table management with D-BUS
%{?!bind_uid: %define bind_uid 25}
%{?!bind_gid: %define bind_gid 25}
-%{?!selinux: %define selinux 1}
%{?!DLZ: %define DLZ 1}
%{?!GSSTSIG: %define GSSTSIG 1}
%define bind_dir /var/named
@@ -91,9 +90,6 @@ Requires(pre): shadow-utils
Requires(preun):chkconfig >= 1.3.26
Obsoletes: bind-config, caching-nameserver
Provides: bind-config, caching-nameserver
-%if %{selinux}
-Requires(post): policycoreutils
-%endif
BuildRequires: gcc, glibc-devel >= 2.2.5-26, glibc-kernheaders >= 2.4-7.10, openssl-devel, libtool, autoconf, pkgconfig
%if %{SDB}
BuildRequires: openldap-devel, postgresql-devel, sqlite-devel
@@ -181,12 +177,6 @@ Prefix: %{chroot_prefix}
Requires: bind = %{epoch}:%{version}-%{release}
Requires(post): grep
Requires(preun): grep
-%if %{selinux}
-Requires(post): policycoreutils, libselinux
-Requires(preun): libselinux
-Conflicts: selinux-policy-strict < 2.2.0
-Conflicts: selinux-policy-targeted < 2.2.0
-%endif
%description chroot
This package contains a tree of files which can be used as a
@@ -416,7 +406,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.241 2007/12/27 14:47:47 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.242 2007/12/27 15:13:52 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:
@@ -662,6 +652,7 @@ rm -rf ${RPM_BUILD_ROOT}
%changelog
* Thu Dec 27 2007 Adam Tkac <atkac redhat com> 32:9.5.0-23.b1
- fixed initscript wait loop (#426382)
+- removed dependency on policycoreutils and libselinux (#426515)
* Thu Dec 20 2007 Adam Tkac <atkac redhat com> 32:9.5.0-22.b1
- fixed regression caused by libidn2 patch (#426348)