rpms/xorg-x11-apps/devel xconsole-1.0.3-streams-me-softer.patch, NONE, 1.1 xorg-x11-apps.spec, 1.26, 1.27

Adam Jackson (ajax) fedora-extras-commits at redhat.com
Fri Apr 4 18:17:34 UTC 2008


Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-apps/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23210

Modified Files:
	xorg-x11-apps.spec 
Added Files:
	xconsole-1.0.3-streams-me-softer.patch 
Log Message:
* Fri Apr 04 2008 Adam Jackson <ajax at redhat.com> 7.3-3
- xconsole-1.0.3-streams-me-softer.patch: Don't include STREAMS headers,
  since glibc so thoughtfully removed them. (#440717)


xconsole-1.0.3-streams-me-softer.patch:

--- NEW FILE xconsole-1.0.3-streams-me-softer.patch ---
diff -up xconsole-1.0.3/xconsole.c.jx xconsole-1.0.3/xconsole.c
--- xconsole-1.0.3/xconsole.c.jx	2006-08-21 16:31:38.000000000 -0400
+++ xconsole-1.0.3/xconsole.c	2008-04-04 14:12:33.000000000 -0400
@@ -182,7 +182,6 @@ static XrmOptionDescRec options[] = {
 # endif
 # if defined (SVR4) || defined (USE_PTS)
 #  include <termios.h>
-#  include <sys/stropts.h>		/* for I_PUSH */
 #  ifdef sun
 #   include <sys/strredir.h>
 #  endif


Index: xorg-x11-apps.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-apps/devel/xorg-x11-apps.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- xorg-x11-apps.spec	20 Feb 2008 07:03:28 -0000	1.26
+++ xorg-x11-apps.spec	4 Apr 2008 18:16:18 -0000	1.27
@@ -5,7 +5,7 @@
 # NOTE: The package version should be set to the X11 major release from which
 # the OS release is based upon.
 Version: 7.3
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: MIT/X11
 Group: User Interface/X
 URL: http://www.x.org
@@ -34,6 +34,7 @@
 
 Patch0: x11perf-1.4.1-x11perf-datadir-cleanups.patch
 Patch1: luit-1.0.1-locale.alias-datadir.patch
+Patch2: xconsole-1.0.3-streams-me-softer.patch
 
 # FIXME: Temporary dependencies on autotools packages for now
 BuildRequires: autoconf automake
@@ -73,6 +74,7 @@
 %setup -q -c %{name}-%{version} -a1 -a2 -a3 -a4 -a5 -a6 -a7 -a8 -a9 -a10 -a11 -a12 -a13 -a14 -a15 -a16
 %patch0 -p0 -b .x11perf-datadir-cleanups
 %patch1 -p0 -b .locale.alias-datadir
+%patch2 -p0 -b .streams-me-softer
 
 %build
 # Build all apps
@@ -173,6 +175,10 @@
 %{_mandir}/man1/xwud.1*
 
 %changelog
+* Fri Apr 04 2008 Adam Jackson <ajax at redhat.com> 7.3-3
+- xconsole-1.0.3-streams-me-softer.patch: Don't include STREAMS headers,
+  since glibc so thoughtfully removed them. (#440717)
+
 * Wed Feb 20 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 7.3-2
 - Autorebuild for GCC 4.3
 




More information about the fedora-extras-commits mailing list