[nesc/f20: 2/2] Merge branch 'master' into f20

[Christopher Meng]

commit 32bfabe828b043668f8805211109b399d7be6a12
Merge: 9d1d975 2802eb4
Author: Christopher Meng <i at cicku.me>
Date:   Wed Jul 2 22:01:59 2014 +0800

    Merge branch 'master' into f20
    
    Conflicts:
    	nesc.spec

 nesc.spec |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
---
diff --cc nesc.spec
index 64b9360,b1c63bd..ceb66bd
--- a/nesc.spec
+++ b/nesc.spec
@@@ -71,8 -72,8 +72,8 @@@ package to use %{pkgname} with GNU Emac
  
  %build
  autoreconf -fiv
- %configure CFLAGS="%{optflags}"
+ %configure
 -%make_build
 +make %{?_smp_mflags}
  
  %if 0%{?fedora}
  %{_emacs_bytecompile} tools/editor-modes/emacs/*.el