rpms/libX11/devel .cvsignore, 1.13, 1.14 import.log, 1.1, 1.2 libX11.spec, 1.56, 1.57 sources, 1.12, 1.13 libX11-1.1.99.2-compose-updates.patch, 1.1, NONE libX11-1.1.99.2.hang.patch, 1.1, NONE

[Adam Jackson]

Author: ajax

Update of /cvs/pkgs/rpms/libX11/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30373/devel

Modified Files:
	.cvsignore import.log libX11.spec sources 
Removed Files:
	libX11-1.1.99.2-compose-updates.patch 
	libX11-1.1.99.2.hang.patch 
Log Message:
libX11 1.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libX11/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	18 Dec 2008 21:24:24 -0000	1.13
+++ .cvsignore	18 Feb 2009 18:18:03 -0000	1.14
@@ -1 +1 @@
-libX11-1.1.99.2.tar.bz2
+libX11-1.2.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/libX11/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	18 Dec 2008 21:24:25 -0000	1.1
+++ import.log	18 Feb 2009 18:18:03 -0000	1.2
@@ -1 +1,2 @@
 libX11-1_1_99_2-1_fc11:HEAD:libX11-1.1.99.2-1.fc11.src.rpm:1229635434
+libX11-1_2-1_fc11:HEAD:libX11-1.2-1.fc11.src.rpm:1234981066


Index: libX11.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libX11/devel/libX11.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- libX11.spec	4 Feb 2009 15:33:44 -0000	1.56
+++ libX11.spec	18 Feb 2009 18:18:03 -0000	1.57
@@ -1,31 +1,27 @@
 Summary: X.Org X11 libX11 runtime library
 Name: libX11
-Version: 1.1.99.2
-Release: 4%{?dist}
+Version: 1.2
+Release: 1%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.x.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-#Source0: http://xorg.freedesktop.org/archive/individual/lib/%{name}-%{version}.tar.bz2
-Source0: http://cgit.freedesktop.org/xorg/lib/libX11/snapshot/libX11-%{version}.tar.bz2 
+Source0: http://xorg.freedesktop.org/archive/individual/lib/%{name}-%{version}.tar.bz2
+#Source0: http://cgit.freedesktop.org/xorg/lib/libX11/snapshot/libX11-%{version}.tar.bz2 
 
-Patch0: libX11-0.99.3-datadir-locale-dir-fix.patch
 # FIXME: https://bugs.freedesktop.org/show_bug.cgi?id=3646 seems to indicate
 # this patch is now committed upstream.  When libX11-1.0.4 is released,
 # manually confirm each patch hunk before removal.
+Patch0: libX11-0.99.3-datadir-locale-dir-fix.patch
 Patch2: dont-forward-keycode-0.patch
-#http://lists.freedesktop.org/archives/xorg/2009-January/043133.html
-Patch3: libX11-1.1.99.2.hang.patch 
-# f052665394f3f0319e93a98f1d5d4ea287e1dd07
-Patch4: libX11-1.1.99.2-compose-updates.patch
 
 BuildRequires: pkgconfig autoconf automake libtool
 # xproto >= 7.0.6 required
 BuildRequires: xorg-x11-util-macros
 BuildRequires: xorg-x11-proto-devel >= 7.1-2
 BuildRequires: xorg-x11-xtrans-devel >= 1.0.3-4
-BuildRequires: libxcb-devel
+BuildRequires: libxcb-devel >= 1.2
 BuildRequires: libXau-devel
 BuildRequires: libXdmcp-devel
 
@@ -60,11 +56,8 @@
 # find it later.
 #%patch0 -p0 -b .datadir-locale-dir-fix
 %patch2 -p1 -b .dont-forward-keycode-0
-%patch3 -p1 -b .dont-hang
-%patch4 -p1 -b .compose
 
 %build
-./autogen.sh
 %configure \
 	--disable-dependency-tracking \
 	--disable-static
@@ -123,6 +116,9 @@
 %{_mandir}/man3/*.3*
 
 %changelog
+* Wed Feb 18 2009 Adam Jackson <ajax at redhat.com> 1.2-1
+- libX11 1.2
+
 * Wed Feb 04 2009 Adam Jackson <ajax at redhat.com> 1.1.99.2-4
 - libX11-1.1.99.2-compose-updates.patch: Update compose sequences (from git)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libX11/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	18 Dec 2008 21:24:25 -0000	1.12
+++ sources	18 Feb 2009 18:18:03 -0000	1.13
@@ -1 +1 @@
-85aad6e524ac2fc7c97aa63120def2c1  libX11-1.1.99.2.tar.bz2
+c6265b59ea2b594fd68e33f9125b4d20  libX11-1.2.tar.bz2


--- libX11-1.1.99.2-compose-updates.patch DELETED ---


--- libX11-1.1.99.2.hang.patch DELETED ---