packaging

diff --git a/packaging/dhcp.changes b/packaging/dhcp.changes
index 4dd71c9..a111c70 100644 (file)
--- a/packaging/dhcp.changes
+++ b/packaging/dhcp.changes
@@ -1,2 +1,5 @@
+* Sat May 19 06:30:16 UTC 2012 - tracy.graydon@intel.com
+- Package fixing 
+
 * Tue Apr 10 Arron <arron.wang@intel.com> - 4.2.3-P2
 - Init package for Tizen fixed TZIVI-24 GENIVI 2.0 Compliance required the dhcp package 

diff --git a/packaging/dhcp.spec b/packaging/dhcp.spec
index 22cc846..c8a9044 100644 (file)
--- a/packaging/dhcp.spec
+++ b/packaging/dhcp.spec
@@ -5,26 +5,22 @@
 %global dhcpconfdir %{_sysconfdir}/dhcp
 
 # Patch version 
-%global patchver P2
+#%global patchver P2
 # Pre-Release version
 #%%global prever rc1
 
 #%%global VERSION %{version}%{prever}
 #%%global VERSION %{version}
-%global VERSION %{version}-%{patchver}
+3%global VERSION %{version}-%{patchver}
 
 Summary:  Dynamic host configuration protocol software
 Name:     dhcp
 Version:  4.2.3
-Release:  1.%{patchver}%{?dist}
+Release:  1
 License:  ISC
 Group:    System Environment/Daemons
 URL:      http://isc.org/products/DHCP/
-<<<<<<< ./dhcp.spec.mine
-Source0:  5{name}-%{version}.tar.bz2
-=======
-Source0:  ftp://ftp.isc.org/isc/dhcp/dhcp-%{VERSION}.tar.gz
->>>>>>> ./dhcp.spec.r896af1e9f7371f86f1a9c5fb3c316e38
+Source0:  %{name}-%{version}.tar.gz
 Source1:  dhclient-script
 Source2:  README.dhclient.d
 Source3:  11-dhclient
@@ -156,7 +152,7 @@ Header files and API documentation for using the ISC DHCP libraries.  The
 libdhcpctl and libomapi static libraries are also included in this package.
 
 %prep
-%setup -q -n dhcp-%{VERSION}
+%setup -q 
 
 # Remove bundled BIND source
 #rm bind/bind.tar.gz