Merge branch 'el6'

8 years ago · 07d0856f93
parent 6744f2a240 4335614f76
commit 07d0856f93
1 changed files with 2 additions and 0 deletions
--- a/p7zip.spec
+++ b/p7zip.spec
@ -112,7 +112,9 @@ cp GUI/kde4/*.desktop %{buildroot}%{_kde4_datadir}/kde4/services/ServiceMenus/
 chmod +x %{buildroot}%{_bindir}/p7zipForFilemanager

 %check
+%if 0%{?rhel} != 6
 make test
+%endif
 # Next test fails, because we don't have X11 envoirment ...
 # Error: Unable to initialize gtk, is DISPLAY set properly?
 #make test_7zG || :