Fix definition of the desktop_vendor_tag macro
The macro should be set to 0 even for RHEL-6 system. Previously it was set to 1 for RHEL-6.
This commit is contained in:
parent
8fbeb92b39
commit
6517883454
9
git.spec
9
git.spec
@ -34,7 +34,6 @@
|
||||
%global bashcomp_pkgconfig 1
|
||||
%global bashcompdir %(pkg-config --variable=completionsdir bash-completion 2>/dev/null)
|
||||
%global bashcomproot %(dirname %{bashcompdir} 2>/dev/null)
|
||||
%global desktop_vendor_tag 0
|
||||
%global gnome_keyring 1
|
||||
%global libsecret 1
|
||||
%global use_new_rpm_filters 1
|
||||
@ -43,13 +42,19 @@
|
||||
%global bashcomp_pkgconfig 0
|
||||
%global bashcompdir %{_sysconfdir}/bash_completion.d
|
||||
%global bashcomproot %{bashcompdir}
|
||||
%global desktop_vendor_tag 1
|
||||
%global gnome_keyring 0
|
||||
%global libsecret 0
|
||||
%global use_new_rpm_filters 0
|
||||
%global use_systemd 0
|
||||
%endif
|
||||
|
||||
# This one macro is for F19+ and EL-6+
|
||||
%if 0%{?fedora} >= 19 || 0%{?rhel} >= 6
|
||||
%global desktop_vendor_tag 0
|
||||
%else
|
||||
%global desktop_vendor_tag 1
|
||||
%endif
|
||||
|
||||
# Settings for EL <= 7
|
||||
%if 0%{?rhel} && 0%{?rhel} <= 7
|
||||
%{!?__global_ldflags: %global __global_ldflags -Wl,-z,relro}
|
||||
|
Loading…
Reference in New Issue
Block a user