| |
@@ -6,18 +6,11 @@
|
| |
|
| |
%undefine _hardened_build
|
| |
|
| |
- %if 0%{?rhel} == 7
|
| |
- %define rhel7 1
|
| |
- %endif
|
| |
- %if 0%{?rhel} == 6
|
| |
- %define rhel6 1
|
| |
- %endif
|
| |
-
|
| |
- %if 0%{?rhel7} || 0%{?fedora} > 17
|
| |
+ %if 0%{?rhel} >=7 || 0%{?fedora} > 17
|
| |
%define prime 1
|
| |
%endif
|
| |
|
| |
- %if 0%{?rhel7} || 0%{?fedora} > 20
|
| |
+ %if 0%{?rhel} >=7 || 0%{?fedora} > 20
|
| |
%define kmsonly 1
|
| |
%else
|
| |
%ifnarch %{ix86}
|
| |
@@ -28,7 +21,7 @@
|
| |
Summary: Xorg X11 Intel video driver
|
| |
Name: xorg-x11-drv-intel
|
| |
Version: 2.99.917
|
| |
- Release: 31%{?gitrev}%{?dist}
|
| |
+ Release: 32%{?gitrev}%{?dist}
|
| |
URL: http://www.x.org
|
| |
License: MIT
|
| |
Group: User Interface/X Hardware Support
|
| |
@@ -62,7 +55,7 @@
|
| |
BuildRequires: libXrender-devel
|
| |
BuildRequires: libXtst-devel
|
| |
BuildRequires: libXvMC-devel
|
| |
- %if 0%{?fedora} > 24
|
| |
+ %if 0%{?fedora} > 24 || 0%{?rhel} > 7
|
| |
BuildRequires: libXfont2-devel
|
| |
%else
|
| |
BuildRequires: libXfont-devel
|
| |
@@ -156,7 +149,7 @@
|
| |
%files
|
| |
%doc COPYING
|
| |
%{driverdir}/intel_drv.so
|
| |
- %if !%{?kmsonly}
|
| |
+ %if !0%{?kmsonly}
|
| |
%{_libdir}/libI810XvMC.so.1*
|
| |
%endif
|
| |
%{_libdir}/libIntelXvMC.so.1*
|
| |
@@ -179,6 +172,9 @@
|
| |
%{_mandir}/man1/intel_*.1*
|
| |
|
| |
%changelog
|
| |
+ * Mon Nov 06 2017 Merlin Mathesius <mmathesi@redhat.com> - 2.99.917-32.20171025
|
| |
+ - Cleanup spec file conditionals
|
| |
+
|
| |
* Wed Oct 25 2017 Adam Jackson <ajax@redhat.com> - 2.99.917-31.20171025
|
| |
- New git snapshot
|
| |
|
| |
merlinm
commented 6 years ago
Successful scratch build for Rawhide with updates: https://koji.fedoraproject.org/koji/taskinfo?taskID=22964773