Fix cursor theme in RHEL

This commit is contained in:
Adam Jackson 2013-05-24 12:18:12 -04:00
parent b88d86ffd8
commit 906f947267
2 changed files with 11 additions and 1 deletions

2
index.theme.rhel Normal file
View File

@ -0,0 +1,2 @@
[Icon Theme]
Inherits=dmz-aa

View File

@ -5,7 +5,7 @@
Summary: Cursor management library
Name: libXcursor
Version: 1.1.13
Release: 5%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist}
Release: 6%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist}
License: MIT
Group: System Environment/Libraries
URL: http://www.x.org
@ -18,6 +18,7 @@ Source3: commitid
Source0: http://xorg.freedesktop.org/archive/individual/lib/%{name}-%{version}.tar.bz2
%endif
Source1: index.theme
Source2: index.theme.rhel
BuildRequires: autoconf automake libtool
BuildRequires: xorg-x11-util-macros
@ -65,7 +66,11 @@ rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/default
%if 0%{?rhel}
install -m 644 -p %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/icons/default/index.theme
%else
install -m 644 -p %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/icons/default/index.theme
%endif
# We intentionally don't ship *.la files
rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
@ -97,6 +102,9 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man3/Xcursor*.3*
%changelog
* Fri May 24 2013 Adam Jackson <ajax@redhat.com> 1.1.13-6
- Fix cursor theme in RHEL
* Fri May 24 2013 Peter Hutterer <peter.hutterer@redhat.com> 1.1.13-3.20130524git8f677eaea
- Update to fix following CVEs:
- CVE-2013-2003