[Groonga-commit] groonga/groonga at de614e6 [master] rpm centos: remove extra newline from expanded macro

Back to archive index

Kentaro Hayashi null+****@clear*****
Thu Jun 1 19:05:34 JST 2017


Kentaro Hayashi	2017-06-01 19:05:34 +0900 (Thu, 01 Jun 2017)

  New Revision: de614e6ce422123a26e3f73c3cb06b286a69c371
  https://github.com/groonga/groonga/commit/de614e6ce422123a26e3f73c3cb06b286a69c371

  Message:
    rpm centos: remove extra newline from expanded macro
    
    When rebuilding groonga package with customized parameter, we can use
    "rpmbuild --define 'additional_configure_options --enable-debug'
    groonga.spec" for example. But rpmbuild command expands macro with
    extra newline. This behavior causes "command not found" error. This
    commit fixes such a case.
    
    Before:
      --with-munin-plugins \
      --enable-mruby \
      %{_additional_configure_options:%{additional_configure_options}}
    
    After(expanded):
      --with-munin-plugins \
      --enable-mruby \
    
      --enable-debug

  Modified files:
    packages/rpm/centos/groonga.spec.in

  Modified: packages/rpm/centos/groonga.spec.in (+1 -2)
===================================================================
--- packages/rpm/centos/groonga.spec.in    2017-06-01 12:10:47 +0900 (4a1074d)
+++ packages/rpm/centos/groonga.spec.in    2017-06-01 19:05:34 +0900 (305ffa6)
@@ -8,8 +8,7 @@
 %define _use_libstemmer %{?use_libstemmer:%{use_libstemmer}}%{!?use_libstemmer:%{_centos_ver} >= 7}
 %define _use_systemd  %{?use_systemd:%{use_systemd}}%{!?use_systemd:%{_centos_ver} >= 7}
 
-%define _additional_configure_options \
-  %{?additional_configure_options:%{additional_configure_options}}
+%define _additional_configure_options %{?additional_configure_options:%{additional_configure_options}}
 
 %global _initddir %{_sysconfdir}/init.d/
 
-------------- next part --------------
HTML����������������������������...
Download 



More information about the Groonga-commit mailing list
Back to archive index