devel/dhcp dhcp.spec,1.164,1.165

[Florian La Roche (laroche)]

Author: laroche

Update of /cvs/extras/devel/dhcp
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29253

Modified Files:
	dhcp.spec 
Log Message:
- vendor -> vvendor



Index: dhcp.spec
===================================================================
RCS file: /cvs/extras/devel/dhcp/dhcp.spec,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -r1.164 -r1.165
--- dhcp.spec	10 Jul 2007 18:59:53 -0000	1.164
+++ dhcp.spec	18 Jul 2007 09:41:26 -0000	1.165
@@ -8,12 +8,12 @@
 %define workdir work.linux-2.2
 
 # The vendor name to append to the version number
-%define vendor Fedora
+%define vvendor Fedora
 
 Summary:  DHCP (Dynamic Host Configuration Protocol) server and relay agent
 Name:     dhcp
 Version:  3.0.6
-Release:  1%{?dist}
+Release:  2%{?dist}
 Epoch:    12
 License:  ISC
 Group:    System Environment/Daemons
@@ -143,7 +143,7 @@
 %setup -q
 
 # Add vendor to the version number
-%{__sed} -e 's|V%{version}|V%{version}-%{vendor}|g' includes/version.h > includes/version.h.new
+%{__sed} -e 's|V%{version}|V%{version}-%{vvendor}|g' includes/version.h > includes/version.h.new
 %{__mv} includes/version.h.new includes/version.h
 
 # Use $(MAKE) and $(CC) in the Makefiles
@@ -433,6 +433,10 @@
 %{_libdir}/libdhcp4client.a
 
 %changelog
+* Wed Jul 18 2007 Florian La Roche <laroche at redhat.com> - 12:3.0.6-2
+- use a new macro name vendor -> vvendor to not overwrite the
+  RPMTAG_VENDOR setting
+
 * Tue Jul 10 2007 David Cantrell <dcantrell at redhat.com> - 12:3.0.6-1
 - Upgrade to ISC dhcp-3.0.6
 - Remove the -TERM option from killproc command (#245317)