rpms/libX11/devel .cvsignore, 1.6, 1.7 libX11.spec, 1.19, 1.20 sources, 1.6, 1.7

[fedora-cvs-commits at redhat.com]

Author: mharris

Update of /cvs/dist/rpms/libX11/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24123

Modified Files:
	.cvsignore libX11.spec sources 
Log Message:
* Wed Jun 28 2006 Mike A. Harris <mharris at redhat.com> 1.0.2-1
- Updated libX11 to version 1.0.2
- Bump BuildRequires and Requires to "xorg-x11-proto-devel >= 7.1-2" to meet
  new "xproto >= 7.0.6" dependency.
- Disable libX11-0.99.3-datadir-locale-dir-fix.patch as it is now included
  upstream.
- Remove autoconf dependency as we no longer need it.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libX11/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	12 May 2006 23:50:48 -0000	1.6
+++ .cvsignore	28 Jun 2006 07:16:40 -0000	1.7
@@ -1 +1,2 @@
 libX11-1.0.1.tar.bz2
+libX11-1.0.2.tar.bz2


Index: libX11.spec
===================================================================
RCS file: /cvs/dist/rpms/libX11/devel/libX11.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- libX11.spec	20 Jun 2006 23:50:54 -0000	1.19
+++ libX11.spec	28 Jun 2006 07:16:40 -0000	1.20
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libX11 runtime library
 Name: libX11
-Version: 1.0.1
-Release: 3
+Version: 1.0.2
+Release: 1
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -13,14 +13,12 @@
 Patch1: libX11-1.0.1-setuid.diff
 
 BuildRequires: pkgconfig
-BuildRequires: xorg-x11-proto-devel
+# xproto >= 7.0.6 required
+BuildRequires: xorg-x11-proto-devel >= 7.1-2
 BuildRequires: xorg-x11-xtrans-devel
 BuildRequires: libXau-devel
 BuildRequires: libXdmcp-devel
 
-# NOTE: Temporary BuildRequires needed for build time kludges.
-BuildRequires: autoconf
-
 Requires(pre): xorg-x11-filesystem >= 0.99.2-3
 
 Obsoletes: XFree86-libs, xorg-x11-libs
@@ -34,7 +32,8 @@
 Requires(pre): xorg-x11-filesystem >= 0.99.2-3
 Requires: %{name} = %{version}-%{release}
 
-Requires: xorg-x11-proto-devel
+# xproto >= 7.0.6 required
+Requires: xorg-x11-proto-devel >= 7.1-2
 Requires: libXau-devel, libXdmcp-devel
 
 Obsoletes: XFree86-devel, xorg-x11-devel
@@ -44,16 +43,20 @@
 
 %prep
 %setup -q
-%patch0 -p0 -b .datadir-locale-dir-fix
+# FIXME: We are keeping this around, as upstream has a tendency for random
+# people to revert fixes other people have applied, and have a 6-8 month tug
+# of war with these things.  It's easier to leave this here than to try and
+# find it later.
+#%patch0 -p0 -b .datadir-locale-dir-fix
+
+# FIXME: For some reason, upstream supplies this patch, but hasn't checked it
+# into CVS/git/whatever yet it seems, so upstream is potentially insecure.
 %patch1 -p1 -b .setuid
 
 # Disable static library creation by default.
 %define with_static 0
 
 %build
-# FIXME: libX11-0.99.3-datadir-locale-dir-fix.patch patches configure.ac, so
-# we have to re-run autoconf:
-autoconf
 %configure \
 	--disable-dependency-tracking \
 %if ! %{with_static}
@@ -241,6 +244,14 @@
 %{_mandir}/man3/*.3x*
 
 %changelog
+* Wed Jun 28 2006 Mike A. Harris <mharris at redhat.com> 1.0.2-1
+- Updated libX11 to version 1.0.2
+- Bump BuildRequires and Requires to "xorg-x11-proto-devel >= 7.1-2" to meet
+  new "xproto >= 7.0.6" dependency.
+- Disable libX11-0.99.3-datadir-locale-dir-fix.patch as it is now included
+  upstream.
+- Remove autoconf dependency as we no longer need it.
+
 * Tue Jun 20 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-3
 - Added libX11-1.0.1-setuid.diff to fix potential security issue (#196094)
 - Change dependency on "filesystem" package to "xorg-x11-filesystem" package,


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libX11/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	12 May 2006 23:50:48 -0000	1.6
+++ sources	28 Jun 2006 07:16:40 -0000	1.7
@@ -1 +1,2 @@
 58f0537f21183e27149cf906a1b6bef9  libX11-1.0.1.tar.bz2
+86a16bdc09b42b2e018dd665c23ca21c  libX11-1.0.2.tar.bz2