diff --git a/.cvsignore b/.cvsignore index 7e4932d..c6c3266 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -libX11-1.1.99.2.tar.bz2 +libX11-1.2.tar.bz2 diff --git a/import.log b/import.log index 3dc82d1..e64801c 100644 --- a/import.log +++ b/import.log @@ -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 diff --git a/libX11-1.1.99.2-compose-updates.patch b/libX11-1.1.99.2-compose-updates.patch deleted file mode 100644 index 37ae75f..0000000 --- a/libX11-1.1.99.2-compose-updates.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -up libX11-1.1.99.2/nls/en_US.UTF-8/Compose.pre.jx libX11-1.1.99.2/nls/en_US.UTF-8/Compose.pre ---- libX11-1.1.99.2/nls/en_US.UTF-8/Compose.pre.jx 2008-11-05 16:09:37.000000000 -0500 -+++ libX11-1.1.99.2/nls/en_US.UTF-8/Compose.pre 2009-02-04 10:28:08.000000000 -0500 -@@ -215,6 +215,9 @@ XCOMM Other symbols - : "‽" U203D # INTERROBANG - : "‽" U203D # INTERROBANG - -+

: "☭" U262D # HAMMER AND SICKLE -+ <3> : "♥" U2665 # BLACK HEART SUIT -+ - XCOMM Part 2 - - XCOMM Compose map for Korean Hangul(Choseongul) Conjoining Jamos automatically diff --git a/libX11-1.1.99.2.hang.patch b/libX11-1.1.99.2.hang.patch deleted file mode 100644 index 21cba03..0000000 --- a/libX11-1.1.99.2.hang.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -ru libX11-1.1.99.2.orig/src/xcb_disp.c libX11-1.1.99.2/src/xcb_disp.c ---- libX11-1.1.99.2.orig/src/xcb_disp.c 2009-02-02 11:53:49.000000000 +0000 -+++ libX11-1.1.99.2/src/xcb_disp.c 2009-02-02 11:57:55.000000000 +0000 -@@ -94,6 +94,9 @@ - dpy->xcb->next_xid = xcb_generate_id(dpy->xcb->connection); - - dpy->xcb->event_notify = xcondition_malloc(); -+ if (!dpy->xcb->event_notify) -+ return 0; -+ xcondition_init(dpy->xcb->event_notify); - return !xcb_connection_has_error(c); - } - diff --git a/libX11.spec b/libX11.spec index b17ab86..640b5c7 100644 --- a/libX11.spec +++ b/libX11.spec @@ -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 @@ X.Org X11 libX11 development package # 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 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/*.3* %changelog +* Wed Feb 18 2009 Adam Jackson 1.2-1 +- libX11 1.2 + * Wed Feb 04 2009 Adam Jackson 1.1.99.2-4 - libX11-1.1.99.2-compose-updates.patch: Update compose sequences (from git) diff --git a/sources b/sources index 6049f27..302f137 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -85aad6e524ac2fc7c97aa63120def2c1 libX11-1.1.99.2.tar.bz2 +c6265b59ea2b594fd68e33f9125b4d20 libX11-1.2.tar.bz2