diff options
| author | Mihai Moldovan <ionic@ionic.de> | 2017-05-05 14:07:29 +0200 |
|---|---|---|
| committer | Mihai Moldovan <ionic@ionic.de> | 2017-05-05 14:07:29 +0200 |
| commit | 53cabac9e71ac80515539a68fa548ce0abf1835c (patch) | |
| tree | 86331f1ca681554b25d27cf8d9dd929c0793d7f5 | |
| parent | 5d5336541a7fb09f0164bebc63dc3113e553d720 (diff) | |
| parent | 444e621568e983590819f073af9bbc8ffd575180 (diff) | |
| download | nx-libs-53cabac9e71ac80515539a68fa548ce0abf1835c.tar.gz nx-libs-53cabac9e71ac80515539a68fa548ce0abf1835c.tar.bz2 nx-libs-53cabac9e71ac80515539a68fa548ce0abf1835c.zip | |
Merge branch 'uli42-pr/fix_rhel6' into 3.6.x
Attributes GH PR #447: https://github.com/ArcticaProject/nx-libs/pull/447
| -rw-r--r-- | nx-libs.spec | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/nx-libs.spec b/nx-libs.spec index 5668aa568..b5a47c007 100644 --- a/nx-libs.spec +++ b/nx-libs.spec @@ -357,6 +357,10 @@ find -name LICENSE | xargs sed -i \ -e 's/MA 02111-1307/MA 02110-1301/' # Fix source permissions 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 # Mesa - Used by the X server |