rpms/libXcursor/devel index.theme, NONE, 1.1 .cvsignore, 1.4, 1.5 libXcursor.spec, 1.5, 1.6 sources, 1.4, 1.5

[fedora-cvs-commits at redhat.com]

Author: mharris

Update of /cvs/dist/rpms/libXcursor/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12393/devel

Modified Files:
	.cvsignore libXcursor.spec sources 
Added Files:
	index.theme 
Log Message:
auto-import libXcursor-1.1.5.1-1 on branch devel from libXcursor-1.1.5.1-1.src.rpm


--- NEW FILE index.theme ---
[Icon Theme]
Inherits=Bluecurve


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libXcursor/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	11 Nov 2005 21:28:57 -0000	1.4
+++ .cvsignore	15 Dec 2005 05:39:33 -0000	1.5
@@ -1 +1 @@
-libXcursor-1.1.5.tar.bz2
+libXcursor-1.1.5.1.tar.bz2


Index: libXcursor.spec
===================================================================
RCS file: /cvs/dist/rpms/libXcursor/devel/libXcursor.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- libXcursor.spec	9 Dec 2005 22:41:20 -0000	1.5
+++ libXcursor.spec	15 Dec 2005 05:39:33 -0000	1.6
@@ -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 @@
 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 @@
 %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 @@
 %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 @@
 %{_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 <mharris at redhat.com> 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 <jkeating at redhat.com>
 - rebuilt
 
@@ -89,11 +102,10 @@
 - 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 <mharris at redhat.com> 1.1.4-1
 - Updated libXcursor to version 1.1.4 from X11R7 RC1
 
-* Thu Sep 29 2005 Mike A. Harris <mharris.com> 1.1.3-3
+* Thu Sep 29 2005 Mike A. Harris <mharris at redhat.com> 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.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libXcursor/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	11 Nov 2005 21:28:57 -0000	1.4
+++ sources	15 Dec 2005 05:39:33 -0000	1.5
@@ -1 +1 @@
-c90f04967c0b68dbde0dd6f4dc943877  libXcursor-1.1.5.tar.bz2
+ca793776537ce25422134f3dc7b7e55f  libXcursor-1.1.5.1.tar.bz2