From 14c59d2b6ded59ca6d3acc73d8e846906672bd41 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Wed, 22 Jul 2009 09:55:40 +0000 Subject: [PATCH] - libXext 1.0.99.4 - fix.patch: Drop. --- .cvsignore | 3 +-- fix.patch | 36 ------------------------------------ libXext.spec | 17 ++++++++--------- sources | 3 +-- 4 files changed, 10 insertions(+), 49 deletions(-) delete mode 100644 fix.patch diff --git a/.cvsignore b/.cvsignore index cdac296..7d642d8 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1 @@ -libXext-1.0.99.1.tar.bz2 -libXext-1.0.99.2.tar.bz2 +libXext-1.0.99.4.tar.bz2 diff --git a/fix.patch b/fix.patch deleted file mode 100644 index fc6731a..0000000 --- a/fix.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff -up libXext-1.0.99.2/src/DPMS.c.jx libXext-1.0.99.2/src/DPMS.c ---- libXext-1.0.99.2/src/DPMS.c.jx 2009-07-15 23:33:08.000000000 -0400 -+++ libXext-1.0.99.2/src/DPMS.c 2009-07-16 17:17:34.000000000 -0400 -@@ -38,7 +38,7 @@ Equipment Corporation. - #endif - #include - #include --#include -+#include - #include - #include - #include -diff -up libXext-1.0.99.2/src/XMultibuf.c.jx libXext-1.0.99.2/src/XMultibuf.c ---- libXext-1.0.99.2/src/XMultibuf.c.jx 2009-07-15 23:33:08.000000000 -0400 -+++ libXext-1.0.99.2/src/XMultibuf.c 2009-07-16 17:19:02.000000000 -0400 -@@ -36,7 +36,7 @@ in this Software without prior written a - #include - #include - #include --#include -+#include - #include - - static XExtensionInfo _multibuf_info_data; -diff -up libXext-1.0.99.2/src/XSecurity.c.jx libXext-1.0.99.2/src/XSecurity.c ---- libXext-1.0.99.2/src/XSecurity.c.jx 2009-07-15 23:33:08.000000000 -0400 -+++ libXext-1.0.99.2/src/XSecurity.c 2009-07-16 17:19:32.000000000 -0400 -@@ -33,7 +33,7 @@ in this Software without prior written a - #include - #include - #include --#include -+#include - #include - - static XExtensionInfo _Security_info_data; diff --git a/libXext.spec b/libXext.spec index e6bdad7..82d4f1a 100644 --- a/libXext.spec +++ b/libXext.spec @@ -1,17 +1,15 @@ Summary: X.Org X11 libXext runtime library Name: libXext -Version: 1.0.99.2 -Release: 0%{?dist} +Version: 1.0.99.4 +Release: 1%{?dist} License: MIT Group: System Environment/Libraries URL: http://www.x.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -#Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2 -Source0: http://cgit.freedesktop.org/xorg/lib/libXext/snapshot/libXext-1.0.99.2.tar.bz2 -Patch0: fix.patch +Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2 -BuildRequires: xorg-x11-proto-devel >= 7.1-10 +BuildRequires: xorg-x11-proto-devel >= 7.4-23 BuildRequires: libX11-devel BuildRequires: libXau-devel BuildRequires: xorg-x11-util-macros @@ -36,10 +34,8 @@ X.Org X11 libXext development package %prep %setup -q -%patch0 -p1 -b .jx %build -./autogen.sh %configure --disable-static make %{?_smp_mflags} @@ -69,7 +65,6 @@ rm -rf $RPM_BUILD_ROOT %{_includedir}/X11/extensions/XEVI.h %{_includedir}/X11/extensions/XLbx.h %{_includedir}/X11/extensions/XShm.h -%{_includedir}/X11/extensions/XTest.h %{_includedir}/X11/extensions/Xag.h %{_includedir}/X11/extensions/Xcup.h %{_includedir}/X11/extensions/Xdbe.h @@ -91,6 +86,10 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/*.3* %changelog +* Wed Jul 22 2009 Peter Hutterer 1.0.99.4-1 +- libXext 1.0.99.4 +- fix.patch: Drop. + * Tue Jul 21 2009 Adam Jackson 1.0.99.2-0 - libXext snapshot diff --git a/sources b/sources index 4a6f7b6..7629e15 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -28a0c215dca5960405634242e0f5957c libXext-1.0.99.1.tar.bz2 -520ca5f70db34767075db3366e1440e3 libXext-1.0.99.2.tar.bz2 +24da44888b87c66edb326acec35b85aa libXext-1.0.99.4.tar.bz2