diff --git a/index.theme.rhel b/index.theme.rhel new file mode 100644 index 0000000..6eed8fe --- /dev/null +++ b/index.theme.rhel @@ -0,0 +1,2 @@ +[Icon Theme] +Inherits=dmz-aa diff --git a/libXcursor.spec b/libXcursor.spec index e18c039..b059f69 100644 --- a/libXcursor.spec +++ b/libXcursor.spec @@ -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 1.1.13-6 +- Fix cursor theme in RHEL + * Fri May 24 2013 Peter Hutterer 1.1.13-3.20130524git8f677eaea - Update to fix following CVEs: - CVE-2013-2003