[nesc] Cleanup.

[Christopher Meng]

commit 0b7a253036f76df68dfd32a48db1b198424ff966
Author: Christopher Meng <i at cicku.me>
Date:   Wed Jul 2 21:34:01 2014 +0800

    Cleanup.

 nesc.spec |   71 ++++++++++++++++++++----------------------------------------
 1 files changed, 24 insertions(+), 47 deletions(-)
---
diff --git a/nesc.spec b/nesc.spec
index 81441b9..4188e64 100644
--- a/nesc.spec
+++ b/nesc.spec
@@ -5,8 +5,6 @@ Name:           nesc
 Version:        1.3.5
 Release:        1%{?dist}
 Summary:        Compiler used by TinyOS
-
-Group:          Applications/Engineering
 License:        GPLv2 and (GPLv2 or BSD)
 URL:            http://nescc.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/nescc/%{name}-%{version}.tar.gz
@@ -16,24 +14,20 @@ Patch0:         nesc-load-el-without-extension.patch
 Patch1:         nesc-1.3.2-vim-ftdetect.patch
 # 2014-06-09: Submitted upstream: https://github.com/tinyos/nesc/pull/29
 Patch2:         nesc-1.3.5-fix-all-incorrect-fsf-address.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
+BuildRequires:  autoconf
+BuildRequires:  bison
+BuildRequires:  flex
+BuildRequires:  gperf
 BuildRequires:  java-devel
 BuildRequires:  jpackage-utils
-BuildRequires:  gperf
-BuildRequires:  flex
-BuildRequires:  bison
-BuildRequires:  autoconf
-
-%if 0%{?rhel} >= 6
+%if 0%{?el} >= 6
 BuildRequires:  puppet
 %endif
-
 Requires:       java-headless 
 Requires:       jpackage-utils
 Requires:       perl
 Requires:       vim-common
-Provides: bundled(libiberty)
+Provides:       bundled(libiberty)
 
 %description
 The nesC language was designed to support the TinyOS project. 
@@ -44,9 +38,8 @@ performance and a simple concurrency model for embedded systems.
 # EL uses old cc-mode, so don't build it
 
 %if 0%{?fedora}
-%package -n emacs-%{pkg}
+%package -n     emacs-%{pkg}
 Summary:        Compiled elisp files to run %{pkgname} under GNU Emacs
-Group:          Applications/Editors
 BuildArch:      noarch
 BuildRequires:  emacs
 Requires:       emacs(bin) >= %{_emacs_version}
@@ -55,10 +48,8 @@ Requires:       emacs(bin) >= %{_emacs_version}
 This package contains the byte compiled elisp packages to run %{pkgname} with GNU
 Emacs.
 
-
-%package -n emacs-%{pkg}-el
+%package -n     emacs-%{pkg}-el
 Summary:        Elisp source files for %{pkgname} under GNU Emacs
-Group:          Applications/Editors
 BuildArch:      noarch
 Requires:       emacs-%{pkg} = %{version}-%{release}
 
@@ -79,50 +70,38 @@ package to use %{pkgname} with GNU Emacs.
 #patch2 -p1 -b .address
 
 %build
-autoconf -f -i
+autoconf -fiv
 %configure CFLAGS="%{optflags}"
-%{__make} %{?_smp_mflags}
+%make_build
 
 %if 0%{?fedora}
 %{_emacs_bytecompile} tools/editor-modes/emacs/*.el
 %endif
 
 %install
-%{__rm} -rf %{buildroot}
-%{__make} install DESTDIR=%{buildroot}
-
-%{__mkdir} -p %{buildroot}/%{_datadir}/vim/vimfiles/ftdetect
-%{__mkdir} -p %{buildroot}/%{_datadir}/vim/vimfiles/syntax
+%make_install
+mkdir -p %{buildroot}%{_datadir}/vim/vimfiles/ftdetect
+mkdir -p %{buildroot}%{_datadir}/vim/vimfiles/syntax
 
 %if 0%{?fedora}
-%{__mkdir} -p %{buildroot}/%{_emacs_sitelispdir}/%{pkg}
-%{__mkdir} -p %{buildroot}/%{_emacs_sitestartdir}
-
-%{__install} -pm 644 tools/editor-modes/emacs/*.elc %{buildroot}/%{_emacs_sitelispdir}/%{pkg} 
-%{__install} -pm 644 tools/editor-modes/emacs/*.el  %{buildroot}/%{_emacs_sitelispdir}/%{pkg}
-%{__install} -pm 644 %{SOURCE1} %{buildroot}/%{_emacs_sitestartdir}
-
+mkdir -p %{buildroot}/%{_emacs_sitelispdir}/%{pkg}
+mkdir -p %{buildroot}/%{_emacs_sitestartdir}
+install -pm644 tools/editor-modes/emacs/*.elc %{buildroot}%{_emacs_sitelispdir}/%{pkg} 
+install -pm644 tools/editor-modes/emacs/*.el  %{buildroot}%{_emacs_sitelispdir}/%{pkg}
+install -pm644 %{SOURCE1} %{buildroot}%{_emacs_sitestartdir}
 %endif
 
-
 # properly install vim syntax file
-%{__install} -pm 644 tools/editor-modes/vim/filetype.vim %{buildroot}/%{_datadir}/vim/vimfiles/ftdetect/nesc.vim
-%{__install} -pm 644 tools/editor-modes/vim/nesc.vim %{buildroot}/%{_datadir}/vim/vimfiles/syntax/nesc.vim
-
-
-%{__rm} -rf %{buildroot}/%{_datadir}/ncc/editor-modes/emacs
-%{__rm} -rf %{buildroot}/%{_datadir}/ncc/editor-modes/gedit
-%{__rm} -rf %{buildroot}/%{_datadir}/ncc/editor-modes/kde
-
-%clean
-%{__rm} -rf %{buildroot}
+install -pm 644 tools/editor-modes/vim/filetype.vim %{buildroot}/%{_datadir}/vim/vimfiles/ftdetect/nesc.vim
+install -pm 644 tools/editor-modes/vim/nesc.vim %{buildroot}/%{_datadir}/vim/vimfiles/syntax/nesc.vim
 
+rm -rf %{buildroot}%{_datadir}/ncc/editor-modes/emacs
+rm -rf %{buildroot}%{_datadir}/ncc/editor-modes/gedit
+rm -rf %{buildroot}%{_datadir}/ncc/editor-modes/kde
 
 %files
-%defattr(-,root,root,-)
-%doc
 %{_bindir}/%{name}*
-%{_libdir}/ncc
+%{_libdir}/ncc/
 %{_mandir}/man1/%{name}*.1*
 %{_datadir}/ncc/
 %{_datadir}/vim/vimfiles/ftdetect/%{pkg}.vim
@@ -130,13 +109,11 @@ autoconf -f -i
 
 %if 0%{?fedora}
 %files -n emacs-%{pkg}
-%defattr(-,root,root,-)
 %{_emacs_sitelispdir}/%{pkg}/*.elc
 %{_emacs_sitestartdir}/*.el
 %dir %{_emacs_sitelispdir}/%{pkg}
 
 %files -n emacs-%{pkg}-el
-%defattr(-,root,root,-)
 %doc tools/editor-modes/emacs/readme.txt
 %{_emacs_sitelispdir}/%{pkg}/*.el
 %endif