diff --git a/.cvsignore b/.cvsignore index 1e632d7..1daf3bc 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1,2 @@ libX11-0.99.0.tar.bz2 +libX11-0.99.2.tar.bz2 diff --git a/libX11.spec b/libX11.spec index 1c15989..28048cb 100644 --- a/libX11.spec +++ b/libX11.spec @@ -5,23 +5,22 @@ %define _x11localedir %{_libdir}/X11/locale #define _x11localedir %{_datadir}/X11/locale - Summary: X.Org X11 libX11 runtime library Name: libX11 -Version: 0.99.0 -Release: 4 +Version: 0.99.2 +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 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRequires: pkgconfig BuildRequires: xorg-x11-proto-devel BuildRequires: xorg-x11-xtrans-devel BuildRequires: libXau-devel BuildRequires: libXdmcp-devel - Conflicts: XFree86-libs, xorg-x11-libs %description @@ -33,7 +32,6 @@ Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: xorg-x11-proto-devel - Conflicts: XFree86-devel, xorg-x11-devel %description devel @@ -62,6 +60,8 @@ make %{?_smp_mflags} install DESTDIR=$RPM_BUILD_ROOT # We intentionally don't ship *.la files rm -f $RPM_BUILD_ROOT%{_libdir}/*.la +# FIXME: Don't install Xcms.txt - find out why upstream still ships this. +rm -f $RPM_BUILD_ROOT%{_libdir}/X11/Xcms.txt %clean rm -rf $RPM_BUILD_ROOT @@ -79,6 +79,8 @@ rm -rf $RPM_BUILD_ROOT %{_x11localedir}/compose.dir %dir %{_x11localedir}/en_US.UTF-8 %{_x11localedir}/en_US.UTF-8/* +%dir %{_x11localedir}/el_GR.UTF-8 +%{_x11localedir}/el_GR.UTF-8/* %dir %{_x11localedir}/georgian-academy %{_x11localedir}/georgian-academy/* %dir %{_x11localedir}/georgian-ps @@ -231,6 +233,11 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3x/*.3x* %changelog +* Fri Oct 21 2005 Mike A. Harris 0.99.2-1 +- Updated to libX11-0.99.2 from the X11R7 RC1 release. +- Added en_GR.UTF-8 locale to file manifest. +- Forcibly remove Xcms.txt + * Sun Oct 2 2005 Mike A. Harris 0.99.0-4 - Added _smp_mflags to make invocation to speed up SMP builds diff --git a/sources b/sources index 9e6f782..252479d 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ 0bb745ed34f8bf09d0c0d89ff91c56b4 libX11-0.99.0.tar.bz2 +f7c5652798066e4221163b7aca4e3e64 libX11-0.99.2.tar.bz2