From 2e49015bdf30a37e651e86a3be35b62bae4744c7 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Nov 19 2015 15:43:05 +0000 Subject: debrand dhcp-4.2.5-42.el7 --- diff --git a/SOURCES/dhcp-4.2.5-centos-branding.patch b/SOURCES/dhcp-4.2.5-centos-branding.patch new file mode 100644 index 0000000..f3e7113 --- /dev/null +++ b/SOURCES/dhcp-4.2.5-centos-branding.patch @@ -0,0 +1,14 @@ +diff -uNrp dhcp-4.1.1-P1.orig/omapip/errwarn.c dhcp-4.1.1-P1/omapip/errwarn.c +--- dhcp-4.1.1-P1.orig/omapip/errwarn.c 2012-08-15 14:04:33.149141000 +0000 ++++ dhcp-4.1.1-P1/omapip/errwarn.c 2012-08-15 14:13:05.582416057 +0000 +@@ -81,8 +81,8 @@ void log_fatal (const char * fmt, ... ) + log_error ("have been made to the base software release in order to make"); + log_error ("it work better with this distribution."); + log_error ("%s", ""); +- log_error ("Please report for this software via the Red Hat Bugzilla site:"); +- log_error (" http://bugzilla.redhat.com"); ++ log_error ("Please report for this software via the CentOS Bugs Database:"); ++ log_error (" http://bugs.centos.org/"); + log_error ("%s", ""); + log_error ("exiting."); + #endif diff --git a/SPECS/dhcp.spec b/SPECS/dhcp.spec index 78ac4bb..6fff925 100644 --- a/SPECS/dhcp.spec +++ b/SPECS/dhcp.spec @@ -90,6 +90,7 @@ Patch56: dhcp-vlanfilter.patch Patch57: dhcp-option97-pxe-client-id.patch Patch58: dhcp-client-request-release-bind-iface.patch Patch59: dhcp-dns_client_cancelupdate.patch +Patch60: dhcp-4.2.5-centos-branding.patch BuildRequires: autoconf BuildRequires: automake @@ -387,6 +388,7 @@ rm -rf includes/isc-dhcp # dhclient crashes in dns_client_cancelupdate (#1187856) %patch59 -p1 -b .dns_client_cancelupdate +%patch60 -p1 # Update paths in all man pages for page in client/dhclient.conf.5 client/dhclient.leases.5 \ @@ -654,6 +656,9 @@ done %changelog +* Thu Nov 19 2015 CentOS Sources - 4.2.5-42.el7.centos +- Roll in CentOS Branding + * Tue Oct 13 2015 Jiri Popelka - 12:4.2.5-42 - regenerate dhcp-vlanfilter.patch (#1175350)