diff --git a/.cvsignore b/.cvsignore index a4fd6e8..5455a1b 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -libX11-1.3.1.tar.bz2 +libX11-1.3.4.tar.bz2 diff --git a/libX11-1.3.1_fix_XCreateGC_manpage.patch b/libX11-1.3.1_fix_XCreateGC_manpage.patch deleted file mode 100644 index 69f7157..0000000 --- a/libX11-1.3.1_fix_XCreateGC_manpage.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -up libX11-1.3.1/man/XCreateGC.man.fix-XCreateGC_manpage libX11-1.3.1/man/XCreateGC.man ---- libX11-1.3.1/man/XCreateGC.man.fix-XCreateGC_manpage 2010-04-12 19:19:13.860497216 +0200 -+++ libX11-1.3.1/man/XCreateGC.man 2010-04-12 19:23:16.872621817 +0200 -@@ -151,8 +151,8 @@ XCreateGC, XCopyGC, XChangeGC, XGetGCVal - GC XCreateGC\^(\^Display *\fIdisplay\fP\^, Drawable \fId\fP\^, unsigned long - \fIvaluemask\fP\^, XGCValues *\^\fIvalues\fP\^); - .HP --int XCopyGC\^(\^Display *\fIdisplay\fP\^, GC \fIsrc\fP\^, GC \fIdest\fP\^, --unsigned long \fIvaluemask\fP\^); -+int XCopyGC\^(\^Display *\fIdisplay\fP\^, GC \fIsrc\fP\^, -+unsigned long \fIvaluemask\fP\^, GC \fIdest\fP\^); - .HP - int XChangeGC\^(\^Display *\fIdisplay\fP\^, GC \fIgc\fP\^, unsigned long - \fIvaluemask\fP\^, XGCValues *\^\fIvalues\fP\^); diff --git a/libX11.spec b/libX11.spec index 645f2c8..ed2ad70 100644 --- a/libX11.spec +++ b/libX11.spec @@ -3,8 +3,8 @@ Summary: Core X11 protocol client library Name: libX11 -Version: 1.3.1 -Release: 3%{?dist} +Version: 1.3.4 +Release: 1%{?dist} License: MIT Group: System Environment/Libraries URL: http://www.x.org @@ -16,7 +16,6 @@ Source0: http://xorg.freedesktop.org/archive/individual/lib/%{name}-%{version}.t #Source1: make-git-snapshot.sh Patch2: dont-forward-keycode-0.patch -Patch3: libX11-1.3.1_fix_XCreateGC_manpage.patch BuildRequires: xorg-x11-util-macros BuildRequires: pkgconfig(xproto) >= 7.0.15 @@ -49,11 +48,10 @@ X.Org X11 libX11 development package %setup -q #setup -q -n %{tarball}-%{gitdate} %patch2 -p1 -b .dont-forward-keycode-0 -%patch3 -p1 -b .fix-XCreateGC_manpage %build # sodding libtool -autoreconf -v --install +# autoreconf -v --install %configure \ --disable-dependency-tracking \ --disable-static @@ -114,8 +112,12 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/x11.pc %{_libdir}/pkgconfig/x11-xcb.pc %{_mandir}/man3/*.3* +%{_mandir}/man5/*.5* %changelog +* Fri Jun 04 2010 Adam Jackson 1.3.4-1 +- libX11 1.3.4 + * Mon Apr 12 2010 Matěj Cepl - 1.3.1-3 - Fix XCopyGC manpage (#579102) diff --git a/sources b/sources index bceff7a..d83e65e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5e6895c6003f3f0172ba8a07b865d8b2 libX11-1.3.1.tar.bz2 +f65c9c7ecbfb64c19dbd7927160d63fd libX11-1.3.4.tar.bz2