diff --git a/xconsole-1.0.3-streams-me-softer.patch b/xconsole-1.0.3-streams-me-softer.patch new file mode 100644 index 0000000..354eccc --- /dev/null +++ b/xconsole-1.0.3-streams-me-softer.patch @@ -0,0 +1,11 @@ +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 +-# include /* for I_PUSH */ + # ifdef sun + # include + # endif diff --git a/xorg-x11-apps.spec b/xorg-x11-apps.spec index 928fe0d..1d93764 100644 --- a/xorg-x11-apps.spec +++ b/xorg-x11-apps.spec @@ -5,7 +5,7 @@ Name: xorg-x11-%{pkgname} # 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 @@ Source16: ftp://ftp.x.org/pub/individual/app/xmessage-1.0.2.tar.bz2 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 @@ A collection of common X Window System applications. %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 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/xwud.1* %changelog +* Fri Apr 04 2008 Adam Jackson 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 - 7.3-2 - Autorebuild for GCC 4.3