rpms/git
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix definition of the desktop_vendor_tag macro

Browse Source 
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:
Petr Stodulka 2017-01-27 16:46:18 +01:00
parent 8fbeb92b39
commit 6517883454
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
git.spec
View File

@ -34,7 +34,6 @@
%global bashcomp_pkgconfig 1 %global bashcomp_pkgconfig 1
%global bashcompdir %(pkg-config --variable=completionsdir bash-completion 2>/dev/null) %global bashcompdir %(pkg-config --variable=completionsdir bash-completion 2>/dev/null)
%global bashcomproot %(dirname %{bashcompdir} 2>/dev/null) %global bashcomproot %(dirname %{bashcompdir} 2>/dev/null)
%global desktop_vendor_tag 0
%global gnome_keyring 1 %global gnome_keyring 1
%global libsecret 1 %global libsecret 1
%global use_new_rpm_filters 1 %global use_new_rpm_filters 1
@ -43,13 +42,19 @@
%global bashcomp_pkgconfig 0 %global bashcomp_pkgconfig 0
%global bashcompdir %{_sysconfdir}/bash_completion.d %global bashcompdir %{_sysconfdir}/bash_completion.d
%global bashcomproot %{bashcompdir} %global bashcomproot %{bashcompdir}
%global desktop_vendor_tag 1
%global gnome_keyring 0 %global gnome_keyring 0
%global libsecret 0 %global libsecret 0
%global use_new_rpm_filters 0 %global use_new_rpm_filters 0
%global use_systemd 0 %global use_systemd 0
%endif %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 # Settings for EL <= 7
%if 0%{?rhel} && 0%{?rhel} <= 7 %if 0%{?rhel} && 0%{?rhel} <= 7
%{!?__global_ldflags: %global __global_ldflags -Wl,-z,relro} %{!?__global_ldflags: %global __global_ldflags -Wl,-z,relro}