Unverified Commit 53cabac9 authored by Mihai Moldovan's avatar Mihai Moldovan

Merge branch 'uli42-pr/fix_rhel6' into 3.6.x

parents 5d533654 444e6215
...@@ -357,6 +357,10 @@ find -name LICENSE | xargs sed -i \ ...@@ -357,6 +357,10 @@ find -name LICENSE | xargs sed -i \
-e 's/MA 02111-1307/MA 02110-1301/' -e 's/MA 02111-1307/MA 02110-1301/'
# Fix source permissions # Fix source permissions
find -type f -name '*.[hc]' | xargs chmod -x find -type f -name '*.[hc]' | xargs chmod -x
# Some systems do not know -Wpedantic
%if ( 0%{?rhel} && 0%{?rhel} < 7 ) || ( 0%{?suse_version} && 0%{?suse_version} < 1310 )
sed -i -e 's/Wpedantic/pedantic/g' nx-X11/config/cf/{{host,xorgsite}.def,xorg.cf}
%endif
# Bundled nx-X11/extras # Bundled nx-X11/extras
# Mesa - Used by the X server # Mesa - Used by the X server
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment