rpms/xorg-x11-xdm/devel xdm-1.1.6-add-needed.patch, NONE, 1.1 xorg-x11-xdm.spec, 1.51, 1.52

Adam Jackson ajax at fedoraproject.org
Wed Feb 17 00:09:05 UTC 2010


Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-xdm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv423

Modified Files:
	xorg-x11-xdm.spec 
Added Files:
	xdm-1.1.6-add-needed.patch 
Log Message:
* Tue Feb 16 2010 Adam Jackson <ajax at redhat.com> 1.1.6-16
- xdm-1.1.6-add-needed.patch: Fix FTBFS from --no-add-needed


xdm-1.1.6-add-needed.patch:
 Makefile.am |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE xdm-1.1.6-add-needed.patch ---
diff -up xdm-1.1.6/Makefile.am.jx xdm-1.1.6/Makefile.am
--- xdm-1.1.6/Makefile.am.jx	2006-12-20 13:00:41.000000000 -0500
+++ xdm-1.1.6/Makefile.am	2010-02-16 19:10:16.000000000 -0500
@@ -31,7 +31,7 @@ xdmlib_PROGRAMS = chooser
 #
 
 xdm_CFLAGS = $(XDM_CFLAGS) -D_BSD_SOURCE
-xdm_LDADD = $(XDM_LIBS) $(XDM_LDFLAGS)
+xdm_LDADD = $(XDM_LIBS) $(XDM_LDFLAGS) -ldl
 
 xdm_SOURCES =	\
         auth.c \


Index: xorg-x11-xdm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-xdm/devel/xorg-x11-xdm.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- xorg-x11-xdm.spec	29 Jan 2010 16:36:35 -0000	1.51
+++ xorg-x11-xdm.spec	17 Feb 2010 00:09:05 -0000	1.52
@@ -3,7 +3,7 @@
 Summary: X.Org X11 xdm - X Display Manager
 Name: xorg-x11-%{pkgname}
 Version: 1.1.6
-Release: 15%{?dist}
+Release: 16%{?dist}
 # NOTE: Remove Epoch line if/when the package ever gets renamed.
 Epoch: 1
 License: MIT
@@ -28,6 +28,8 @@ Patch12: xdm-1.1.6-authDir-var-bug388431
 # Fix missing #endif in the Xresources (#470348)
 Patch13: xdm-1.1.6-redhat-Xresources-fix.patch
 
+Patch14: xdm-1.1.6-add-needed.patch
+
 # FIXME: Temporary build dependencies for autotool dependence.
 BuildRequires: autoconf, automake, libtool
 
@@ -80,6 +82,7 @@ X.Org X11 xdm - X Display Manager
 %patch11 -p0 -b .redhat-sessreg-utmp-fix-bug177890
 %patch12 -p1 -b .authDir-var-bug388431
 %patch13 -p1 -b .redhat-xresources-bug470348
+%patch14 -p1 -b .add-needed
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
@@ -158,6 +161,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/*.1*
 
 %changelog
+* Tue Feb 16 2010 Adam Jackson <ajax at redhat.com> 1.1.6-16
+- xdm-1.1.6-add-needed.patch: Fix FTBFS from --no-add-needed
+
 * Fri Jan 29 2010 Matěj Cepl <mcepl at redhat.com> - 1:1.1.6-15
 - Add BR libXft-devel for TrueType support (#551908)
 



More information about the scm-commits mailing list