rpms/bind
7
0
Fork 1
Code Issues Pull Requests Releases Activity

fix bug 179816: allow dbus builds to work with dbus version < 0.6;

Browse Source 
regenerate redhat_doc patch for non-DBUS builds
This commit is contained in:
jvdias 2006-02-07 22:13:28 +00:00
parent 667fce216d
commit 60e12f617f
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
bind.spec
View File

@ -9,7 +9,7 @@ Summary: The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) serve
Name: bind Name: bind
License: BSD-like License: BSD-like
Version: 9.3.2 Version: 9.3.2
Release: 3 Release: 4
Epoch: 30 Epoch: 30
Url: http://www.isc.org/products/BIND/ Url: http://www.isc.org/products/BIND/
Buildroot: %{_tmppath}/%{name}-root Buildroot: %{_tmppath}/%{name}-root
@ -49,7 +49,7 @@ Patch12: bind-9.3.1rc1-sdb.patch
Patch13: bind-9.3.1rc1-fix_libbind_includedir.patch Patch13: bind-9.3.1rc1-fix_libbind_includedir.patch
Patch14: libbind-9.3.1rc1-fix_h_errno.patch Patch14: libbind-9.3.1rc1-fix_h_errno.patch
Patch15: bind-9.3.2b2-dbus.patch Patch15: bind-9.3.2b2-dbus.patch
Patch16: bind-9.3.1-redhat_doc.patch Patch16: bind-9.3.2-redhat_doc.patch
Patch17: bind-9.3.2b1-fix_sdb_ldap.patch Patch17: bind-9.3.2b1-fix_sdb_ldap.patch
Patch18: bind-9.3.1-reject_resolv_conf_errors.patch Patch18: bind-9.3.1-reject_resolv_conf_errors.patch
Patch19: bind-9.3.1-next_server_on_referral.patch Patch19: bind-9.3.1-next_server_on_referral.patch
@ -227,8 +227,7 @@ cp -fp contrib/sdb/pgsql/zonetodb.c bin/sdb_tools
%endif %endif
%patch23 -p1 -b .dbus_archdep_libdir %patch23 -p1 -b .dbus_archdep_libdir
%else %else
# This does not apply anymore: %patch16 -p1 -b .redhat_doc
#patch16 -p1 -b .redhat_doc
%endif %endif
%if %{SDB} %if %{SDB}
%patch17 -p1 -b .fix_sdb_ldap %patch17 -p1 -b .fix_sdb_ldap
@ -245,11 +244,10 @@ cp -fp contrib/sdb/pgsql/zonetodb.c bin/sdb_tools
%patch26 -p1 -b .flush_cache %patch26 -p1 -b .flush_cache
%patch27 -p1 -b .dbus_restart %patch27 -p1 -b .dbus_restart
%patch28 -p1 -b .dbus-0.6 %patch28 -p1 -b .dbus-0.6
%endif # this patch no longer required (kernel now fixed):
%patch29 -p1 -b .bz177854 # %patch29 -p1 -b .bz177854
# #
# this must follow all dbus patches: # this must follow all dbus patches:
%if %{WITH_DBUS}
%if %{SDB} %if %{SDB}
cp -fp bin/named/{dbus_mgr.c,dbus_service.c,log.c,server.c} bin/named_sdb cp -fp bin/named/{dbus_mgr.c,dbus_service.c,log.c,server.c} bin/named_sdb
cp -fp bin/named/include/named/{dbus_mgr.h,dbus_service.h,globals.h,server.h,log.h,types.h} bin/named_sdb/include/named cp -fp bin/named/include/named/{dbus_mgr.h,dbus_service.h,globals.h,server.h,log.h,types.h} bin/named_sdb/include/named
@ -755,6 +753,10 @@ fi;
:; :;
%changelog %changelog
* Tue Feb 07 2006 Jason Vas Dias <jvdias@redhat.com> - 30:9.3.2-4
- regenerate redhat_doc patch for non-DBUS builds
- allow dbus builds to work with dbus version < 0.6 (bz #179816)
* Tue Feb 07 2006 Florian La Roche <laroche@redhat.com> 30:9.3.2-3 * Tue Feb 07 2006 Florian La Roche <laroche@redhat.com> 30:9.3.2-3
- try supporting without dbus support - try supporting without dbus support