Changeset 956 for branches/1.1/pkg/rpm/jobmonarch.spec

Timestamp:

03/05/14 19:28:38 (9 years ago)

Author:

olahaye

Message:

[jobmonarch.spec] Fix --with values dash-to-underscore unwanted translation.

File:

• branches/1.1/pkg/rpm/jobmonarch.spec (modified) (1 diff)

branches/1.1/pkg/rpm/jobmonarch.spec

@@ -23 +23 @@
 
 # Read the provided --with tags if any (overriding default values).
-%{?_with_httpd_user:%define httpd_user %(set -- %{_with_httpd_user}; echo $1 | grep -v with | sed 's/=//')}
-%{?_with_httpd_group:%define httpd_group %(set -- %{_with_httpd_group}; echo $1 | grep -v with | sed 's/=//')}
-%{?_with_httpd_user:%define ganglia_user %(set -- %{_with_ganglia_user}; echo $1 | grep -v with | sed 's/=//')}
-%{?_with_httpd_group:%define ganglia_group %(set -- %{_with_ganglia_group}; echo $1 | grep -v with | sed 's/=//')}
-%{?_with_web_prefixdir:%define web_prefixdir %(set -- %{_with_web_prefixdir}; echo $1 | grep -v with | sed 's/=//')}
+%{?_with_httpd_user:%define httpd_user %(set -- %{_with_httpd_user}; echo $2 | cut -d= -f2)}
+%{?_with_httpd_group:%define httpd_group %(set -- %{_with_httpd_group}; echo $2 | cut -d= -f2)}
+%{?_with_httpd_user:%define ganglia_user %(set -- %{_with_ganglia_user}; echo $2 | cut -d= -f2)}
+%{?_with_httpd_group:%define ganglia_group %(set -- %{_with_ganglia_group}; echo $2 | cut -d= -f2)}
+%{?_with_web_prefixdir:%define web_prefixdir %(set -- %{_with_web_prefixdir}; echo $2 | cut -d= -f2)}
 
 # Don't need debuginfo RPM