diff --git a/.cvsignore b/.cvsignore index 5cc685c..054d621 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -libXcursor-1.1.5.tar.bz2 +libXcursor-1.1.5.1.tar.bz2 diff --git a/index.theme b/index.theme new file mode 100644 index 0000000..08055f7 --- /dev/null +++ b/index.theme @@ -0,0 +1,2 @@ +[Icon Theme] +Inherits=Bluecurve diff --git a/libXcursor.spec b/libXcursor.spec index efc4b8b..79ff01e 100644 --- a/libXcursor.spec +++ b/libXcursor.spec @@ -1,19 +1,19 @@ - Summary: X.Org X11 libXcursor runtime library Name: libXcursor -Version: 1.1.5 -Release: 1.1 +Version: 1.1.5.1 +Release: 1 License: MIT/X11 Group: System Environment/Libraries URL: http://www.x.org -Source0: http://xorg.freedesktop.org/X11R7.0-RC0/everything/%{name}-%{version}.tar.bz2 +Source0: http://xorg.freedesktop.org/X11R7.0-RC3/everything/%{name}-%{version}.tar.bz2 +Source1: index.theme BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRequires: xorg-x11-util-macros BuildRequires: libX11-devel BuildRequires: libXfixes-devel BuildRequires: libXrender-devel >= 0.8.2 - Obsoletes: XFree86-libs, xorg-x11-libs %description @@ -23,7 +23,7 @@ X.Org X11 libXcursor runtime library Summary: X.Org X11 libXcursor development package Group: Development/Libraries Requires: %{name} = %{version}-%{release} - +Requires(pre): xorg-x11-filesystem >= 0.99.2-3 Obsoletes: XFree86-devel, xorg-x11-devel @@ -37,18 +37,20 @@ X.Org X11 libXcursor development package %define with_static 0 %build - +#export CFLAGS="$RPM_OPT_FLAGS -DICONDIR=\"/usr/share/icons\"" %configure \ %if ! %{with_static} --disable-static %endif make - %install rm -rf $RPM_BUILD_ROOT %makeinstall +mkdir -p $RPM_BUILD_ROOT/usr/share/icons/default +install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/usr/share/icons/default/index.theme + # We intentionally don't ship *.la files rm -f $RPM_BUILD_ROOT%{_libdir}/*.la @@ -64,6 +66,9 @@ rm -rf $RPM_BUILD_ROOT %dir %{_libdir} %{_libdir}/libXcursor.so.1 %{_libdir}/libXcursor.so.1.0.2 +%dir %{_datadir}/icons +%dir %{_datadir}/icons/default +%config(noreplace) %verify(not md5 size mtime) %{_datadir}/icons/default/index.theme %files devel %defattr(-,root,root,-) @@ -78,9 +83,17 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/xcursor.pc %dir %{_mandir} %dir %{_mandir}/man3 -%{_mandir}/man3/Xcursor.3.gz +%{_mandir}/man3/Xcursor.3x* %changelog +* Tue Dec 13 2005 Mike A. Harris 1.1.5.1-1 +- Updated libXcursor to version 1.1.5.1 from X11R7 RC3 +- Added "Requires(pre): xorg-x11-filesystem >= 0.99.2-3", to ensure + that /usr/lib/X11 and /usr/include/X11 pre-exist. +- Removed 'x' suffix from manpage directories to match RC3 upstream. +- Added default index.theme file to set BlueCurve as the default cursor theme + to fix bug (#175532). + * Fri Dec 09 2005 Jesse Keating - rebuilt @@ -89,11 +102,10 @@ rm -rf $RPM_BUILD_ROOT - Changed 'Conflicts: XFree86-devel, xorg-x11-devel' to 'Obsoletes' - Changed 'Conflicts: XFree86-libs, xorg-x11-libs' to 'Obsoletes' - * Mon Oct 24 2005 Mike A. Harris 1.1.4-1 - Updated libXcursor to version 1.1.4 from X11R7 RC1 -* Thu Sep 29 2005 Mike A. Harris 1.1.3-3 +* Thu Sep 29 2005 Mike A. Harris 1.1.3-3 - Renamed package to remove xorg-x11 from the name due to unanimous decision between developers. - Use Fedora Extras style BuildRoot tag. diff --git a/sources b/sources index de6f0cd..0279399 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c90f04967c0b68dbde0dd6f4dc943877 libXcursor-1.1.5.tar.bz2 +ca793776537ce25422134f3dc7b7e55f libXcursor-1.1.5.1.tar.bz2