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

wrap macros in braces in more places

Browse Source
This commit is contained in:
Nils Philippsen 2014-02-11 18:06:34 +01:00
parent 1332c9db77
commit 4c1521a788
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
gimp.spec
View File

@ -86,10 +86,10 @@ Release: %{?prerelprefix}4%{dotprerel}%{dotgitrev}%{?dist}
# Compute some version related macros. # Compute some version related macros.
# Ugly, need to get quoting percent signs straight. # Ugly, need to get quoting percent signs straight.
%global major %(ver=%version; echo ${ver%%%%.*}) %global major %(ver=%{version}; echo ${ver%%%%.*})
%global minor %(ver=%version; ver=${ver#%major.}; echo ${ver%%%%.*}) %global minor %(ver=%{version}; ver=${ver#%major.}; echo ${ver%%%%.*})
%global micro %(ver=%version; ver=${ver#%major.%minor.}; echo ${ver%%%%.*}) %global micro %(ver=%{version}; ver=${ver#%major.%minor.}; echo ${ver%%%%.*})
%global binver %major.%minor %global binver %{major}.%{minor}
%global interface_age 0 %global interface_age 0
%global gettext_version 20 %global gettext_version 20
%global lib_api_version 2.0 %global lib_api_version 2.0
@ -97,7 +97,7 @@ Release: %{?prerelprefix}4%{dotprerel}%{dotgitrev}%{?dist}
%global lib_minor %(echo $[%minor * 100]) %global lib_minor %(echo $[%minor * 100])
%global lib_micro %micro %global lib_micro %micro
%else # unstable %else # unstable
%global lib_minor %(echo $[%minor * 100 + %micro]) %global lib_minor %(echo $[%minor * 100 + %{micro}])
%global lib_micro 0 %global lib_micro 0
%endif # unstable %endif # unstable
@ -315,8 +315,8 @@ EOF
%global _hardened_build 1 %global _hardened_build 1
%else %else
# fake things # fake things
export CFLAGS='-fPIC %optflags' export CFLAGS='-fPIC %{optflags}'
export CXXFLAGS='-fPIC %optflags' export CXXFLAGS='-fPIC %{optflags}'
export LDFLAGS='-pie' export LDFLAGS='-pie'
%endif %endif
%endif %endif
@ -447,7 +447,7 @@ ln -snf gimprc-%{binver}.5 %{buildroot}/%{_mandir}/man5/gimprc.5
# Hardcode python interpreter in shipped python plug-ins. This actually has no # Hardcode python interpreter in shipped python plug-ins. This actually has no
# effect because gimp maps hashbangs with and without the /usr/bin/env detour # effect because gimp maps hashbangs with and without the /usr/bin/env detour
# to the system python interpreter, but this will avoid false alarms. # to the system python interpreter, but this will avoid false alarms.
grep -E -rl '^#!\s*%{_bindir}/env\s+python' --include=\*.py "%buildroot" | grep -E -rl '^#!\s*%{_bindir}/env\s+python' --include=\*.py "%{buildroot}" |
while read file; do while read file; do
sed -r '1s,^#!\s*%{_bindir}/env\s+python,#!%{__python},' -i "$file" sed -r '1s,^#!\s*%{_bindir}/env\s+python,#!%{__python},' -i "$file"
done done
@ -455,7 +455,7 @@ grep -E -rl '^#!\s*%{_bindir}/env\s+python' --include=\*.py "%buildroot" |
%check %check
# skip tests known to be problematic in a specific version # skip tests known to be problematic in a specific version
%if "%version" == "%{?skip_checks_version}" %if "%{version}" == "%{?skip_checks_version}"
pushd app/tests pushd app/tests
for problematic in %{?skip_checks}; do for problematic in %{?skip_checks}; do
rm -f "$problematic" rm -f "$problematic"