cleanup specHEAD2.0_alphamaster2.0alpha1.0_post

Change-Id: Ia8ac4cf793f617120b68e87585a90edda88625b6

2 files changed, 104 insertions, 145 deletions

diff --git a/packaging/net-tools.changes b/packaging/net-tools.changes
index 7127fea..930b822 100644
--- a/packaging/net-tools.changes
+++ b/packaging/net-tools.changes
@@ -1,48 +1,9 @@
-* Fri Jun 1 2012 vivian zhang <vivian.zhang@intel.com> - 1.60
-- Initial import for Tizen
+* Tue Jul 03 2012 Anas Nashif <anas.nashif@intel.com> d47a674
+- cleanup spec
 
-* Fri May 27 2011 Anas Nashif <anas.nashif@intel.com> - 1.60
-- Refined auto-documentation
+* Sun Jun 03 2012 vivian, zhang <vivian.zhang@intel.com> 972840a
+- Initial import package net-tools: Basic networking tools
 
-* Tue May 24 2011 Anas Nashif <anas.nashif@intel.com> - 1.60
-- Remove dependency on chkconfig
-- Repackage documentation/translations
-
-* Sat Apr 10 2010 Anas Nashif <anas.nashif@intel.com> - 1.60
-- Fixed rpmlint errors
-
-* Thu Jul 16 2009 Anas Nashif <anas.nashif@intel.com> - 1.60
-- Make it build with new kernel headers
-
-* Fri Jan 09 2009 Anas Nashif <anas.nashif@intel.com> 1.60
-- Fixed tunnel headers 
-
-* Mon Dec 08 2008 Iñaky Pérez-González <inaky.perez-gonzalez@intel.com> 1.60
-- fold doc/man pages back into main and -extra packages
-- move localized material to -extra
-- fix locale path specification so that the RPM doesn't include the
-  directories, just the files.
-
-* Fri Dec 05 2008 Anas Nashif <anas.nashif@intel.com> 1.60
-- Kernel headers change, patch for iptunnel not needed
-
-* Thu Dec 04 2008 Iñaky Pérez-González <inaky.perez-gonzalez@intel.com> 1.60
-- net-tools: clean up spec, split up into -extras and -doc
- * Move all documentation and xlations to -doc
- * Move unneeded binaries and netplugd service to -extras. 
-	
-* Fri Nov 28 2008 Anas Nashif <anas.nashif@intel.com> 1.60
-- fixed compile error with new kernel headers
-
-* Fri Nov 28 2008 Anas Nashif <anas.nashif@intel.com> 1.60
-- Fixes from Fedora:
- * fixed tcp timers info in netstat (#466845)
- * fixed ifconfig's man page (#454271, #432328)
- * fixed man pages for arp (#446195)
- * fixed netstat --interfaces option (#446187)
- * fixed clearing flags in ifconfig (#450252)
- * netstat displays correct sctp statistics (#445535) <zprikryl@redhat.com>
-
-* Wed Jul 23 2008 Martin Xu <martin.xu@intel.com>
-- add %doc to man file
+* Thu May 31 2012 Hyesook Choi <hs20.choi@samsung.com> e31e735
+- Initial empty repository
 
diff --git a/packaging/net-tools.spec b/packaging/net-tools.spec
index e3fb0fa..6707238 100644
--- a/packaging/net-tools.spec
+++ b/packaging/net-tools.spec
@@ -1,99 +1,98 @@
-#specfile originally created for Fedora, modified for Moblin Linux
 %define npversion	1.2.9
 
-Summary: Basic networking tools
-Name: net-tools
-Version: 1.60
-Release: 87
-License: GPL+
-Group: System/Base
-URL: http://www.tazenda.demon.co.uk/phil/net-tools/
-Source0: http://www.tazenda.demon.co.uk/phil/net-tools/net-tools-%{version}.tar.bz2
-Source1: http://www.red-bean.com/~bos/netplug/netplug-%{npversion}.tar.bz2
-Source2: net-tools-%{version}-config.h
-Source3: net-tools-%{version}-config.make
-Source4: ether-wake.c
-Source5: ether-wake.8
-Source6: mii-diag.c
-Source7: mii-diag.8
-Patch1: net-tools-1.57-bug22040.patch
-Patch2: net-tools-1.60-miiioctl.patch
-Patch3: net-tools-1.60-manydevs.patch
-Patch4: net-tools-1.60-virtualname.patch
-Patch5: net-tools-1.60-cycle.patch
-Patch6: net-tools-1.60-nameif.patch
-Patch7: net-tools-1.60-ipx.patch
-Patch8: net-tools-1.60-inet6-lookup.patch
-Patch9: net-tools-1.60-man.patch
-Patch10: net-tools-1.60-gcc33.patch
-Patch11: net-tools-1.60-trailingblank.patch
-Patch12: net-tools-1.60-interface.patch
-Patch14: net-tools-1.60-gcc34.patch
-Patch15: net-tools-1.60-overflow.patch
-Patch19: net-tools-1.60-siunits.patch
-Patch20: net-tools-1.60-trunc.patch
-Patch21: net-tools-1.60-return.patch
-Patch22: net-tools-1.60-parse.patch
-Patch23: net-tools-1.60-netmask.patch
-Patch24: net-tools-1.60-ulong.patch
-Patch25: net-tools-1.60-bcast.patch
-Patch26: net-tools-1.60-mii-tool-obsolete.patch
-Patch27: net-tools-1.60-netstat_ulong.patch
-Patch28: net-tools-1.60-note.patch
-Patch29: net-tools-1.60-num-ports.patch
-Patch30: net-tools-1.60-duplicate-tcp.patch
-Patch31: net-tools-1.60-statalias.patch
-Patch32: net-tools-1.60-isofix.patch
-Patch33: net-tools-1.60-bitkeeper.patch
-Patch34: net-tools-1.60-ifconfig_ib.patch
-Patch35: net-tools-1.60-de.patch
-Patch36: netplug-1.2.9-execshield.patch
-Patch37: net-tools-1.60-pie.patch
-Patch38: net-tools-1.60-ifaceopt.patch
-Patch39: net-tools-1.60-trim_iface.patch
-Patch40: net-tools-1.60-stdo.patch
-Patch41: net-tools-1.60-statistics.patch
-Patch42: net-tools-1.60-ifconfig.patch
-Patch43: net-tools-1.60-arp_overflow.patch
-Patch44: net-tools-1.60-hostname_man.patch
-Patch45: net-tools-1.60-interface_stack.patch
-Patch46: net-tools-1.60-selinux.patch
-Patch47: net-tools-1.60-netstat_stop_trim.patch
-Patch48: net-tools-1.60-netstat_inode.patch
-Patch49: net-tools-1.60-fgets.patch
-Patch50: net-tools-1.60-ifconfig_man.patch
-Patch51: net-tools-1.60-x25-proc.patch
-Patch52: net-tools-1.60-sctp.patch
-Patch53: net-tools-1.60-arp_man.patch
-Patch54: net-tools-1.60-ifconfig-long-iface-crasher.patch
-Patch55: net-tools-1.60-netdevice.patch
-Patch56: net-tools-1.60-skip.patch
-Patch57: net-tools-1.60-netstat-I-fix.patch
-Patch58: net-tools-1.60-nameif_strncpy.patch
-Patch59: net-tools-1.60-arp-unaligned-access.patch
-Patch60: net-tools-1.60-sctp-quiet.patch
-Patch61: net-tools-1.60-remove_node.patch
-Patch62: net-tools-1.60-netstat-interfaces-crash.patch
-Patch63: net-tools-1.60-netplugd_init.patch
-Patch64: net-tools-1.60-ec_hw_null.patch
-Patch65: net-tools-1.60-statistics_buffer.patch
-Patch66: net-tools-1.60-sctp-addrs.patch
-Patch67: net-tools-1.60-i-option.patch
-Patch68: net-tools-1.60-a-option.patch
-Patch69: net-tools-1.60-clear-flag.patch
-Patch70: net-tools-1.60-metric-tunnel-man.patch
-Patch71: net-tools-1.60-netstat-probe.patch
-Patch72: net-tools-1.60-ip.patch
-
-BuildRequires: gettext-tools
+Name:           net-tools
+Version:        1.60
+Release:        87
+License:        GPL+
+Summary:        Basic networking tools
+Url:            http://www.tazenda.demon.co.uk/phil/net-tools/
+Group:          System/Base
+Source0:        http://www.tazenda.demon.co.uk/phil/net-tools/net-tools-%{version}.tar.bz2
+Source1:        http://www.red-bean.com/~bos/netplug/netplug-%{npversion}.tar.bz2
+Source2:        net-tools-%{version}-config.h
+Source3:        net-tools-%{version}-config.make
+Source4:        ether-wake.c
+Source5:        ether-wake.8
+Source6:        mii-diag.c
+Source7:        mii-diag.8
+Patch1:         net-tools-1.57-bug22040.patch
+Patch2:         net-tools-1.60-miiioctl.patch
+Patch3:         net-tools-1.60-manydevs.patch
+Patch4:         net-tools-1.60-virtualname.patch
+Patch5:         net-tools-1.60-cycle.patch
+Patch6:         net-tools-1.60-nameif.patch
+Patch7:         net-tools-1.60-ipx.patch
+Patch8:         net-tools-1.60-inet6-lookup.patch
+Patch9:         net-tools-1.60-man.patch
+Patch10:        net-tools-1.60-gcc33.patch
+Patch11:        net-tools-1.60-trailingblank.patch
+Patch12:        net-tools-1.60-interface.patch
+Patch14:        net-tools-1.60-gcc34.patch
+Patch15:        net-tools-1.60-overflow.patch
+Patch19:        net-tools-1.60-siunits.patch
+Patch20:        net-tools-1.60-trunc.patch
+Patch21:        net-tools-1.60-return.patch
+Patch22:        net-tools-1.60-parse.patch
+Patch23:        net-tools-1.60-netmask.patch
+Patch24:        net-tools-1.60-ulong.patch
+Patch25:        net-tools-1.60-bcast.patch
+Patch26:        net-tools-1.60-mii-tool-obsolete.patch
+Patch27:        net-tools-1.60-netstat_ulong.patch
+Patch28:        net-tools-1.60-note.patch
+Patch29:        net-tools-1.60-num-ports.patch
+Patch30:        net-tools-1.60-duplicate-tcp.patch
+Patch31:        net-tools-1.60-statalias.patch
+Patch32:        net-tools-1.60-isofix.patch
+Patch33:        net-tools-1.60-bitkeeper.patch
+Patch34:        net-tools-1.60-ifconfig_ib.patch
+Patch35:        net-tools-1.60-de.patch
+Patch36:        netplug-1.2.9-execshield.patch
+Patch37:        net-tools-1.60-pie.patch
+Patch38:        net-tools-1.60-ifaceopt.patch
+Patch39:        net-tools-1.60-trim_iface.patch
+Patch40:        net-tools-1.60-stdo.patch
+Patch41:        net-tools-1.60-statistics.patch
+Patch42:        net-tools-1.60-ifconfig.patch
+Patch43:        net-tools-1.60-arp_overflow.patch
+Patch44:        net-tools-1.60-hostname_man.patch
+Patch45:        net-tools-1.60-interface_stack.patch
+Patch46:        net-tools-1.60-selinux.patch
+Patch47:        net-tools-1.60-netstat_stop_trim.patch
+Patch48:        net-tools-1.60-netstat_inode.patch
+Patch49:        net-tools-1.60-fgets.patch
+Patch50:        net-tools-1.60-ifconfig_man.patch
+Patch51:        net-tools-1.60-x25-proc.patch
+Patch52:        net-tools-1.60-sctp.patch
+Patch53:        net-tools-1.60-arp_man.patch
+Patch54:        net-tools-1.60-ifconfig-long-iface-crasher.patch
+Patch55:        net-tools-1.60-netdevice.patch
+Patch56:        net-tools-1.60-skip.patch
+Patch57:        net-tools-1.60-netstat-I-fix.patch
+Patch58:        net-tools-1.60-nameif_strncpy.patch
+Patch59:        net-tools-1.60-arp-unaligned-access.patch
+Patch60:        net-tools-1.60-sctp-quiet.patch
+Patch61:        net-tools-1.60-remove_node.patch
+Patch62:        net-tools-1.60-netstat-interfaces-crash.patch
+Patch63:        net-tools-1.60-netplugd_init.patch
+Patch64:        net-tools-1.60-ec_hw_null.patch
+Patch65:        net-tools-1.60-statistics_buffer.patch
+Patch66:        net-tools-1.60-sctp-addrs.patch
+Patch67:        net-tools-1.60-i-option.patch
+Patch68:        net-tools-1.60-a-option.patch
+Patch69:        net-tools-1.60-clear-flag.patch
+Patch70:        net-tools-1.60-metric-tunnel-man.patch
+Patch71:        net-tools-1.60-netstat-probe.patch
+Patch72:        net-tools-1.60-ip.patch
+
+BuildRequires:  gettext-tools
 
 %description
 The net-tools package contains basic networking tools, including
 ifconfig, netstat, route, and others.
 
 %package extra
-Summary: Extra goodies from net-tools package
-Group: System/Base
+Summary:        Extra goodies from net-tools package
+Group:          System/Base
 
 %description extra
 net-tools extra goodies, including not-so commonly needed tools
@@ -133,7 +132,7 @@ localized support.
 %patch32 -p1 -b .isofix
 %patch33 -p1 -b .bitkeeper
 %patch34 -p1 -b .ifconfig_ib
-%patch35 -p1 
+%patch35 -p1
 %patch36 -p1 -b .execshield
 %patch37 -p1 -b .pie
 %patch38 -p1 -b .ifaceopt
@@ -175,24 +174,24 @@ localized support.
 %patch72 -p1 -b .iptunnel
 
 
-cp %SOURCE2 ./config.h
-cp %SOURCE3 ./config.make
-cp %SOURCE4 .
-cp %SOURCE5 ./man/en_US
-cp %SOURCE6 .
-cp %SOURCE7 ./man/en_US
+cp %{SOURCE2} ./config.h
+cp %{SOURCE3} ./config.make
+cp %{SOURCE4} .
+cp %{SOURCE5} ./man/en_US
+cp %{SOURCE6} .
+cp %{SOURCE7} ./man/en_US
 
 
 
 %build
-sed -i "s/HAVE_SELINUX=1/HAVE_SELINUX=0/g" ./config.make 
+sed -i "s/HAVE_SELINUX=1/HAVE_SELINUX=0/g" ./config.make
 make
-gcc $RPM_OPT_FLAGS -o ether-wake ether-wake.c
-gcc $RPM_OPT_FLAGS -o mii-diag mii-diag.c
+gcc %{optflags} -o ether-wake ether-wake.c
+gcc %{optflags} -o mii-diag mii-diag.c
 
 %install
 
-make BASEDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install
+make BASEDIR=%{buildroot} mandir=%{_mandir} install
 
 install -m 755 ether-wake %{buildroot}/sbin
 install -m 755 mii-diag %{buildroot}/sbin
@@ -209,7 +208,6 @@ rm -rf %{buildroot}%{_mandir}/*/man*
 %lang_package
 
 %files
-%defattr(-,root,root,-)
 /bin/*
 /sbin/*
 %exclude /bin/nisdomainname