rpms/xorg-x11-server/F-12 xserver-1.7.4-z-now.patch, NONE, 1.1 xorg-x11-server.spec, 1.518, 1.519

[Adam Jackson]

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-server/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6844

Modified Files:
	xorg-x11-server.spec 
Added Files:
	xserver-1.7.4-z-now.patch 
Log Message:
* Wed Jan 13 2010 Adam Jackson <ajax at redhat.com> 1.7.4-2
- Add RHEL conditional for bodhi_flags
- Build with -z relro
- xserver-1.7.4-z-now.patch: Link Xorg with -z now


xserver-1.7.4-z-now.patch:
 Makefile.am |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE xserver-1.7.4-z-now.patch ---
>From 4de049b00ebb12864dc59764afd907fc7d28ba01 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax at redhat.com>
Date: Wed, 13 Jan 2010 11:19:12 -0500
Subject: [PATCH] Link Xorg with -z now

---
 hw/xfree86/Makefile.am |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/hw/xfree86/Makefile.am b/hw/xfree86/Makefile.am
index 914e11f..20da8c4 100644
--- a/hw/xfree86/Makefile.am
+++ b/hw/xfree86/Makefile.am
@@ -74,7 +74,7 @@ DISTCLEANFILES = libxorg.c xorg.c
 Xorg_DEPENDENCIES = libxorg.la
 Xorg_LDADD = $(MAIN_LIB) libxorg.la $(XORG_SYS_LIBS) $(XSERVER_SYS_LIBS)
 
-Xorg_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG)
+Xorg_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG) -Wl,-z,now
 
 BUILT_SOURCES = xorg.conf.example
 DISTCLEANFILES += xorg.conf.example xorg.conf.example.pre
-- 
1.6.5.2



Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/F-12/xorg-x11-server.spec,v
retrieving revision 1.518
retrieving revision 1.519
diff -u -p -r1.518 -r1.519
--- xorg-x11-server.spec	8 Jan 2010 04:25:51 -0000	1.518
+++ xorg-x11-server.spec	13 Jan 2010 17:14:40 -0000	1.519
@@ -19,7 +19,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.7.4
-Release:   1%{dist}
+Release:   2%{dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -47,6 +47,7 @@ Source30: find-provides
 #define __find_provides {nil}
 
 Patch5: xserver-1.4.99-pic-libxf86config.patch
+Patch6: xserver-1.7.4-z-now.patch
 
 # OpenGL compositing manager feature/optimization patches.
 Patch103:  xserver-1.5.0-bg-none-root.patch
@@ -330,10 +331,13 @@ git am -p1 %{lua: for i, p in ipairs(pat
 %if 0%{?fedora}
 %define bodhi_flags --with-vendor-web="http://bodhi.fedoraproject.org/" --with-vendor-name="Fedora Project"
 %endif
+%if 0%{?rhel}
+%define bodhi_flags --with-vendor-web="https://www.redhat.com/apps/support/" --with-vendor-name="Red Hat"
+%endif
 
 # --with-pie ?
 autoreconf -v --install || exit 1
-export CFLAGS="${RPM_OPT_FLAGS} -Wstrict-overflow -rdynamic $CFLAGS"
+export CFLAGS="${RPM_OPT_FLAGS} -Wstrict-overflow -rdynamic $CFLAGS -Wl,-z,relro"
 %configure --enable-maintainer-mode %{xservers} \
 	--disable-static \
 	--with-pic \
@@ -514,6 +518,11 @@ rm -rf $RPM_BUILD_ROOT
 %{xserver_source_dir}
 
 %changelog
+* Wed Jan 13 2010 Adam Jackson <ajax at redhat.com> 1.7.4-2
+- Add RHEL conditional for bodhi_flags
+- Build with -z relro
+- xserver-1.7.4-z-now.patch: Link Xorg with -z now
+
 * Fri Jan 08 2010 Peter Hutterer <peter.hutterer at redhat.com> 1.7.4-1
 - xserver 1.7.4
 - update exa-master patch to current diff against master.