rpms/libX11/devel import.log, NONE, 1.1 .cvsignore, 1.12, 1.13 libX11.spec, 1.52, 1.53 sources, 1.11, 1.12 libX11-1.1.4-XF86Suspend.patch, 1.1, NONE libX11-1.1.4-keysyms.patch, 1.1, NONE libX11-1.1.4-xcb-xreply-leak.patch, 1.2, NONE

[Adam Jackson]

Author: ajax

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

Modified Files:
	.cvsignore libX11.spec sources 
Added Files:
	import.log 
Removed Files:
	libX11-1.1.4-XF86Suspend.patch libX11-1.1.4-keysyms.patch 
	libX11-1.1.4-xcb-xreply-leak.patch 
Log Message:
libX11 1.1.99.2



--- NEW FILE import.log ---
libX11-1_1_99_2-1_fc11:HEAD:libX11-1.1.99.2-1.fc11.src.rpm:1229635434


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libX11/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	6 Mar 2008 21:27:06 -0000	1.12
+++ .cvsignore	18 Dec 2008 21:24:24 -0000	1.13
@@ -1 +1 @@
-libX11-1.1.4.tar.bz2
+libX11-1.1.99.2.tar.bz2


Index: libX11.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libX11/devel/libX11.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- libX11.spec	20 Nov 2008 16:49:57 -0000	1.52
+++ libX11.spec	18 Dec 2008 21:24:25 -0000	1.53
@@ -1,13 +1,14 @@
 Summary: X.Org X11 libX11 runtime library
 Name: libX11
-Version: 1.1.4
-Release: 6%{?dist}
+Version: 1.1.99.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://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
@@ -15,12 +16,7 @@
 # manually confirm each patch hunk before removal.
 Patch2: dont-forward-keycode-0.patch
 
-Patch3: libX11-1.1.4-xcb-xreply-leak.patch
-# Committed upstream, should be in next release
-Patch4: libX11-1.1.4-keysyms.patch
-Patch5: libX11-1.1.4-XF86Suspend.patch
-
-BuildRequires: pkgconfig
+BuildRequires: pkgconfig autoconf automake libtool
 # xproto >= 7.0.6 required
 BuildRequires: xorg-x11-proto-devel >= 7.1-2
 BuildRequires: xorg-x11-xtrans-devel >= 1.0.3-4
@@ -59,11 +55,9 @@
 # find it later.
 #%patch0 -p0 -b .datadir-locale-dir-fix
 %patch2 -p1 -b .dont-forward-keycode-0
-%patch3 -p1 -b .xcb-xreply-leak
-%patch4 -p1 -b .keysyms
-%patch5 -p1 -b .xf86suspend
 
 %build
+./autogen.sh
 %configure \
 	--disable-dependency-tracking \
 	--disable-static
@@ -89,7 +83,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING README ChangeLog NEWS
+%doc AUTHORS COPYING README NEWS
 %dir %{_datadir}/X11
 %{_datadir}/X11/locale/
 %{_datadir}/X11/XErrorDB
@@ -122,6 +116,9 @@
 %{_mandir}/man3/*.3*
 
 %changelog
+* Thu Dec 18 2008 Adam Jackson <ajax at redhat.com> 1.1.99.2-1
+- libX11 1.1.99.2
+
 * Tue Nov 18 2008 Peter Hutterer <peter.hutterer at redhat.com> 1.1.4-6
 - libX11-1.1.4-XF86Suspend.patch: add XF86Suspend and XF86Hibernate keysyms.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libX11/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	6 Mar 2008 21:27:06 -0000	1.11
+++ sources	18 Dec 2008 21:24:25 -0000	1.12
@@ -1 +1 @@
-1469a5a8aa8d288dce6f4c45d2f68dc3  libX11-1.1.4.tar.bz2
+85aad6e524ac2fc7c97aa63120def2c1  libX11-1.1.99.2.tar.bz2


--- libX11-1.1.4-XF86Suspend.patch DELETED ---


--- libX11-1.1.4-keysyms.patch DELETED ---


--- libX11-1.1.4-xcb-xreply-leak.patch DELETED ---